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

[herzi svn gnome org]

Author: herzi
Date: Tue Feb  5 12:38:03 2008
New Revision: 251
URL: http://svn.gnome.org/viewvc/monkey-bubble?rev=251&view=rev

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

	Drop lots of GTK_SIGNAL_FUNC() casts

	* src/ui/ui-main.c: (ui_main_new):
	* src/ui/ui-network-client.c: (ui_network_client_new):


Modified:
   trunk/ChangeLog
   trunk/src/ui/ui-main.c
   trunk/src/ui/ui-network-client.c

Modified: trunk/src/ui/ui-main.c
==============================================================================
--- trunk/src/ui/ui-main.c	(original)
+++ trunk/src/ui/ui-main.c	Tue Feb  5 12:38:03 2008
@@ -244,7 +244,8 @@
 	container = glade_xml_get_widget( PRIVATE(ui_main)->glade_xml, "main_vbox");
 	program = HILDON_PROGRAM(hildon_program_get_instance());
 	PRIVATE(ui_main)->window = hildon_window_new();
-	g_signal_connect_swapped(PRIVATE(ui_main)->window ,"destroy",GTK_SIGNAL_FUNC(quit_program),ui_main);
+	g_signal_connect_swapped(PRIVATE (ui_main)->window, "destroy",
+				 G_CALLBACK (quit_program), ui_main);
 	hildon_program_add_window(program, HILDON_WINDOW(PRIVATE(ui_main)->window));
 	gtk_container_add(GTK_CONTAINER(PRIVATE(ui_main)->window),
 				container);
@@ -279,19 +280,23 @@
 	main_menu = gtk_menu_new();
 
 	item = gtk_menu_item_new_with_label(_("New game"));
-	g_signal_connect_swapped( item,"activate",GTK_SIGNAL_FUNC(new_1_player_game),ui_main);
+	g_signal_connect_swapped (item, "activate",
+				  G_CALLBACK (new_1_player_game), ui_main);
 	gtk_menu_append(main_menu, item);
 
 	item = gtk_menu_item_new_with_label(_("Join network game"));
-	g_signal_connect_swapped( item,"activate",GTK_SIGNAL_FUNC(new_network_game),ui_main);
+	g_signal_connect_swapped (item, "activate",
+				  G_CALLBACK (new_network_game), ui_main);
 	gtk_menu_append(main_menu, item);
 
 	item = gtk_menu_item_new_with_label(_("Pause"));
-	g_signal_connect_swapped( item,"activate",GTK_SIGNAL_FUNC(pause_game),ui_main);
+	g_signal_connect_swapped (item, "activate",
+				  G_CALLBACK (pause_game), ui_main);
 	gtk_menu_append(main_menu, item);
 
 	item = gtk_menu_item_new_with_label(_("Quit"));
-	g_signal_connect_swapped( item,"activate",GTK_SIGNAL_FUNC(quit_program),ui_main);
+	g_signal_connect_swapped (item, "activate",
+				  G_CALLBACK (quit_program), ui_main);
 	gtk_menu_append(main_menu, item);
 
 	hildon_window_set_menu(HILDON_WINDOW(PRIVATE(ui_main)->window), GTK_MENU(main_menu));

Modified: trunk/src/ui/ui-network-client.c
==============================================================================
--- trunk/src/ui/ui-network-client.c	(original)
+++ trunk/src/ui/ui-network-client.c	Tue Feb  5 12:38:03 2008
@@ -157,7 +157,8 @@
 	container = glade_xml_get_widget( PRIVATE(ngl)->glade_xml, "vbox1");
 	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(PRIVATE(ngl)->window)->vbox), container);
 	item = glade_xml_get_widget( PRIVATE(ngl)->glade_xml, "close_button");
-	g_signal_connect_swapped( item,"clicked",GTK_SIGNAL_FUNC(close_signal),ngl);
+	g_signal_connect_swapped (item, "clicked",
+				  G_CALLBACK (close_signal), ngl);
 	gtk_widget_set_size_request (glade_xml_get_widget (PRIVATE(ngl)->glade_xml, "scrolledwindow2"), -1, 298); // FIXME: check if necessary
 #endif