[maemo-commits] [maemo-commits] r9811 - in projects/haf/trunk/maemo-af-desktop: . hildon-navigator

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-02-13 13:36:00 +0200 (Tue, 13 Feb 2007)
New Revision: 9811

Modified:
   projects/haf/trunk/maemo-af-desktop/ChangeLog
   projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-others-button.c
Log:

2007-02-08  Johan Bilien <johan.bilien at nokia.com>

	* hildon-navigator/hn-others-button.c:
	- generate the menu after a timeout of 8 seconds.
	Fixes: NB#51108



Modified: projects/haf/trunk/maemo-af-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-af-desktop/ChangeLog	2007-02-13 09:00:34 UTC (rev 9810)
+++ projects/haf/trunk/maemo-af-desktop/ChangeLog	2007-02-13 11:36:00 UTC (rev 9811)
@@ -1,5 +1,11 @@
 2007-02-08  Johan Bilien <johan.bilien at nokia.com>
 
+	* hildon-navigator/hn-others-button.c:
+	- generate the menu after a timeout of 8 seconds.
+	Fixes: NB#51108
+
+2007-02-08  Johan Bilien <johan.bilien at nokia.com>
+
 	* configure.ac: 2.9.99.21
 	
 2007-02-08  Johan Bilien <johan.bilien at nokia.com>

Modified: projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-others-button.c
===================================================================
--- projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-others-button.c	2007-02-13 09:00:34 UTC (rev 9810)
+++ projects/haf/trunk/maemo-af-desktop/hildon-navigator/hn-others-button.c	2007-02-13 11:36:00 UTC (rev 9811)
@@ -126,6 +126,8 @@
 hn_others_button_button_release(HNOthersButton *button, GdkEventButton *event,
 				gpointer d);
 
+static gboolean
+hn_others_button_menu_changed (HNOthersButton * button);
      
 /* HNOthersButton implementation */
 struct _HNOthersButtonPrivate
@@ -134,6 +136,7 @@
   guint       collapse_id;
   gboolean    thumb_pressed;
   guint       dnotify_update_timeout;
+  guint       generate_menu_source;
 };
 
 
@@ -203,6 +206,8 @@
   priv->collapse_id            = 0;
   priv->thumb_pressed          = FALSE;
   priv->dnotify_update_timeout = 0;
+  priv->generate_menu_source =
+      g_timeout_add (8000, (GSourceFunc)hn_others_button_menu_changed, button);
   
 }
 
@@ -686,6 +691,14 @@
     
   g_return_if_fail (button);
 
+  g_debug ("Creating menu");
+
+  if (button->priv->generate_menu_source)
+    {
+      g_source_remove (button->priv->generate_menu_source);
+      button->priv->generate_menu_source = 0;
+    }
+
   /* create the menu shell, and connect callbacks */
   menu = gtk_menu_new();
     
@@ -945,6 +958,7 @@
   HN_DBG ("Creating menu");
   
   button->priv->dnotify_update_timeout = 0;
+  button->priv->generate_menu_source = 0;
 
   hn_others_button_create_menu (button);
   return FALSE;
@@ -958,9 +972,9 @@
   if( !button->priv->dnotify_update_timeout )
     {
       button->priv->dnotify_update_timeout =
-	g_timeout_add(1000,
-		      (GSourceFunc)hn_others_button_menu_changed,
-		      button);
+          g_timeout_add(1000,
+                        (GSourceFunc)hn_others_button_menu_changed,
+                        button);
     }
 }