aboutsummaryrefslogtreecommitdiffstats
path: root/capplet
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@novell.com>2010-04-10 01:21:32 +0800
committerFederico Mena Quintero <federico@novell.com>2010-04-10 01:21:32 +0800
commita16f08974d6955f843dddce3b9423c5349873488 (patch)
tree864c537265450b65c47cb4b801817cd9eede5787 /capplet
parent5b397348258994539b452006e988be78a43a2fae (diff)
parentad1de0aa0889edaa0ad9bc41c170fa84ec5536f2 (diff)
downloadgsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar
gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar.gz
gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar.bz2
gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar.lz
gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar.xz
gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar.zst
gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.zip
Merge gnome-2-30 into express2 to get bugfixes
Note that express2 got some documentation for EExtensible and friends, and that documentation is not in gnome-2-30 yet. We need to cherry-pick those commits into gnome-2-30 and elsewhere.
Diffstat (limited to 'capplet')
-rw-r--r--capplet/settings/mail-view.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/capplet/settings/mail-view.c b/capplet/settings/mail-view.c
index 84214888a9..a344d59251 100644
--- a/capplet/settings/mail-view.c
+++ b/capplet/settings/mail-view.c
@@ -319,7 +319,6 @@ mail_view_add_folder (MailView *mv, gpointer data, gboolean block)
g_signal_connect (mfv, "view-close", G_CALLBACK(mv_close_mcv), mv);
if (!block)
gtk_notebook_set_current_page ((GtkNotebook *)mv, position);
- gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)mfv, FALSE, FALSE, 0);
g_signal_connect (mfv, "message-shown", G_CALLBACK(mv_message_shown), mv);
g_signal_connect (mfv, "message-new", G_CALLBACK(mv_message_new), mv);
g_signal_connect (mfv, "search-set", G_CALLBACK(mv_search_set), mv);
@@ -359,7 +358,6 @@ mail_view_add_composer (MailView *mv, gpointer data, gboolean block)
gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, FALSE);
if (!block)
gtk_notebook_set_current_page ((GtkNotebook *)mv, position);
- gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)mcv, FALSE, FALSE, 0);
if (!block)
mail_composer_view_activate (mcv, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
@@ -387,7 +385,6 @@ mail_view_add_message (MailView *mv, gpointer data, gboolean block)
gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, FALSE);
if (!block)
gtk_notebook_set_current_page ((GtkNotebook *)mv, position+1);
- gtk_notebook_set_tab_label_packing ((GtkNotebook *)mv, (GtkWidget *)mcv, FALSE, FALSE, 0);
if (!block)
mail_conv_view_activate (mcv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);