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

[herzi svn gnome org]

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

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

	* src/ui/ui-main.c: (ui_main_new): share the "New 1 Player" menu item
	between Maemo and GNOME


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:15:17 2008
@@ -222,11 +222,10 @@
 	GError* error = NULL;
 	GtkActionEntry  entries[] = {
 		{"Game", NULL, N_("_Game")},
-#ifdef MAEMO
-		{"GameNew", NULL, N_("New Game"),
+		{"GameNew1Player", NULL, N_("New 1 player"),
 		 NULL, NULL,
-		 G_CALLBACK (new_1_player_game)
-		},
+		 G_CALLBACK (new_1_player_game)},
+#ifdef MAEMO
 		{"GameJoin", NULL, N_("Join network game"),
 		 NULL, NULL,
 		 G_CALLBACK (new_network_game)
@@ -240,9 +239,6 @@
 		 G_CALLBACK (quit_program)
 		}
 #elif defined(GNOME)
-		{"GameNew1Player", NULL, N_("New 1 player"),
-		 NULL, NULL,
-		 G_CALLBACK (new_1_player_game)},
 		{"GameNew2Player", NULL, N_("New 2 players"),
 		 NULL, NULL,
 		 G_CALLBACK (new_2_player_game)},
@@ -337,7 +333,7 @@
 #ifdef MAEMO
 	gtk_ui_manager_add_ui_from_string (ui_manager,
 					   "<ui><popup name='main_menu' action='Game'>"
-					     "<menuitem action='GameNew' />"
+					     "<menuitem action='GameNew1Player' />"
 					     "<menuitem action='GameJoin' />"
 					     "<menuitem action='GamePause' />"
 					     "<menuitem action='ApplicationQuit' />"