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

[herzi svn gnome org]

Author: herzi
Date: Wed Feb  6 16:07:22 2008
New Revision: 259
URL: http://svn.gnome.org/viewvc/monkey-bubble?rev=259&view=rev

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

	* src/ui/ui-main.c: (ui_main_new): added a GtkUIManager to make the
	menu-creation for Maemo a _lot_ easier


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 16:07:22 2008
@@ -220,9 +220,10 @@
 
 static UiMain* ui_main_new(void) {
 #ifdef MAEMO
+	GtkUIManager* ui_manager;
 	HildonProgram * program;
 	GtkWidget * container;
-	GtkWidget * main_menu; 
+	GtkWidget * main_menu;
 #endif
         UiMain * ui_main;
         GtkWidget * vbox;
@@ -232,7 +233,7 @@
 #endif
 
         ui_main = UI_MAIN(g_object_new(UI_TYPE_MAIN, NULL));
-    
+
 #ifdef GNOME
         PRIVATE(ui_main)->glade_xml = glade_xml_new(DATADIR"/monkey-bubble/glade/monkey-bubble.glade","main_window",NULL);
         
@@ -276,6 +277,8 @@
                           TRUE, 0);
 
 #ifdef MAEMO
+	ui_manager = gtk_ui_manager_new ();
+
 	/* Setting menu */
 	main_menu = gtk_menu_new();
 
@@ -302,6 +305,8 @@
 	hildon_window_set_menu(HILDON_WINDOW(PRIVATE(ui_main)->window), GTK_MENU(main_menu));
 
 	gtk_widget_show (main_menu);
+
+	g_object_unref (ui_manager);
 #endif
      
 #ifdef GNOME