monkey-bubble r307 - in trunk: . src/ui

[herzi svn gnome org]

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

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

	* src/ui/ui-main.c: (ui_main_new): let maemo use the same variables
	for the menu as gnome does


Modified:
   trunk/ChangeLog
   trunk/src/ui/ui-main.c

Modified: trunk/src/ui/ui-main.c
==============================================================================
--- trunk/src/ui/ui-main.c	(original)
+++ trunk/src/ui/ui-main.c	Fri Feb  8 13:37:10 2008
@@ -260,7 +260,6 @@
 	};
 #ifdef MAEMO
 	HildonProgram * program;
-	GtkWidget * main_menu;
 #endif
         UiMain * ui_main;
         GtkWidget * vbox;
@@ -358,15 +357,14 @@
 		error = NULL;
 	}
 
-#ifdef MAEMO
-	/* Setting menu */
-	main_menu = gtk_ui_manager_get_widget (ui_manager, "/ui/main_menu");
+	PRIVATE (ui_main)->menu = gtk_ui_manager_get_widget (ui_manager, "/ui/main_menu");
 
-	hildon_window_set_menu(HILDON_WINDOW(PRIVATE(ui_main)->window), GTK_MENU(main_menu));
+#ifdef MAEMO
+	hildon_window_set_menu (HILDON_WINDOW (PRIVATE (ui_main)->window),
+				GTK_MENU (PRIVATE (ui_main)->menu));
 #endif
 
 #ifdef GNOME
-        PRIVATE(ui_main)->menu = gtk_ui_manager_get_widget (ui_manager, "/ui/main_menu");
         g_object_ref(PRIVATE(ui_main)->menu);
         kp = keyboard_properties_get_instance();