aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodney Dawes <dobey@ximian.com>2003-12-19 03:13:32 +0800
committerRodney Dawes <dobey@src.gnome.org>2003-12-19 03:13:32 +0800
commitb95cb487512a66b2a0aeb90afc5b66b5ad6a5c55 (patch)
treec22f9c2ed4b65097bd7284750061a0a34883b4c8
parent94f858a5d085dca838e577f41d86123d38ec07a2 (diff)
downloadgsoc2013-evolution-b95cb487512a66b2a0aeb90afc5b66b5ad6a5c55.tar
gsoc2013-evolution-b95cb487512a66b2a0aeb90afc5b66b5ad6a5c55.tar.gz
gsoc2013-evolution-b95cb487512a66b2a0aeb90afc5b66b5ad6a5c55.tar.bz2
gsoc2013-evolution-b95cb487512a66b2a0aeb90afc5b66b5ad6a5c55.tar.lz
gsoc2013-evolution-b95cb487512a66b2a0aeb90afc5b66b5ad6a5c55.tar.xz
gsoc2013-evolution-b95cb487512a66b2a0aeb90afc5b66b5ad6a5c55.tar.zst
gsoc2013-evolution-b95cb487512a66b2a0aeb90afc5b66b5ad6a5c55.zip
Merge in evolution-mail-message-display.xml first, since it is the parent
2003-12-18 Rodney Dawes <dobey@ximian.com> * em-message-browser.c (emmb_init): Merge in evolution-mail-message-display.xml first, since it is the parent UI XML, really fixes bug #49949 svn path=/trunk/; revision=23984
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/em-message-browser.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 68cad831b7..0575247467 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-18 Rodney Dawes <dobey@ximian.com>
+
+ * em-message-browser.c (emmb_init): Merge in
+ evolution-mail-message-display.xml first, since it is the parent UI
+ XML, really fixes bug #49949
+
2003-12-16 JP Rosevear <jpr@ximian.com>
* em-format-html-display.c: #ifdef out certain code pieces if
diff --git a/mail/em-message-browser.c b/mail/em-message-browser.c
index 9a72fec0c5..472ff7230c 100644
--- a/mail/em-message-browser.c
+++ b/mail/em-message-browser.c
@@ -62,8 +62,8 @@ emmb_init(GObject *o)
((EMFolderView *)emmb)->preview_active = TRUE;
g_slist_free(emmb->view.ui_files);
- emmb->view.ui_files = g_slist_append(NULL, EVOLUTION_UIDIR "/evolution-mail-message.xml");
- emmb->view.ui_files = g_slist_append(emmb->view.ui_files, EVOLUTION_UIDIR "/evolution-mail-messagedisplay.xml");
+ emmb->view.ui_files = g_slist_append(NULL, EVOLUTION_UIDIR "/evolution-mail-messagedisplay.xml");
+ emmb->view.ui_files = g_slist_append(emmb->view.ui_files, EVOLUTION_UIDIR "/evolution-mail-message.xml");
/* currently: just use a scrolledwindow for preview widget */
p->preview = gtk_scrolled_window_new(NULL, NULL);