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

[herzi svn gnome org]

Author: herzi
Date: Fri Feb  8 13:15:45 2008
New Revision: 304
URL: http://svn.gnome.org/viewvc/monkey-bubble?rev=304&view=rev

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

	* src/ui/ui-main.c: (ui_main_new): merged the destroy handlers for the
	main window


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	Fri Feb  8 13:15:45 2008
@@ -281,8 +281,6 @@
 #ifdef MAEMO
 	program = HILDON_PROGRAM(hildon_program_get_instance());
 	PRIVATE(ui_main)->window = hildon_window_new();
-	g_signal_connect (PRIVATE (ui_main)->window, "destroy",
-			  G_CALLBACK (window_destroy_cb), ui_main);
 	hildon_program_add_window(program, HILDON_WINDOW(PRIVATE(ui_main)->window));
 	g_set_application_name(_("Monkey Bubble"));
 	g_signal_connect(G_OBJECT(program), "notify::is-topmost", G_CALLBACK(ui_main_topmost_cb), NULL);
@@ -393,11 +391,11 @@
 				   ACCEL_PATH_STOP_GAME);
 	gtk_action_set_accel_path (gtk_action_group_get_action (PRIVATE (ui_main)->actions, "GameQuit"),
 				   ACCEL_PATH_QUIT_GAME);
-
-        g_signal_connect (PRIVATE (ui_main)->window, "delete-event",
-			  G_CALLBACK (window_destroy_cb), NULL);
 #endif
 
+	g_signal_connect (PRIVATE (ui_main)->window, "destroy",
+			  G_CALLBACK (window_destroy_cb), ui_main);
+
 	g_object_unref (ui_manager);
 
         ui_main_enabled_games_item(ui_main ,TRUE);