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

[herzi svn gnome org]

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

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

	* src/ui/ui-main.c: (game_new_cb), (game_join_cb), (game_pause_cb),
	(application_quit_cb), (ui_main_new): use extra callbacks for Maemo;
	these take GtkAction* and UiMain* arguments for the upcoming
	GtkUiManager based menubar


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:34 2008
@@ -206,6 +206,35 @@
         return instance;
 }
 
+#ifdef MAEMO
+static void
+game_new_cb (GtkAction* action,
+	     UiMain   * ui)
+{
+	new_1_player_game (ui);
+}
+
+static void
+game_join_cb (GtkAction* action,
+	      UiMain   * ui)
+{
+	new_network_game (ui);
+}
+
+static void
+game_pause_cb (GtkAction* action,
+	       UiMain   * ui)
+{
+	pause_game (ui);
+}
+
+static void
+application_quit_cb (GtkAction* action,
+		     UiMain   * ui)
+{
+	quit_program (ui);
+}
+#endif
 
 static UiMain* ui_main_new(void) {
 #ifdef MAEMO
@@ -272,23 +301,23 @@
 	main_menu = gtk_menu_new();
 
 	item = gtk_menu_item_new_with_label(_("New game"));
-	g_signal_connect_swapped (item, "activate",
-				  G_CALLBACK (new_1_player_game), ui_main);
+	g_signal_connect (item, "activate",
+			  G_CALLBACK (game_new_cb), ui_main);
 	gtk_menu_append(main_menu, item);
 
 	item = gtk_menu_item_new_with_label(_("Join network game"));
-	g_signal_connect_swapped (item, "activate",
-				  G_CALLBACK (new_network_game), ui_main);
+	g_signal_connect (item, "activate",
+			  G_CALLBACK (game_join_cb), ui_main);
 	gtk_menu_append(main_menu, item);
 
 	item = gtk_menu_item_new_with_label(_("Pause"));
-	g_signal_connect_swapped (item, "activate",
-				  G_CALLBACK (pause_game), ui_main);
+	g_signal_connect (item, "activate",
+			  G_CALLBACK (game_pause_cb), ui_main);
 	gtk_menu_append(main_menu, item);
 
 	item = gtk_menu_item_new_with_label(_("Quit"));
-	g_signal_connect_swapped (item, "activate",
-				  G_CALLBACK (quit_program), ui_main);
+	g_signal_connect (item, "activate",
+			  G_CALLBACK (application_quit_cb), ui_main);
 	gtk_menu_append(main_menu, item);
 
 	hildon_window_set_menu(HILDON_WINDOW(PRIVATE(ui_main)->window), GTK_MENU(main_menu));