diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 4 | ||||
| -rw-r--r-- | shell/e-shell-view-menu.c | 15 | ||||
| -rw-r--r-- | shell/e-shell-view.c | 14 |
3 files changed, 14 insertions, 19 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 2e335a2bbf..e1f0f638cd 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,7 @@ +2000-09-22 Michael Meeks <michael@helixcode.com> + + * e-shell-view-menu.c (e_shell_view_menu_setup): upd. + 2000-09-21 Federico Mena Quintero <federico@helixcode.com> * e-shell-view-menu.c: Fix mis-spelling of "calendar". diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c index 78e62953d7..13ec5c4cb8 100644 --- a/shell/e-shell-view-menu.c +++ b/shell/e-shell-view-menu.c @@ -448,8 +448,6 @@ e_shell_view_menu_setup (EShellView *shell_view) BonoboUIHandler *uih; Bonobo_UIContainer container; BonoboUIComponent *component; - char *fname; - xmlNode *ui; g_return_if_fail (shell_view != NULL); g_return_if_fail (E_IS_SHELL_VIEW (shell_view)); @@ -472,16 +470,9 @@ e_shell_view_menu_setup (EShellView *shell_view) bonobo_ui_container_freeze (container, NULL); - fname = bonobo_ui_util_get_ui_fname ( - EVOLUTION_DATADIR, "evolution.xml"); - g_warning ("Attempting ui load from '%s'", fname); - - ui = bonobo_ui_util_new_ui (component, fname, "evolution"); - - bonobo_ui_component_set_tree (component, container, "/", ui, NULL); - - g_free (fname); - xmlFreeNode (ui); + bonobo_ui_util_set_ui (component, container, + EVOLUTION_DATADIR, "evolution.xml", + "evolution"); menu_do_misc (component, shell_view); diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index a7a0a766e5..b1444cd6ac 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -212,13 +212,13 @@ storage_set_view_box_map_cb (GtkWidget *widget, shell_view = E_SHELL_VIEW (data); priv = shell_view->priv; - if ((gdk_pointer_grab (widget->window, TRUE, - (GDK_BUTTON_PRESS_MASK - | GDK_BUTTON_RELEASE_MASK - | GDK_ENTER_NOTIFY_MASK - | GDK_LEAVE_NOTIFY_MASK - | GDK_POINTER_MOTION_MASK), - NULL, NULL, GDK_CURRENT_TIME) != 0)) { + if (gdk_pointer_grab (widget->window, TRUE, + (GDK_BUTTON_PRESS_MASK + | GDK_BUTTON_RELEASE_MASK + | GDK_ENTER_NOTIFY_MASK + | GDK_LEAVE_NOTIFY_MASK + | GDK_POINTER_MOTION_MASK), + NULL, NULL, GDK_CURRENT_TIME) != 0) { g_warning ("%s -- pointer grab failed.", __FUNCTION__); e_shell_view_set_folder_bar_mode (shell_view, E_SHELL_VIEW_SUBWINDOW_STICKY); return; |