cheese r754 - in trunk: . src

[dgsiegel svn gnome org]

Author: dgsiegel
Date: Sat Jun  7 02:06:10 2008
New Revision: 754
URL: http://svn.gnome.org/viewvc/cheese?rev=754&view=rev

Log:
fix a crash, when using about/quit menu items in hildon mode, fixes bug #535582, courtesy of Michael Terry


Modified:
   trunk/ChangeLog
   trunk/src/cheese-window.c

Modified: trunk/src/cheese-window.c
==============================================================================
--- trunk/src/cheese-window.c	(original)
+++ trunk/src/cheese-window.c	Sat Jun  7 02:06:10 2008
@@ -1324,15 +1324,15 @@
 #ifdef HILDON
   menu = gtk_menu_new();
   menuitem = gtk_menu_item_new_with_label(_("Quit"));
-  g_signal_connect_swapped(menuitem,"activate",
-			   GTK_SIGNAL_FUNC(cheese_window_cmd_close),
-			   NULL);
+  g_signal_connect(menuitem,"activate",
+                   GTK_SIGNAL_FUNC(cheese_window_cmd_close),
+                   cheese_window);
   gtk_menu_append(menu, menuitem);
   
   menuitem = gtk_menu_item_new_with_label(_("About"));
-  g_signal_connect_swapped(menuitem,"activate",
-			   GTK_SIGNAL_FUNC(cheese_window_cmd_about), 
-			   cheese_window->window);
+  g_signal_connect(menuitem,"activate",
+                   GTK_SIGNAL_FUNC(cheese_window_cmd_about), 
+                   cheese_window);
   gtk_menu_append(menu, menuitem);
   
   hildon_window_set_menu (HILDON_WINDOW(cheese_window->window),GTK_MENU(menu));