[glabels/gtk3] Make sure merge source is shown.

[Jim Evins <jimevins src gnome org>]

commit 52446a0a719433f54f4983aabbc9caff685797c7
Author: Jim Evins <evins snaught com>
Date:   Sun Nov 14 22:24:14 2010 -0500

    Make sure merge source is shown.

 data/ui/merge-properties-dialog.ui |   12 +++---------
 src/merge-properties-dialog.c      |    1 +
 2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/data/ui/merge-properties-dialog.ui b/data/ui/merge-properties-dialog.ui
index 4060989..78a947b 100644
--- a/data/ui/merge-properties-dialog.ui
+++ b/data/ui/merge-properties-dialog.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
@@ -11,6 +11,7 @@
           <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
             <property name="border_width">3</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkFrame" id="frame1">
@@ -97,7 +98,6 @@
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -113,6 +113,7 @@
                     <child>
                       <object class="GtkVBox" id="vbox3">
                         <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkScrolledWindow" id="scrolledwindow1">
@@ -132,8 +133,6 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
@@ -175,7 +174,6 @@
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -194,15 +192,11 @@
                 </child>
               </object>
               <packing>
-                <property name="expand">True</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">0</property>
           </packing>
         </child>
diff --git a/src/merge-properties-dialog.c b/src/merge-properties-dialog.c
index 90d93e2..eac35a5 100644
--- a/src/merge-properties-dialog.c
+++ b/src/merge-properties-dialog.c
@@ -186,6 +186,7 @@ gl_merge_properties_dialog_init (glMergePropertiesDialog *dialog)
 
         dialog->priv->type_combo = gtk_combo_box_text_new ();
         gtk_box_pack_start (GTK_BOX (dialog->priv->type_combo_hbox), dialog->priv->type_combo, TRUE, TRUE, 0);
+	gtk_widget_show_all (GTK_WIDGET (dialog->priv->type_combo));
 
 	gl_debug (DEBUG_MERGE, "END");
 }