diff options
| author | Peter Williams <peterw@src.gnome.org> | 2000-08-18 03:43:25 +0800 |
|---|---|---|
| committer | Peter Williams <peterw@src.gnome.org> | 2000-08-18 03:43:25 +0800 |
| commit | 7edf922a6ccbdf7a7e9e1a4459e9456f96a33314 (patch) | |
| tree | 3fb0917dea6a98b2ac429c6c749fd8888d9e5734 /mail | |
| parent | 50fe2a0feee17e564a9b346ed1dd9c5fc9a996be (diff) | |
| download | gsoc2013-evolution-7edf922a6ccbdf7a7e9e1a4459e9456f96a33314.tar.gz gsoc2013-evolution-7edf922a6ccbdf7a7e9e1a4459e9456f96a33314.tar.zst gsoc2013-evolution-7edf922a6ccbdf7a7e9e1a4459e9456f96a33314.zip | |
Fix menu items
svn path=/trunk/; revision=4870
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/folder-browser-factory.c | 22 |
2 files changed, 16 insertions, 11 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 19ffe49f04..bd0652e1b4 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2000-08-17 Peter Williams <peterw@helixcode.com> + + * folder-browser-factory.c (control_activate): Fix menu item names. + (register_ondemand): Put the ondemand hooks into the new folder menu. + 2000-08-17 Ettore Perazzoli <ettore@helixcode.com> * mail-vfolder.c (vfolder_gui_add_rule): Use stock OK/Cancel diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index 4cdc7109e5..fcb1242286 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -63,10 +63,10 @@ register_ondemand (RuleContext *f, FilterRule *rule, gpointer data) oc = g_new (struct fb_ondemand_closure, 1); oc->rule = rule; oc->fb = fb; - oc->path = g_strdup_printf ("/Actions/Filter-%s", rule->name); + oc->path = g_strdup_printf ("/<Component Placeholder>/Folder/Filter-%s", rule->name); if (fb->filter_menu_paths == NULL) - bonobo_ui_handler_menu_new_separator (uih, "/Actions/separator2", -1); + bonobo_ui_handler_menu_new_separator (uih, "/<Component Placeholder>/Folder/separator1", -1); text = g_strdup_printf (_("Run filter \"%s\""), rule->name); fb->filter_menu_paths = g_slist_prepend (fb->filter_menu_paths, oc); @@ -148,6 +148,12 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih, BONOBO_UI_HANDLER_PIXMAP_NONE, NULL, 0, 0); + bonobo_ui_handler_menu_new_item (uih, "/<Component Placeholder>/Folder/Mark all as Read", + _("_Mark all as Read"), + NULL, -1, + BONOBO_UI_HANDLER_PIXMAP_NONE, NULL, + 0, 0, mark_all_seen, folder_browser); + bonobo_ui_handler_menu_new_item (uih, "/<Component Placeholder>/Folder/Expunge", _("_Expunge"), NULL, -1, @@ -155,7 +161,7 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih, GNOME_STOCK_MENU_TRASH, 0, 0, expunge_folder, folder_browser); - bonobo_ui_handler_menu_new_item (uih, "<Component Placeholder>/Folder/Configure Folder", + bonobo_ui_handler_menu_new_item (uih, "/<Component Placeholder>/Folder/Configure Folder", _("_Configure Folder"), NULL, -1, BONOBO_UI_HANDLER_PIXMAP_NONE, @@ -182,12 +188,6 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih, GNOME_STOCK_MENU_MAIL, 0, 0, view_message, folder_browser); - bonobo_ui_handler_menu_new_item (uih, "/<Component Placeholder>/Message/Mark as Read", - _("_Mark as Read"), - NULL, -1, - BONOBO_UI_HANDLER_PIXMAP_NONE, NULL, - 0, 0, mark_all_seen, folder_browser); - bonobo_ui_handler_menu_new_item (uih, "/Settings/Mail Filters ...", _("Mail _Filters ..."), NULL, -1, @@ -261,18 +261,18 @@ control_deactivate (BonoboControl *control, bonobo_ui_handler_menu_remove (uih, "/View/Threaded"); bonobo_ui_handler_menu_remove (uih, "/<Component Placeholder>/Folder"); + bonobo_ui_handler_menu_remove (uih, "/<Component Placeholder>/Folder/Mark all as Read"); bonobo_ui_handler_menu_remove (uih, "/<Component Placeholder>/Folder/Expunge"); + bonobo_ui_handler_menu_remove (uih, "/<Component Placeholder>/Folder/Configure Folder"); bonobo_ui_handler_menu_remove (uih, "/<Component Placeholder>/Message"); bonobo_ui_handler_menu_remove (uih, "/<Component Placeholder>/Message/Edit"); bonobo_ui_handler_menu_remove (uih, "/<Component Placeholder>/Message/View"); - bonobo_ui_handler_menu_remove (uih, "/<Component Placeholder>/Message/Mark as Read"); bonobo_ui_handler_menu_remove (uih, "/Settings/Mail Filters ..."); bonobo_ui_handler_menu_remove (uih, "/Settings/vFolder Editor ..."); bonobo_ui_handler_menu_remove (uih, "/Settings/Mail Configuration ..."); bonobo_ui_handler_menu_remove (uih, "/Settings/Forget Passwords"); - bonobo_ui_handler_menu_remove (uih, "/Settings/Configure Folder"); bonobo_ui_handler_dock_remove (uih, toolbar_name); g_free (toolbar_name); |