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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-09-14 14:44:30 +0300 (Fri, 14 Sep 2007)
New Revision: 13817

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

	* src/hd-switcher-menu.c (hd_switcher_menu_displat_state_cb),
	src/hn-app-switcher.c (hn_app_switcher_osso_display_state_cb): keep
	track of display state changes instead of general system inactivity.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-14 11:33:43 UTC (rev 13816)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-14 11:44:30 UTC (rev 13817)
@@ -1,3 +1,9 @@
+2007-09-14  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hd-switcher-menu.c (hd_switcher_menu_displat_state_cb),
+	src/hn-app-switcher.c (hn_app_switcher_osso_display_state_cb): keep
+	track of display state changes instead of general system inactivity.
+
 2007-09-13 Johan Bilien  <johan.bilien at nokia.com>
 
 	* src/hd-app-menu-dialog.c: Fixed the leak of a string

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-09-14 11:33:43 UTC (rev 13816)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-09-14 11:44:30 UTC (rev 13817)
@@ -847,17 +847,24 @@
 }
 
 #ifdef HAVE_LIBOSSO
-static
-void hd_switcher_menu_hw_cb (osso_hw_state_t *state, gpointer data)
+static void 
+hd_switcher_menu_display_state_cb (osso_display_state_t state, gpointer data)
 {
-  g_return_if_fail (state && data);
+  gboolean system_inactivity;
+	
+  g_return_if_fail (data);
 
   HDSwitcherMenu *switcher = HD_SWITCHER_MENU (data);
   HDSwitcherMenuPrivate *priv = switcher->priv;
 
-  if (state->system_inactivity_ind != priv->system_inactivity)
+  if (state == OSSO_DISPLAY_DIMMED)
+    return;
+
+  system_inactivity = (state == OSSO_DISPLAY_OFF); 
+  
+  if (system_inactivity != priv->system_inactivity)
   {
-    priv->system_inactivity = state->system_inactivity_ind;
+    priv->system_inactivity = system_inactivity;
 
     hd_switcher_menu_refresh_application_items (switcher);
     hd_switcher_menu_refresh_notification_items (switcher);
@@ -873,7 +880,6 @@
 hd_switcher_menu_osso_init (HDSwitcherMenu *switcher)
 {
   HDSwitcherMenuPrivate *priv = switcher->priv;
-  osso_hw_state_t hs = {0};
   
   priv->osso = osso_initialize ("SM_DIMMED_infoprint", "0.1", FALSE, NULL);
 
@@ -885,12 +891,9 @@
   }
 
   /* Register stystem inactivity handler */
-  hs.system_inactivity_ind = TRUE;
-
-  osso_hw_set_event_cb (priv->osso, 
-		        &hs,
-                        hd_switcher_menu_hw_cb, 
-		        switcher);
+  osso_hw_set_display_event_cb (priv->osso,
+                                hd_switcher_menu_display_state_cb,
+                                switcher);
 }
 #endif
 

Modified: projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c	2007-09-14 11:33:43 UTC (rev 13816)
+++ projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c	2007-09-14 11:44:30 UTC (rev 13817)
@@ -466,15 +466,23 @@
  * -- currently we are only interested in the system inactivity event
  */
 static
-void hn_app_osso_hw_cb (osso_hw_state_t *state, gpointer data)
+void hn_app_osso_display_state_cb (osso_display_state_t state, gpointer data)
 {
-  g_return_if_fail(state && data);
+  gboolean system_inactivity;
+
+  g_return_if_fail(data);
+
   HNAppSwitcher *app_switcher = HN_APP_SWITCHER (data);
   HNAppSwitcherPrivate *priv = app_switcher->priv;
 
-  if (state->system_inactivity_ind != priv->system_inactivity)
+  if (state == OSSO_DISPLAY_DIMMED)
+    return;
+
+  system_inactivity = (state == OSSO_DISPLAY_OFF); 
+  
+  if (system_inactivity != priv->system_inactivity)
   {
-    priv->system_inactivity = state->system_inactivity_ind;
+    priv->system_inactivity = system_inactivity;
     queue_refresh_buttons (app_switcher);
   }
 }
@@ -483,7 +491,6 @@
 hn_app_switcher_osso_initialize (HNAppSwitcher *app_switcher)
 {
   HNAppSwitcherPrivate *priv = app_switcher->priv;
-  osso_hw_state_t hs = {0};
   
   priv->osso = osso_initialize ("AS_DIMMED_infoprint", "0.1", FALSE, NULL);
 
@@ -495,9 +502,9 @@
   }
 
   /* register stystem inactivity handler */
-  hs.system_inactivity_ind = TRUE;
-  osso_hw_set_event_cb(priv->osso, &hs,
-                       hn_app_osso_hw_cb, app_switcher);
+  osso_hw_set_display_event_cb(priv->osso,
+                               hn_app_osso_display_state_cb, 
+			       app_switcher);
   
   
 }