aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog1
-rw-r--r--mail/mail-composer-prefs.c4
-rw-r--r--mail/mail-preferences.c4
3 files changed, 4 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 1e6d5f8a3f..5c291b31a1 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -149,7 +149,6 @@
* mail-preferences.c: Implements the mailer's Preferences tab in
Anna's new config GUI.
->>>>>>> 1.2089.2.5
2002-03-19 Larry Ewing <lewing@ximian.com>
* mail-display.c: add missing NULL closure data to popup menu
diff --git a/mail/mail-composer-prefs.c b/mail/mail-composer-prefs.c
index ef8afb3d4d..6b1f4e09dc 100644
--- a/mail/mail-composer-prefs.c
+++ b/mail/mail-composer-prefs.c
@@ -158,8 +158,8 @@ mail_composer_prefs_construct (MailComposerPrefs *prefs)
/* reparent */
gtk_widget_ref (toplevel);
- gtk_widget_unparent (toplevel);
- gtk_widget_set_parent (toplevel, GTK_WIDGET (prefs));
+ gtk_container_remove (GTK_CONTAINER (toplevel->parent), toplevel);
+ gtk_container_add (GTK_CONTAINER (prefs), toplevel);
gtk_widget_unref (toplevel);
/* General tab */
diff --git a/mail/mail-preferences.c b/mail/mail-preferences.c
index 51c6bbb500..02096798a4 100644
--- a/mail/mail-preferences.c
+++ b/mail/mail-preferences.c
@@ -171,8 +171,8 @@ mail_preferences_construct (MailPreferences *prefs)
/* reparent */
gtk_widget_ref (toplevel);
- gtk_widget_unparent (toplevel);
- gtk_widget_set_parent (toplevel, GTK_WIDGET (prefs));
+ gtk_container_remove (GTK_CONTAINER (toplevel->parent), toplevel);
+ gtk_container_add (GTK_CONTAINER (prefs), toplevel);
gtk_widget_unref (toplevel);
/* General tab */