diff options
| -rw-r--r-- | mail/ChangeLog | 1 | ||||
| -rw-r--r-- | mail/folder-browser-factory.c | 3 | ||||
| -rw-r--r-- | shell/ChangeLog | 4 | ||||
| -rw-r--r-- | shell/e-shell-view-menu.c | 4 | ||||
| -rw-r--r-- | ui/evolution-mail.xml | 4 |
5 files changed, 12 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 8a47dda4a9..a3f09a6a17 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -2,6 +2,7 @@ * folder-browser-factory.c: move fn to bonobo. (set_pixmap): update. + (control_deactivate): add bonobo_ui_handler_unset_container 2000-09-14 Christopher James Lahey <clahey@helixcode.com> diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index 22d1166b82..13fc4eafa2 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -222,9 +222,12 @@ control_deactivate (BonoboControl *control, BonoboUIHandler *uih, FolderBrowser *fb) { + g_warning ("In mail control_deactivate"); bonobo_ui_component_rm ( bonobo_ui_compat_get_component (uih), bonobo_ui_compat_get_container (uih), "/", NULL); + + bonobo_ui_handler_unset_container (uih); } static void diff --git a/shell/ChangeLog b/shell/ChangeLog index 385018e244..95e7e54dd4 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,9 @@ 2000-09-14 Michael Meeks <michael@helixcode.com> + * e-shell-view-menu.c: Remove sillies in toggle paths. + +2000-09-14 Michael Meeks <michael@helixcode.com> + * e-shell-view.c: move fn to bonobo. 2000-09-14 Christopher James Lahey <clahey@helixcode.com> diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c index 2ae21cc861..351c7b6231 100644 --- a/shell/e-shell-view-menu.c +++ b/shell/e-shell-view-menu.c @@ -424,8 +424,8 @@ menu_do_misc (BonoboUIComponent *component, } -#define SHORTCUT_BAR_TOGGLE_PATH "/menu/View/ShortcutBar" -#define FOLDER_BAR_TOGGLE_PATH "/menu/View/FolderBar" +#define SHORTCUT_BAR_TOGGLE_PATH "/View/ShortcutBar" +#define FOLDER_BAR_TOGGLE_PATH "/View/FolderBar" void e_shell_view_menu_setup (EShellView *shell_view) diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml index 116a1ea83a..89609aaf22 100644 --- a/ui/evolution-mail.xml +++ b/ui/evolution-mail.xml @@ -158,11 +158,11 @@ <toolitem name="Print" verb="MessagePrint" _label="Print" _descr="Print the selected message" - pixtype="pixbuf"/> + pixtype="stock" pixname="Print"/> <toolitem name="Delete" verb="MessageDelete" _label="Delete" _descr="Delete this message" - pixtype="pixbuf"/> + pixtype="stock" pixname="Trash"/> </dockitem> </Root>
\ No newline at end of file |