monkey-bubble r297 - in trunk: . data src/ui

[herzi svn gnome org]

Author: herzi
Date: Fri Feb  8 13:14:56 2008
New Revision: 297
URL: http://svn.gnome.org/viewvc/monkey-bubble?rev=297&view=rev

Log:
2008-02-08  Sven Herzberg  <sven imendio com>

	* data/monkey-bubble.glade: remove the old vbox (it's not used
	anymore)
	* src/ui/ui-main.c: (ui_main_new): don't replace the old vbox, just
	create the new one; don't load the glade UI for Maemo


Modified:
   trunk/ChangeLog
   trunk/data/monkey-bubble.glade
   trunk/src/ui/ui-main.c

Modified: trunk/data/monkey-bubble.glade
==============================================================================
--- trunk/data/monkey-bubble.glade	(original)
+++ trunk/data/monkey-bubble.glade	Fri Feb  8 13:14:56 2008
@@ -20,14 +20,6 @@
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="main_vbox">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-    </widget>
-  </child>
 </widget>
 
 <widget class="GtkDialog" id="create_server_warning">

Modified: trunk/src/ui/ui-main.c
==============================================================================
--- trunk/src/ui/ui-main.c	(original)
+++ trunk/src/ui/ui-main.c	Fri Feb  8 13:14:56 2008
@@ -298,12 +298,9 @@
         PRIVATE(ui_main)->window = glade_xml_get_widget( PRIVATE(ui_main)->glade_xml, "main_window");
 #endif
 #ifdef MAEMO
-	PRIVATE(ui_main)->glade_xml = glade_xml_new(DATADIR"/monkey-bubble/glade/monkey-bubble.glade","main_vbox",NULL);
+	PRIVATE(ui_main)->glade_xml = NULL; //glade_xml_new(DATADIR"/monkey-bubble/glade/monkey-bubble.glade","main_vbox",NULL);
 #endif
 
-        vbox = glade_xml_get_widget (PRIVATE (ui_main)->glade_xml, "main_vbox");
-
-	gtk_widget_destroy (vbox);
 	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (vbox);