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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-03-21 17:31:28 +0200 (Wed, 21 Mar 2007)
New Revision: 10700

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c
Log:

	* src/hn-app-switcher.c:
        - Fixed opening of main menu.
        - Fixed little problem if building without libosso.
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-21 15:27:06 UTC (rev 10699)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-21 15:31:28 UTC (rev 10700)
@@ -1,3 +1,9 @@
+2007-03-21  Moises Martinez  <moises.martinez at nokia.com>
+
+	* src/hn-app-switcher.c:
+	- Fixed opening of main menu.
+	- Fixed little problem if building without libosso.
+
 2007-03-21  Johan Bilien  <johan.bilien at nokia.com>
 
 	* src/hd-home-window.c, libhildondesktop/hildon-desktop-home-item.c:
@@ -6,10 +12,11 @@
 	- new implementation of the applet placement, based
 	on GdkRegion
 
-2007-03-20  Moises Martinez  <moises.martinez at nokia.com>
+2007-03-21  Moises Martinez  <moises.martinez at nokia.com>
 
 	* data/Makefile.am: remove statusbar.conf while statusbar window
 	is not fixed.
+	* data/desktop.conf: commented out the statusbar section.
 
 2007-03-20  Moises Martinez  <moises.martinez at nokia.com>
 

Modified: projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c	2007-03-21 15:27:06 UTC (rev 10699)
+++ projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c	2007-03-21 15:31:28 UTC (rev 10700)
@@ -296,6 +296,14 @@
  if (!hd_wm_get_applications (app_switcher->hdwm))
    return;
 
+ if (gtk_toggle_button_get_active 
+      (GTK_TOGGLE_BUTTON (app_switcher->priv->main_button)))
+ {
+   gtk_toggle_button_set_active
+     (GTK_TOGGLE_BUTTON (app_switcher->priv->main_button), FALSE);
+   return;
+ }
+
  gtk_toggle_button_set_active 
    (GTK_TOGGLE_BUTTON (app_switcher->priv->main_button), TRUE);
  
@@ -1931,9 +1939,9 @@
 hn_app_switcher_finalize (GObject *gobject)
 {
   HNAppSwitcher *app_switch = HN_APP_SWITCHER (gobject);
+#ifdef HAVE_LIBOSSO  
   HNAppSwitcherPrivate *priv = app_switch->priv;
 
-#ifdef HAVE_LIBOSSO  
   osso_deinitialize (priv->osso);
 #endif