[maemo-commits] [maemo-commits] r13928 - in projects/haf/trunk/hildon-desktop: . libhildondesktop src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-09-20 13:06:17 +0300 (Thu, 20 Sep 2007)
New Revision: 13928

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
Log:

2007-09-20 Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-switcher-menu.c: when removing an item, unselect
	it if selected
	* libhildondesktop/hildon-desktop-popup-menu.c: ensure that we
	are always calling popup_menu_remove rather than container_remove.
	Fixes: NB#70281



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-20 08:12:01 UTC (rev 13927)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-20 10:06:17 UTC (rev 13928)
@@ -1,5 +1,13 @@
 2007-09-20 Johan Bilien  <johan.bilien at nokia.com>
 
+	* src/hd-switcher-menu.c: when removing an item, unselect
+	it if selected
+	* libhildondesktop/hildon-desktop-popup-menu.c: ensure that we
+	are always calling popup_menu_remove rather than container_remove.
+	Fixes: NB#70281
+
+2007-09-20 Johan Bilien  <johan.bilien at nokia.com>
+
 	* src/hd-select-plugins-dialog.c, src/hd-home-background.c:
 	- Fixed memory leaks. Fixes: NB#70273
 

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c	2007-09-20 08:12:01 UTC (rev 13927)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c	2007-09-20 10:06:17 UTC (rev 13928)
@@ -1046,6 +1046,9 @@
 static void
 hildon_desktop_popup_menu_real_remove_item (HildonDesktopPopupMenu *menu, GtkMenuItem *item)
 {
+  if (menu->priv->selected_item == item)
+    hildon_desktop_popup_menu_deselect_item (menu, item);
+
   gtk_container_remove (GTK_CONTAINER (menu->priv->box_items), GTK_WIDGET (item));
  
   menu->priv->n_items--;
@@ -1060,6 +1063,7 @@
   hildon_desktop_popup_menu_real_remove_item (menu, item);
   
   hildon_desktop_popup_menu_parent_size (menu);
+
 }
 
 void 

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-09-20 08:12:01 UTC (rev 13927)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-09-20 10:06:17 UTC (rev 13928)
@@ -1858,7 +1858,8 @@
 	  (HD_SWITCHER_MENU_ITEM (l->data));
  
     if (info != hd_wm_get_home_info (switcher->hdwm))
-      gtk_widget_destroy (GTK_WIDGET (l->data));
+      hildon_desktop_popup_menu_remove_item (switcher->priv->menu_applications,
+                                             l->data);
   }
 
   g_list_free (children);