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

[herzi svn gnome org]

Author: herzi
Date: Wed Feb  6 23:14:31 2008
New Revision: 266
URL: http://svn.gnome.org/viewvc/monkey-bubble?rev=266&view=rev

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

	* src/ui/ui-main.c: (ui_main_new): provide the GtkUIManager for the
	GNOME code, too


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	Wed Feb  6 23:14:31 2008
@@ -246,8 +246,8 @@
 static UiMain*
 ui_main_new (void)
 {
-#ifdef MAEMO
 	GtkUIManager* ui_manager;
+#ifdef MAEMO
 	HildonProgram * program;
 	GtkWidget * container;
 	GtkWidget * main_menu;
@@ -323,8 +323,9 @@
                           TRUE,
                           TRUE, 0);
 
-#ifdef MAEMO
 	ui_manager = gtk_ui_manager_new ();
+
+#ifdef MAEMO
 	actions    = gtk_action_group_new ("main");
 	gtk_action_group_add_actions (actions, entries,
 				      G_N_ELEMENTS (entries), ui_main);
@@ -353,7 +354,6 @@
 	hildon_window_set_menu(HILDON_WINDOW(PRIVATE(ui_main)->window), GTK_MENU(main_menu));
 
 	g_object_unref (actions);
-	g_object_unref (ui_manager);
 #endif
 
 #ifdef GNOME
@@ -423,6 +423,8 @@
                                   ui_main);
 #endif
 
+	g_object_unref (ui_manager);
+
         PRIVATE(ui_main)->game = NULL;
 
         ui_main_set_game( ui_main,NULL);