From a70ed5cf833b20fb1c2e8cfd67223b6bc4234c18 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 23 May 2002 21:34:23 +0000 Subject: Set the ui to be the evolution-mail-global.xml file thingy. Still broken 2002-05-23 Jeffrey Stedfast * folder-browser-window.c (folder_browser_window_new): Set the ui to be the evolution-mail-global.xml file thingy. Still broken but oh well. I give up. bonobo-ui sucks. * message-browser.c (set_bonobo_ui): Fixed to not crash. svn path=/trunk/; revision=16994 --- mail/folder-browser-window.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'mail/folder-browser-window.c') diff --git a/mail/folder-browser-window.c b/mail/folder-browser-window.c index 0f8132454a..03a9845268 100644 --- a/mail/folder-browser-window.c +++ b/mail/folder-browser-window.c @@ -78,7 +78,7 @@ folder_browser_window_init (GtkObject *object) static gboolean -destroy_cb (GtkWidget *widget) +destroy_cb (GtkWidget *widget, gpointer user_data) { FolderBrowserWindow *fbw = (FolderBrowserWindow *) widget; FolderBrowser *fb = fbw->folder_browser; @@ -134,7 +134,7 @@ folder_browser_window_new (FolderBrowser *fb) gtk_widget_unparent (GTK_WIDGET (fb)); gtk_signal_connect (GTK_OBJECT (new), "delete_event", - destroy_cb, new); + (GtkSignalFunc) destroy_cb, new); } new->folder_browser = fb; @@ -148,9 +148,13 @@ folder_browser_window_new (FolderBrowser *fb) bonobo_ui_component_set_container (uic, BONOBO_OBJREF (uicont)); folder_browser_set_ui_component (FOLDER_BROWSER (fb), uic); + + bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR, "evolution-mail-global.xml", "evolution-mail"); + folder_browser_ui_add_global (fb); folder_browser_ui_add_list (fb); folder_browser_ui_add_message (fb); + /*folder_browser_set_shell_view (fb, fb_get_svi (control));*/ gtk_signal_connect (GTK_OBJECT (new), "size_allocate", -- cgit v1.2.3