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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-05-23 19:39:10 +0300 (Wed, 23 May 2007)
New Revision: 11790

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

	* src/hd-switcher-menu.c: Fixed behavior I just introduced.
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-23 16:20:17 UTC (rev 11789)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-23 16:39:10 UTC (rev 11790)
@@ -1,3 +1,7 @@
+2007-05-23  Moises Martinez  <moises.martinez at nokia.com>
+
+	* src/hd-switcher-menu.c: Fixed behavior I just introduced.
+
 2007-05-23  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* configure.ac: 0.0.14
@@ -2,13 +6,13 @@
 
-2007-05-22  Moises Martinez  <moises.martinez at nokia.com>
+2007-05-23  Moises Martinez  <moises.martinez at nokia.com>
 
 	* src/hd-switcher-menu.c: check state of blinking application when
 	application is in app switcher slot. Fixes: NB#57680
 
-2007-05-22  Moises Martinez  <moises.martinez at nokia.com>
+2007-05-23  Moises Martinez  <moises.martinez at nokia.com>
 
 	* src/hn-app-switcher.c:
 	- Show items in junk dialog of application killer. Fixes: NB54712
 
-2007-05-22  Moises Martinez  <moises.martinez at nokia.com>
+2007-05-23  Moises Martinez  <moises.martinez at nokia.com>
 
@@ -18,7 +22,7 @@
 	- Reverting to GtkMenuItem. Image shows but behavior not consistent
 	enough.
 
-2007-05-22  Moises Martinez  <moises.martinez at nokia.com>
+2007-05-23  Moises Martinez  <moises.martinez at nokia.com>
 
 	* src/hd-switcher-menu-item.c:
 	- Inherits againg from GtkImageMenuItem.

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-05-23 16:20:17 UTC (rev 11789)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-05-23 16:39:10 UTC (rev 11790)
@@ -811,8 +811,11 @@
 
     n_apps = g_list_length (apps);
 
-    if (n_apps <= SWITCHER_N_SLOTS) 
+    if (n_apps <= SWITCHER_N_SLOTS && switcher->priv->last_urgent_info) 
+    {	    
       hd_switcher_menu_reset_main_icon (switcher);	    
+      switcher->priv->last_urgent_info = NULL;
+    }
   }
   else
   {	  
@@ -904,7 +907,7 @@
       HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_LEFT;
   GtkWidget *button = GTK_BIN (switcher)->child;
   gboolean dettached = FALSE;
-
+  
   if (!button)
   {	  
     button = GTK_BIN (switcher->priv->window_dialog)->child;	  
@@ -924,10 +927,10 @@
   }
 
   gtk_widget_size_request (GTK_WIDGET (menu), &req);
-
+  
   menu_height = req.height;
   main_height = gdk_screen_get_height (screen);
-
+  
   switch (orientation)
   {
     case HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_LEFT:
@@ -941,9 +944,9 @@
       else
       {
         if (!dettached)	      
-          *y = button->allocation.y;
+	  *y = button->allocation.y;
 	else
-          *y = main_height -menu_height;// button->requisition.height;
+	  *y = main_height - menu_height;
       }
       break;
 
@@ -999,7 +1002,7 @@
     hd_switcher_menu_position_func,
     (gpointer)switcher,
     GDK_CURRENT_TIME);
-
+  
   if (!hildon_desktop_popup_menu_get_children (switcher->priv->menu_notifications))
     gtk_widget_hide (hildon_desktop_popup_window_get_pane (switcher->priv->popup_window, 1));
   else