aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2002-05-24 05:34:23 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2002-05-24 05:34:23 +0800
commita70ed5cf833b20fb1c2e8cfd67223b6bc4234c18 (patch)
tree4261d7c3c324b9313f09df0a9914cbba785e78c9
parent8de7c80602afe941093b4ef408b2805601abac38 (diff)
downloadgsoc2013-evolution-a70ed5cf833b20fb1c2e8cfd67223b6bc4234c18.tar
gsoc2013-evolution-a70ed5cf833b20fb1c2e8cfd67223b6bc4234c18.tar.gz
gsoc2013-evolution-a70ed5cf833b20fb1c2e8cfd67223b6bc4234c18.tar.bz2
gsoc2013-evolution-a70ed5cf833b20fb1c2e8cfd67223b6bc4234c18.tar.lz
gsoc2013-evolution-a70ed5cf833b20fb1c2e8cfd67223b6bc4234c18.tar.xz
gsoc2013-evolution-a70ed5cf833b20fb1c2e8cfd67223b6bc4234c18.tar.zst
gsoc2013-evolution-a70ed5cf833b20fb1c2e8cfd67223b6bc4234c18.zip
Set the ui to be the evolution-mail-global.xml file thingy. Still broken
2002-05-23 Jeffrey Stedfast <fejj@ximian.com> * 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
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/folder-browser-window.c8
-rw-r--r--mail/message-browser.c7
3 files changed, 18 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 7c3ea3525b..daf5af8615 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,13 @@
2002-05-23 Jeffrey Stedfast <fejj@ximian.com>
+ * 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.
+
+2002-05-23 Jeffrey Stedfast <fejj@ximian.com>
+
* folder-browser-window.c (folder_browser_window_new): If the
folder-browser has a parent, reparent it.
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",
diff --git a/mail/message-browser.c b/mail/message-browser.c
index ae318f1869..01e6fc1d1c 100644
--- a/mail/message-browser.c
+++ b/mail/message-browser.c
@@ -279,10 +279,11 @@ set_bonobo_ui (GtkWidget *widget, FolderBrowser *fb)
/* We just opened the message! We don't need to open it again. */
CORBA_exception_init (&ev);
+ /* remove the broken menus and toolbar items */
bonobo_ui_component_rm (uic, "/menu/File/FileOps/MessageOpen", &ev);
- if (BONOBO_EX (&ev))
- g_warning ("Couldn't remove message open item. Weird. Error: %s",
- bonobo_exception_get_text (&ev));
+ bonobo_ui_component_rm (uic, "/menu/Actions/ComponentActionsPlaceholder/MailMessageActions/GoTo", &ev);
+ bonobo_ui_component_rm (uic, "/menu/Tools", &ev);
+ bonobo_ui_component_rm (uic, "/Toolbar/MailNextButtons", &ev);
CORBA_exception_free (&ev);
/* Hack around the move/copy commands api's */