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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-07-16 17:39:56 +0300 (Mon, 16 Jul 2007)
New Revision: 12750

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/data/statusbar.conf.in
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
   projects/haf/trunk/hildon-desktop/src/hn-app-button.c
Log:
2007-07-16  Moises Martinez  <moises.martinez at nokia.com>

        * data/statusbar.conf.in:
        - Revert old hildon-status-bar-usb.desktop
        * src/hd-switcher-menu.c: (hd_switcher_menu_check_content):
        - move the grab to first panel when no notifications.
        * src/hn-app-button.c: (hn_app_button_create_menu):
        - Don't attach the widget. Fixes: NB#62048
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-16 14:14:45 UTC (rev 12749)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-16 14:39:56 UTC (rev 12750)
@@ -1,3 +1,12 @@
+2007-07-16  Moises Martinez  <moises.martinez at nokia.com>
+
+	* data/statusbar.conf.in:
+	- Revert old hildon-status-bar-usb.desktop
+	* src/hd-switcher-menu.c: (hd_switcher_menu_check_content):
+	- move the grab to first panel when no notifications.
+	* src/hn-app-button.c: (hn_app_button_create_menu):
+	- Don't attach the widget. Fixes: NB#62048
+
 2007-07-15  Johan Bilien  <johan.bilien at nokia.com>
 
 	* libhildondesktop/hildon-desktop-panel-window-composite.c:

Modified: projects/haf/trunk/hildon-desktop/data/statusbar.conf.in
===================================================================
--- projects/haf/trunk/hildon-desktop/data/statusbar.conf.in	2007-07-16 14:14:45 UTC (rev 12749)
+++ projects/haf/trunk/hildon-desktop/data/statusbar.conf.in	2007-07-16 14:39:56 UTC (rev 12750)
@@ -7,4 +7,4 @@
 [@hildonstatusbardesktopentrydir@/hildon-status-bar-bluetooth.desktop]
 [@hildonstatusbardesktopentrydir@/location.desktop]
 [@hildonstatusbardesktopentrydir@/hildon-status-bar-alarm.desktop]
-[@hildonstatusbardesktopentrydir@/libusbstatusbar.desktop]
+[@hildonstatusbardesktopentrydir@/hildon-status-bar-usb.desktop]

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-07-16 14:14:45 UTC (rev 12749)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-07-16 14:39:56 UTC (rev 12750)
@@ -1304,6 +1304,12 @@
        (GTK_TOGGLE_BUTTON (switcher->priv->toggle_button), FALSE);
   }
 
+  if (!children && switcher->priv->is_open)
+  {
+    g_debug ("This was necessary!!!!!!!!!!!!!!!!");	     
+    hildon_desktop_popup_window_jump_to_pane (switcher->priv->popup_window, 0);
+  }  	     
+
   g_list_free (children);
 }	
 

Modified: projects/haf/trunk/hildon-desktop/src/hn-app-button.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hn-app-button.c	2007-07-16 14:14:45 UTC (rev 12749)
+++ projects/haf/trunk/hildon-desktop/src/hn-app-button.c	2007-07-16 14:39:56 UTC (rev 12750)
@@ -410,10 +410,12 @@
 
   menu = gtk_menu_new ();
 
+#ifndef MAEMO_CHANGES
+ /* If we attach it doesn't show up with VKB */
   gtk_menu_attach_to_widget (GTK_MENU (menu), 
 		  	     GTK_WIDGET (app_button),
 			     NULL);
-
+#endif  
   children = hd_wm_entry_info_get_children (info);
   for (l = children; l != NULL; l = l->next)
   {