gcc 4.1 warning fix, thanks to Auchter

[aweather] / data / main.ui

diff --git a/data/main.ui b/data/main.ui
index cd889cdd21ecd0d6d9999e796a06084aaa365f77..3511db08a57322f4ae4e540bb4e5e5fbb04e703a 100644 (file)
--- a/data/main.ui
+++ b/data/main.ui
@@ -25,6 +25,7 @@
     </columns>
   </object>
   <object class="GtkWindow" id="main_window">
+    <property name="title" translatable="yes">AWeather</property>
     <child>
       <object class="GtkVBox" id="body">
         <property name="visible">True</property>
@@ -390,15 +391,17 @@
   <object class="GtkAction" id="about">
     <property name="label">About</property>
     <property name="stock_id">gtk-about</property>
-    <signal name="activate" handler="on_about"/>
+    <signal name="activate" handler="gtk_window_present" object="about_window"/>
   </object>
   <object class="GtkAction" id="prefs">
     <property name="stock_id">gtk-preferences</property>
-    <signal name="activate" handler="on_prefs"/>
+    <signal name="activate" handler="gtk_window_present" object="prefs_window"/>
   </object>
   <object class="GtkDialog" id="prefs_window">
     <property name="border_width">5</property>
+    <property name="title" translatable="yes">Preferences - AWeather</property>
     <property name="type_hint">normal</property>
+    <property name="transient_for">main_window</property>
     <property name="has_separator">False</property>
     <signal name="response" handler="gtk_widget_hide" object="prefs_window"/>
     <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
@@ -458,11 +461,16 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkEntry" id="initial_site">
+                                  <object class="GtkComboBox" id="initial_site">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="invisible_char">&#x25CF;</property>
+                                    <property name="model">sites</property>
                                     <signal name="changed" handler="on_initial_site_changed"/>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="site_rend"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="position">1</property>
@@ -622,10 +630,11 @@
   </object>
   <object class="GtkAboutDialog" id="about_window">
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">About AWeather</property>
+    <property name="title" translatable="yes">About - AWeather</property>
     <property name="resizable">False</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
+    <property name="transient_for">main_window</property>
     <property name="has_separator">False</property>
     <property name="program_name">AWeather</property>
     <property name="version">0.1</property>
@@ -903,9 +912,9 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
   </object>
   <object class="GtkSizeGroup" id="prefs_size">
     <widgets>
-      <widget name="site_label"/>
-      <widget name="nexrad_label"/>
       <widget name="log_label"/>
+      <widget name="nexrad_label"/>
+      <widget name="site_label"/>
     </widgets>
   </object>
   <object class="GtkAdjustment" id="adjustment">