aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-07-06 15:38:43 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-07-06 15:38:43 +0800
commit60a7567a4171729f8753f0ece27888916c3137cb (patch)
tree99541cbfed84e7383ac998c10453f63b9acf4400
parentaf72fc9468d136ae29e93e4341d04ba3c9c082aa (diff)
downloadgsoc2013-evolution-60a7567a4171729f8753f0ece27888916c3137cb.tar.gz
gsoc2013-evolution-60a7567a4171729f8753f0ece27888916c3137cb.tar.zst
gsoc2013-evolution-60a7567a4171729f8753f0ece27888916c3137cb.zip
Change the folder right-click "Properties..." menu item handling so
that it only happens in the mailer (which is the only component actually using this). For some reason it still doesn't work properly (i.e. the menu item currently does nothing), but I haven't quite figured out why yet. svn path=/trunk/; revision=10840
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/component-factory.c20
-rw-r--r--ui/ChangeLog2
-rw-r--r--ui/evolution.xml7
4 files changed, 27 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 017a9f56b9..9a9247a0c6 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-06 Ettore Perazzoli <ettore@ximian.com>
+
+ * component-factory.c (populate_folder_context_menu): New function
+ to populate the right-click menu for mail folders.
+ (component_fn): Pass it to `evolution_shell_component_new()'.
+
2001-07-05 Jeffrey Stedfast <fejj@ximian.com>
* mail-accounts.c (construct): Add a checkbox for prompting when
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 10588c50cc..66420e01fd 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -279,6 +279,24 @@ xfer_folder (EvolutionShellComponent *shell_component,
CORBA_exception_free (&ev);
}
+static void
+populate_folder_context_menu (EvolutionShellComponent *shell_component,
+ BonoboUIComponent *uic,
+ const char *physical_uri,
+ const char *type,
+ void *closure)
+{
+ static char popup_xml[] =
+ "<menuitem name=\"ChangeFolderProperties\" verb=\"ChangeFolderProperties\""
+ " _label=\"Properties...\" _tip=\"Change this folder's properties\"/>";
+
+ if (strcmp (type, "mail") != 0)
+ return;
+
+ bonobo_ui_component_set_translate (uic, EVOLUTION_SHELL_COMPONENT_POPUP_PLACEHOLDER,
+ popup_xml, NULL);
+}
+
static char *
get_dnd_selection (EvolutionShellComponent *shell_component,
const char *physical_uri,
@@ -624,7 +642,7 @@ component_fn (BonoboGenericFactory *factory, void *closure)
create_folder,
remove_folder,
xfer_folder,
- NULL, /* populate_folder_context_menu_fn */
+ populate_folder_context_menu,
get_dnd_selection,
NULL);
diff --git a/ui/ChangeLog b/ui/ChangeLog
index e72b40458d..c7606ba0ba 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,5 +1,7 @@
2001-07-05 Ettore Perazzoli <ettore@ximian.com>
+ * evolution.xml: Remove "ChangeFolderProperties" item.
+
* evolution-mail-list.xml: Add the folder properties item back in;
use the "ChangeFolderProperties" verb instead.
diff --git a/ui/evolution.xml b/ui/evolution.xml
index dbf26b2c86..bcfe4c6181 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -264,16 +264,9 @@
_label="Add to _Shortcut Bar"
_tip="Create a link to this folder in the shortcut bar"/>
- <separator/>
-
<placeholder name="ComponentPlaceholder"
delimit="top"/>
- <menuitem name="ChangeFolderProperties"
- verb="ChangeFolderProperties"
- _label="_Properties..."
- _tip="Change the properties for this folder"/>
-
</popup>
</popups>
</Root>