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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-04-13 17:48:05 +0300 (Fri, 13 Apr 2007)
New Revision: 11029

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
   projects/haf/trunk/hildon-desktop/src/hd-desktop.c
Log:

	* libhildonwm/hd-wm-c:
        - Added dbus method previously removed.
        * src/hd-desktop.c:
        - Only check timeout value.
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-04-13 14:24:59 UTC (rev 11028)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-04-13 14:48:05 UTC (rev 11029)
@@ -1,5 +1,12 @@
 2007-04-13  Moises Martinez  <moises.martinez at nokia.com>
 
+	* libhildonwm/hd-wm-c:
+	- Added dbus method previously removed.
+	* src/hd-desktop.c:
+	- Only check timeout value.
+
+2007-04-13  Moises Martinez  <moises.martinez at nokia.com>
+
 	* libhildondesktop/hildon-desktop-panel-window-dialog.c:
 	- Set no of items for container to 7. Fixes: NB#54193
 

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c	2007-04-13 14:24:59 UTC (rev 11028)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c	2007-04-13 14:48:05 UTC (rev 11029)
@@ -560,7 +560,51 @@
 				void           *data)
 {
   const gchar *path;
+  HDWM  *hdwm = HD_WM (data);
 
+  /* Catch APP_LAUNCH_BANNER_METHOD */
+  if (dbus_message_is_method_call (message,
+                                  APP_LAUNCH_BANNER_METHOD_INTERFACE,
+                                  APP_LAUNCH_BANNER_METHOD ) )
+  {
+    DBusError         error;
+    gchar            *service_name = NULL;
+    HDWMWatchableApp *app;
+
+    dbus_error_init (&error);
+
+    dbus_message_get_args (message,
+                          &error,
+                          DBUS_TYPE_STRING,
+                          &service_name,
+                          DBUS_TYPE_INVALID );
+
+    if (dbus_error_is_set (&error))
+    {
+      g_warning ("Error getting message args: %s\n", error.message);
+      dbus_error_free (&error);
+      return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+    }
+
+    g_return_val_if_fail (service_name, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
+
+    g_debug ("Checking if service: '%s' is watchable", service_name);
+
+    /* Is this 'service' watchable ? */
+    if ((app = hd_wm_lookup_watchable_app_via_service (service_name)) != NULL)
+    {
+      if (hd_wm_watchable_app_has_startup_notify (app) &&
+         hdwm->priv->lowmem_banner_timeout >= 0 &&
+         !hd_wm_watchable_app_has_windows (app))
+      {
+        g_signal_emit_by_name (hdwm,
+                               "application-starting",
+                               app);
+      }
+    }
+  }
+
+
   path = dbus_message_get_path(message);
   if (path != NULL && g_str_equal(path, TASKNAV_GENERAL_PATH))
   {

Modified: projects/haf/trunk/hildon-desktop/src/hd-desktop.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-desktop.c	2007-04-13 14:24:59 UTC (rev 11028)
+++ projects/haf/trunk/hildon-desktop/src/hd-desktop.c	2007-04-13 14:48:05 UTC (rev 11029)
@@ -152,8 +152,8 @@
   t2 = (long unsigned int) current_time.tv_sec;
   time_left = (guint) (t2 - t1);
 
-  if (time_left >= current_banner_timeout ||
-      hd_wm_watchable_app_has_windows (info->app))
+  if (time_left >= current_banner_timeout+4)/* ||
+      hd_wm_watchable_app_has_windows (info->app))*/
   {
     hd_desktop_launch_banner_close (NULL, info);
     return FALSE;