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

[herzi svn gnome org]

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

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

	* src/ui/ui-main.c: (window_destroy_cb), (ui_main_new),
	(quit_program): prepared quit_program() for the usage with GtkActions;
	drop application_quit_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:18 2008
@@ -94,7 +94,8 @@
                       guint       callback_action,
                       GtkWidget  *widget);
 #endif
-static void quit_program      (UiMain* uimain);
+static void quit_program           (GtkAction* action,
+				    UiMain   * uimain);
 
 #ifdef GNOME
 static void about             (GtkAction* action,
@@ -207,20 +208,11 @@
         return instance;
 }
 
-#ifdef MAEMO
-static void
-application_quit_cb (GtkAction* action,
-		     UiMain   * ui)
-{
-	quit_program (ui);
-}
-#endif
-
 static void
 window_destroy_cb (GtkWidget* window,
 		   UiMain   * uimain)
 {
-	quit_program (uimain);
+	quit_program (NULL, uimain);
 }
 
 static UiMain*
@@ -244,7 +236,7 @@
 		},
 		{"ApplicationQuit", NULL, N_("Quit"),
 		 NULL, NULL,
-		 G_CALLBACK (application_quit_cb)
+		 G_CALLBACK (quit_program)
 		}
 #elif defined(GNOME)
 		{"HelpContent", GTK_STOCK_HELP, N_("_Contents"),
@@ -401,7 +393,8 @@
                                       ACCEL_PATH_STOP_GAME);
 
         item = glade_xml_get_widget(PRIVATE(ui_main)->glade_xml,"main_quit");
-        g_signal_connect_swapped( item,"activate",GTK_SIGNAL_FUNC(quit_program),ui_main);
+        g_signal_connect (item, "activate",
+			  G_CALLBACK (quit_program), ui_main);
         gtk_menu_item_set_accel_path( GTK_MENU_ITEM(item),
                                       ACCEL_PATH_QUIT_GAME);
 
@@ -591,7 +584,8 @@
 #endif
 
 static void
-quit_program (UiMain* uimain)
+quit_program (GtkAction* action,
+	      UiMain   * uimain)
 {
 	// FIXME: use gtk_main_quit()
         exit(0);