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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-09-25 15:57:21 +0300 (Tue, 25 Sep 2007)
New Revision: 14076

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
Log:
2007-09-25  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hd-switcher-menu.c (hd_switcher_menu_clear_item_activated):
	close popup window when activating the clear events button. Added
	some safety code for destroying clear events menu item after all
	notifications are closed. Fixes: NB#70893.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-25 12:30:27 UTC (rev 14075)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-25 12:57:21 UTC (rev 14076)
@@ -1,3 +1,10 @@
+2007-09-25  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hd-switcher-menu.c (hd_switcher_menu_clear_item_activated):
+	close popup window when activating the clear events button. Added
+	some safety code for destroying clear events menu item after all
+	notifications are closed. Fixes: NB#70893.
+
 2007-09-25 Johan Bilien  <johan.bilien at nokia.com>
 
 	* hildon-home-area.c (hildon_home_area_child_save_position): if

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-09-25 12:30:27 UTC (rev 14075)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-09-25 12:57:21 UTC (rev 14076)
@@ -1267,6 +1267,15 @@
   GtkTreeIter iter;
   gboolean need_confirmation = FALSE;
 
+  if (switcher->priv->is_open)
+    hildon_desktop_popup_window_popdown
+      (switcher->priv->popup_window);
+
+  switcher->priv->is_open = FALSE;
+  
+  gtk_toggle_button_set_active
+    (GTK_TOGGLE_BUTTON (switcher->priv->toggle_button), FALSE);
+  
   nm = GTK_TREE_MODEL (switcher->nm);
 
   if (gtk_tree_model_get_iter_first (nm, &iter))
@@ -1302,8 +1311,11 @@
       hd_switcher_menu_confirm_clear_events ())
   {
     hildon_desktop_notification_manager_close_all (switcher->nm);
-    gtk_widget_destroy (switcher->priv->clear_events_menu_item);
-    switcher->priv->clear_events_menu_item = NULL;
+    if (switcher->priv->clear_events_menu_item)
+    {
+      gtk_widget_destroy (switcher->priv->clear_events_menu_item);
+      switcher->priv->clear_events_menu_item = NULL;
+    }
   }
 }