aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorPeter Williams <peterw@ximian.com>2002-07-19 01:07:19 +0800
committerPeter Williams <peterw@src.gnome.org>2002-07-19 01:07:19 +0800
commitb177dac4bc66fcf25445122bb1b9819e2cce5a6c (patch)
tree9258d6f65b1325e62345e03f1638538dd2c47738 /mail
parent093aba2984e28ae0a5b33186a3316e1ed9be7e0f (diff)
downloadgsoc2013-evolution-b177dac4bc66fcf25445122bb1b9819e2cce5a6c.tar
gsoc2013-evolution-b177dac4bc66fcf25445122bb1b9819e2cce5a6c.tar.gz
gsoc2013-evolution-b177dac4bc66fcf25445122bb1b9819e2cce5a6c.tar.bz2
gsoc2013-evolution-b177dac4bc66fcf25445122bb1b9819e2cce5a6c.tar.lz
gsoc2013-evolution-b177dac4bc66fcf25445122bb1b9819e2cce5a6c.tar.xz
gsoc2013-evolution-b177dac4bc66fcf25445122bb1b9819e2cce5a6c.tar.zst
gsoc2013-evolution-b177dac4bc66fcf25445122bb1b9819e2cce5a6c.zip
Load the messagedisplay XML file as a base for the UI, so that things
2002-07-18 Peter Williams <peterw@ximian.com> * folder-browser-window.c (folder_browser_window_new): Load the messagedisplay XML file as a base for the UI, so that things appear. Don't add the global UI items as they don't make sense here. (fb_window_close): New function, used to ... close the window, suprisingly. svn path=/trunk/; revision=17505
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/folder-browser-window.c21
2 files changed, 26 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 72b30520b4..77c01e59a4 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2002-07-18 Peter Williams <peterw@ximian.com>
+
+ * folder-browser-window.c (folder_browser_window_new): Load the
+ messagedisplay XML file as a base for the UI, so that things
+ appear. Don't add the global UI items as they don't make sense
+ here.
+ (fb_window_close): New function, used to ... close the window,
+ suprisingly.
+
2002-07-18 Not Zed <NotZed@Ximian.com>
* main.c (main): Put the mcheck stuff back in, which was removed
diff --git a/mail/folder-browser-window.c b/mail/folder-browser-window.c
index 4905ae02f2..4de61937f6 100644
--- a/mail/folder-browser-window.c
+++ b/mail/folder-browser-window.c
@@ -93,6 +93,18 @@ set_default_size (GtkWidget *widget)
gtk_window_set_default_size (GTK_WINDOW (widget), width, height);
}
+static void
+fb_window_close (BonoboUIComponent *uih, gpointer user, const char *path)
+{
+ gtk_widget_destroy (GTK_WIDGET (user));
+}
+
+static BonoboUIVerb
+verbs[] = {
+ BONOBO_UI_VERB ("MessageBrowserClose", fb_window_close),
+ BONOBO_UI_VERB_END
+};
+
GtkWidget *
folder_browser_window_new (FolderBrowser *fb)
{
@@ -117,15 +129,16 @@ folder_browser_window_new (FolderBrowser *fb)
uic = bonobo_ui_component_new_default ();
bonobo_ui_component_set_container (uic, BONOBO_OBJREF (uicont));
-
+ bonobo_ui_component_add_verb_list_with_data (uic, verbs, new);
+
folder_browser_set_ui_component (FOLDER_BROWSER (fb), uic);
- bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR, "evolution-mail-global.xml", "evolution-mail");
+ /* ok, not quite the UI the message display was intended for, but close enough */
+ bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR, "evolution-mail-messagedisplay.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",