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

[herzi svn gnome org]

Author: herzi
Date: Thu Feb  7 00:21:11 2008
New Revision: 276
URL: http://svn.gnome.org/viewvc/monkey-bubble?rev=276&view=rev

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

	* src/ui/ui-main.c: (continue_game), (ui_main_new), (pause_game):
	prepared pause_game() for the usage with GtkActions; drop
	game_pause_cb() which was a wrapper - now the signatures are identical


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	Thu Feb  7 00:21:11 2008
@@ -87,7 +87,8 @@
 			     GtkWidget* widget);
 #endif
 
-static void pause_game        (UiMain* uimain);
+static void pause_game             (GtkAction* action,
+				    UiMain   * uimain);
 #ifdef GNOME
 static void stop_game(gpointer    callback_data,
                       guint       callback_action,
@@ -166,7 +167,6 @@
 
         ui_main_new_1_player_game(ui_main);
 }
-
 #endif
 
 GType ui_main_get_type(void) {
@@ -209,13 +209,6 @@
 
 #ifdef MAEMO
 static void
-game_pause_cb (GtkAction* action,
-	       UiMain   * ui)
-{
-	pause_game (ui);
-}
-
-static void
 application_quit_cb (GtkAction* action,
 		     UiMain   * ui)
 {
@@ -247,7 +240,7 @@
 		},
 		{"GamePause", NULL, N_("Pause"),
 		 NULL, NULL,
-		 G_CALLBACK (game_pause_cb)
+		 G_CALLBACK (pause_game)
 		},
 		{"ApplicationQuit", NULL, N_("Quit"),
 		 NULL, NULL,
@@ -397,7 +390,8 @@
 				 G_CALLBACK(show_high_scores), ui_main);
 
         item = glade_xml_get_widget(PRIVATE(ui_main)->glade_xml,"pause_game");
-        g_signal_connect_swapped( item,"activate",GTK_SIGNAL_FUNC(pause_game),ui_main);
+        g_signal_connect (item, "activate",
+			  G_CALLBACK (pause_game), ui_main);
         gtk_menu_item_set_accel_path( GTK_MENU_ITEM(item),
                                       ACCEL_PATH_PAUSE_GAME);
 
@@ -604,7 +598,8 @@
 }
 
 static void
-pause_game (UiMain* ui_main)
+pause_game (GtkAction* action,
+	    UiMain   * ui_main)
 {
         if( PRIVATE(ui_main)->game != NULL) {
                 if( game_get_state( PRIVATE(ui_main)->game) == GAME_PAUSED) {