[giggle/giggle-0-6] data/main-window.ui: Do not create another window in the remote dialog

[Javier JardÃn <jjardon src gnome org>]

commit 2805169e86670c0a10a0f743f0d929f780ebe773
Author: Javier JardÃn <jjardon gnome org>
Date:   Mon Oct 24 12:41:07 2011 +0100

    data/main-window.ui: Do not create another window in the remote dialog

 data/main-window.ui        |   23 ++++++++++++++++-------
 src/giggle-remote-editor.c |    9 +++++----
 2 files changed, 21 insertions(+), 11 deletions(-)
---
diff --git a/data/main-window.ui b/data/main-window.ui
index ad8d868..5bebcb8 100644
--- a/data/main-window.ui
+++ b/data/main-window.ui
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <object class="GtkWindow" id="remote_editor">
-    <property name="visible">True</property>
-    <property name="title">window1</property>
-    <child>
+  <!-- interface-requires gtk+ 3.0 -->
       <object class="GtkBox" id="remote_vbox">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child>
           <object class="GtkTable" id="table2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="n_rows">2</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">6</property>
@@ -43,6 +41,7 @@
             <child>
               <object class="GtkLabel" id="label13">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">URL:</property>
               </object>
@@ -56,6 +55,7 @@
             <child>
               <object class="GtkLabel" id="label11">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Name:</property>
               </object>
@@ -74,11 +74,13 @@
         <child>
           <object class="GtkBox" id="vbox10">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkLabel" id="label12">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Branches</property>
                 <attributes>
@@ -94,6 +96,7 @@
             <child>
               <object class="GtkAlignment" id="alignment5">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="left_padding">6</property>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow7">
@@ -104,21 +107,27 @@
                       <object class="GtkTreeView" id="treeview_remote_branches">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="vexpand">True</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="treeview-selection1"/>
+                        </child>
                       </object>
                     </child>
                   </object>
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
       </object>
-    </child>
-  </object>
 </interface>
diff --git a/src/giggle-remote-editor.c b/src/giggle-remote-editor.c
index 37eefba..4b7eed9 100644
--- a/src/giggle-remote-editor.c
+++ b/src/giggle-remote-editor.c
@@ -181,6 +181,7 @@ giggle_remote_editor_init (GiggleRemoteEditor *remote_editor)
 {
 	GiggleRemoteEditorPriv *priv;
 	GtkBuilder             *builder;
+	GtkWidget              *content_area, *remote_vbox;
 	GError                 *error = NULL;
 
 	priv = GET_PRIV (remote_editor);
@@ -191,9 +192,9 @@ giggle_remote_editor_init (GiggleRemoteEditor *remote_editor)
 		g_error_free (error);
 	}
 
-	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (remote_editor))),
-	                    GTK_WIDGET (gtk_builder_get_object (builder, "remote_vbox")),
-	                    TRUE, TRUE, 0);
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (remote_editor));
+	remote_vbox = GTK_WIDGET (gtk_builder_get_object (builder, "remote_vbox"));
+	gtk_container_add (GTK_CONTAINER (content_area), remote_vbox);
 
 	priv->entry_name = GTK_WIDGET (gtk_builder_get_object (builder, "entry_remote_name"));
 	priv->entry_url = GTK_WIDGET (gtk_builder_get_object (builder, "entry_remote_url"));
@@ -202,7 +203,7 @@ giggle_remote_editor_init (GiggleRemoteEditor *remote_editor)
 
 	g_object_unref (builder);
 
-	gtk_window_set_default_size (GTK_WINDOW (remote_editor), 350, 200);
+	gtk_window_set_default_size (GTK_WINDOW (remote_editor), 400, 250);
 }
 
 static GObject *