[xchat-gnome] Bug 654684 - xchat-gnome crash with SIGSEGV in IA__gtk_list_store_append

[Ritesh Khadgaray <rkhadgaray src gnome org>]

commit 9751e6ab5a41bcd55db7248dbd6c5e887c1d9279
Author: Marc Deslauriers <marc deslauriers ubuntu com>
Date:   Sat Sep 17 18:39:54 2011 +0530

    Bug 654684 - xchat-gnome crash with SIGSEGV in IA__gtk_list_store_append

 data/irc-network-editor.glade     |    4 ++--
 src/fe-gnome/irc-network-editor.c |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/data/irc-network-editor.glade b/data/irc-network-editor.glade
index 7c91715..0862ad9 100644
--- a/data/irc-network-editor.glade
+++ b/data/irc-network-editor.glade
@@ -7,13 +7,13 @@
 -->
 <interface>
   <object class="GtkDialog" id="dialog1">
-    <property name="visible">True</property>
+    <property name="visible">False</property>
     <property name="border_width">5</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
-        <property name="visible">True</property>
+        <property name="visible">False</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkNotebook" id="toplevel">
diff --git a/src/fe-gnome/irc-network-editor.c b/src/fe-gnome/irc-network-editor.c
index 4f86a5a..03805b8 100644
--- a/src/fe-gnome/irc-network-editor.c
+++ b/src/fe-gnome/irc-network-editor.c
@@ -303,6 +303,9 @@ irc_network_editor_init (IrcNetworkEditor *dialog)
 
 	g_object_unref (xml);
 
+	GtkWidget *content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_widget_reparent (dialog->toplevel, content_area);
+
 	dialog->server_store = gtk_list_store_new (1, G_TYPE_STRING);
 	dialog->autojoin_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
 	dialog->server_renderer = gtk_cell_renderer_text_new ();
@@ -338,7 +341,7 @@ irc_network_editor_init (IrcNetworkEditor *dialog)
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
 
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
-	gtk_container_add (GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), dialog->toplevel);
+
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 
 	server_selection   = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->servers));