aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/folder-browser-window.c29
2 files changed, 5 insertions, 29 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4e433df686..25ad6de051 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-28 Jeffrey Stedfast <fejj@ximian.com>
+
+ * folder-browser-window.c (folder_browser_window_new): Revert a
+ failed idea.
+
2002-05-24 Radek Doulik <rodo@ximian.com>
* mail-composer-prefs.c (mail_composer_prefs_construct): ops,
diff --git a/mail/folder-browser-window.c b/mail/folder-browser-window.c
index 03a9845268..4905ae02f2 100644
--- a/mail/folder-browser-window.c
+++ b/mail/folder-browser-window.c
@@ -76,24 +76,6 @@ folder_browser_window_init (GtkObject *object)
;
}
-
-static gboolean
-destroy_cb (GtkWidget *widget, gpointer user_data)
-{
- FolderBrowserWindow *fbw = (FolderBrowserWindow *) widget;
- FolderBrowser *fb = fbw->folder_browser;
-
- if (fbw->fb_parent) {
- gtk_widget_ref (GTK_WIDGET (fb));
- gtk_widget_unparent (GTK_WIDGET (fb));
- gtk_container_add (GTK_CONTAINER (fbw->fb_parent), GTK_WIDGET (fb));
- gtk_widget_unref (GTK_WIDGET (fb));
- fbw->folder_browser = NULL;
- }
-
- return FALSE;
-}
-
static void
folder_browser_window_size_allocate_cb (GtkWidget *widget, GtkAllocation *allocation)
{
@@ -128,18 +110,7 @@ folder_browser_window_new (FolderBrowser *fb)
set_default_size (GTK_WIDGET (new));
new->folder_browser = fb;
- gtk_widget_ref (GTK_WIDGET (fb));
- if (GTK_WIDGET (fb)->parent) {
- new->fb_parent = GTK_WIDGET (fb)->parent;
- gtk_widget_unparent (GTK_WIDGET (fb));
-
- gtk_signal_connect (GTK_OBJECT (new), "delete_event",
- (GtkSignalFunc) destroy_cb, new);
- }
-
- new->folder_browser = fb;
bonobo_window_set_contents (BONOBO_WINDOW (new), GTK_WIDGET (fb));
- gtk_widget_unref (GTK_WIDGET (fb));
uicont = bonobo_ui_container_new ();
bonobo_ui_container_set_win (uicont, BONOBO_WINDOW (new));