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

[herzi svn gnome org]

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

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

	* src/ui/ui-main.c: (ui_main_new): add a user interface to the
	GtkUIManager for the GNOME code


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:43 2008
@@ -247,6 +247,7 @@
 ui_main_new (void)
 {
 	GtkUIManager* ui_manager;
+	GError* error = NULL;
 	GtkActionGroup* actions;
 	GtkActionEntry  entries[] = {
 #ifdef MAEMO
@@ -270,7 +271,6 @@
 #endif
 	};
 #ifdef MAEMO
-	GError* error = NULL;
 	HildonProgram * program;
 	GtkWidget * container;
 	GtkWidget * main_menu;
@@ -343,6 +343,14 @@
 					   "</popup></ui>",
 					   -1,
 					   &error);
+#endif
+#ifdef GNOME
+	gtk_ui_manager_add_ui_from_string (ui_manager,
+					   "<ui><popup name='help_menu'>"
+					   "</popup></ui>",
+					   -1,
+					   &error);
+#endif
 
 	if (error) {
 		g_warning ("there was en error constructing the user interface: %s",
@@ -351,6 +359,7 @@
 		error = NULL;
 	}
 
+#ifdef MAEMO
 	/* Setting menu */
 	main_menu = gtk_ui_manager_get_widget (ui_manager, "/ui/main_menu");