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

[herzi svn gnome org]

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

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

	* data/monkey-bubble.glade: dropped the menu bar from the glade file
	* src/ui/ui-main.c: (ui_main_new): don't hide the menubar anymore,
	it's gone (Maemo); don't destroy() the menubar anymore, it's gone (for
	GNOME)


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:31 2008
@@ -26,39 +26,6 @@
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
-
-      <child>
-	<widget class="GtkMenuBar" id="main_menubar">
-	  <property name="visible">True</property>
-	  <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
-	  <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="game_menu">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Game</property>
-	      <property name="use_underline">True</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="help">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Help</property>
-	      <property name="use_underline">True</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<placeholder/>
-      </child>
     </widget>
   </child>
 </widget>

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:31 2008
@@ -312,8 +312,6 @@
 	g_set_application_name(_("Monkey Bubble"));
 	g_signal_connect(G_OBJECT(program), "notify::is-topmost", G_CALLBACK(ui_main_topmost_cb), NULL);
 	PRIVATE(ui_main)->ic = NULL;
-
-	gtk_widget_hide (glade_xml_get_widget (PRIVATE(ui_main)->glade_xml, "main_menubar"));
 #endif
 
         vbox = glade_xml_get_widget( PRIVATE(ui_main)->glade_xml,"main_vbox");
@@ -389,7 +387,6 @@
 #endif
 
 #ifdef GNOME
-	gtk_widget_destroy (glade_xml_get_widget (PRIVATE (ui_main)->glade_xml, "main_menubar"));
         PRIVATE(ui_main)->menu = gtk_ui_manager_get_widget (ui_manager, "/ui/menubar");
         g_object_ref(PRIVATE(ui_main)->menu);
         kp = keyboard_properties_get_instance();