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

[herzi svn gnome org]

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

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

	* src/ui/ui-main.c: (ui_main_new), (new_network_game): prepared
	new_network_game() for the usage with GtkActions; drop game_join_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:20:08 2008
@@ -72,7 +72,8 @@
                               GtkWidget  *widget);
 #endif
 
-static void new_network_game  (UiMain* uimain);
+static void new_network_game       (GtkAction* action,
+				    UiMain   * uimain);
 #ifdef GNOME
 static void new_network_server(gpointer    callback_data,
                                guint       callback_action,
@@ -214,13 +215,6 @@
 }
 
 static void
-game_join_cb (GtkAction* action,
-	      UiMain   * ui)
-{
-	new_network_game (ui);
-}
-
-static void
 game_pause_cb (GtkAction* action,
 	       UiMain   * ui)
 {
@@ -255,7 +249,7 @@
 		},
 		{"GameJoin", NULL, N_("Join network game"),
 		 NULL, NULL,
-		 G_CALLBACK (game_join_cb)
+		 G_CALLBACK (new_network_game)
 		},
 		{"GamePause", NULL, N_("Pause"),
 		 NULL, NULL,
@@ -397,7 +391,8 @@
 
 
         item = glade_xml_get_widget(PRIVATE(ui_main)->glade_xml,"new_network_game");
-        g_signal_connect_swapped( item,"activate",GTK_SIGNAL_FUNC(new_network_game),ui_main);
+        g_signal_connect (item, "activate",
+			  G_CALLBACK (new_network_game), ui_main);
 
         item = glade_xml_get_widget(PRIVATE(ui_main)->glade_xml,"new_network_server");
         g_signal_connect_swapped( item,"activate",GTK_SIGNAL_FUNC(new_network_server),ui_main);
@@ -723,7 +718,8 @@
 #endif
 
 static void
-new_network_game(UiMain* uimain)
+new_network_game(GtkAction* action,
+		 UiMain   * uimain)
 {
 #ifdef MAEMO
 	PRIVATE(uimain)->ic = con_ic_connection_new();