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

[herzi svn gnome org]

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

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

	* data/monkey-bubble.glade: dropped the main window
	* src/ui/ui-main.c: (ui_main_new): don't use glade for the main window
	anymore


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:15:03 2008
@@ -3,25 +3,6 @@
 
 <glade-interface>
 
-<widget class="GtkWindow" id="main_window">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Monkey Bubble</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER</property>
-  <property name="modal">False</property>
-  <property name="default_width">640</property>
-  <property name="default_height">490</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-</widget>
-
 <widget class="GtkDialog" id="create_server_warning">
   <property name="visible">True</property>
   <property name="title" translatable="yes">Warning</property>

Modified: trunk/src/ui/ui-main.c
==============================================================================
--- trunk/src/ui/ui-main.c	(original)
+++ trunk/src/ui/ui-main.c	Fri Feb  8 13:15:03 2008
@@ -292,13 +292,10 @@
 
         ui_main = UI_MAIN(g_object_new(UI_TYPE_MAIN, NULL));
 
+	PRIVATE (ui_main)->glade_xml = NULL;
 #ifdef GNOME
-        PRIVATE(ui_main)->glade_xml = glade_xml_new(DATADIR"/monkey-bubble/glade/monkey-bubble.glade","main_window",NULL);
-        
-        PRIVATE(ui_main)->window = glade_xml_get_widget( PRIVATE(ui_main)->glade_xml, "main_window");
-#endif
-#ifdef MAEMO
-	PRIVATE(ui_main)->glade_xml = NULL; //glade_xml_new(DATADIR"/monkey-bubble/glade/monkey-bubble.glade","main_vbox",NULL);
+	PRIVATE (ui_main)->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_title (GTK_WINDOW (PRIVATE (ui_main)->window), _("Monkey Bubble"));
 #endif
 
 	vbox = gtk_vbox_new (FALSE, 0);