[maemo-commits] [maemo-commits] r13535 - in projects/haf/trunk/libhildonmime: . debian libhildonmime

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Fri Aug 31 17:03:46 EEST 2007
Author: martyn
Date: 2007-08-31 17:03:40 +0300 (Fri, 31 Aug 2007)
New Revision: 13535

Modified:
   projects/haf/trunk/libhildonmime/ChangeLog
   projects/haf/trunk/libhildonmime/debian/changelog
   projects/haf/trunk/libhildonmime/libhildonmime/hildon-mime-open.c
   projects/haf/trunk/libhildonmime/libhildonmime/hildon-uri.c
Log:
	* libhildonmime/hildon-mime-open.c:
	(mime_launch_notify_task_navigator):
	* libhildonmime/hildon-uri.c: 
	(uri_launch_notify_task_navigator): Use the new DBus service,
	details for notifying the user that an application is being
	launched. This fixes NB#67710.


Modified: projects/haf/trunk/libhildonmime/ChangeLog
===================================================================
--- projects/haf/trunk/libhildonmime/ChangeLog	2007-08-31 13:17:25 UTC (rev 13534)
+++ projects/haf/trunk/libhildonmime/ChangeLog	2007-08-31 14:03:40 UTC (rev 13535)
@@ -1,3 +1,12 @@
+2007-08-31  Martyn Russell  <martyn at imendio.com>
+
+	* libhildonmime/hildon-mime-open.c:
+	(mime_launch_notify_task_navigator):
+	* libhildonmime/hildon-uri.c: 
+	(uri_launch_notify_task_navigator): Use the new DBus service,
+	details for notifying the user that an application is being
+	launched. This fixes NB#67710.
+
 2007-08-30  Martyn Russell  <martyn at imendio.com>
 
 	* data/uri-action-defaults.list Added comment to the top of the

Modified: projects/haf/trunk/libhildonmime/debian/changelog
===================================================================
--- projects/haf/trunk/libhildonmime/debian/changelog	2007-08-31 13:17:25 UTC (rev 13534)
+++ projects/haf/trunk/libhildonmime/debian/changelog	2007-08-31 14:03:40 UTC (rev 13535)
@@ -2,7 +2,8 @@
 
   * Update default URI handler for mailto scheme to use old email engine.
   * Fixes: NB#62724, Unable to launch media player from browser with mms://  url
-
+  * Fixes: NB#67710, Application loading information banner is not shown if ...
+	
  -- Martyn Russell <martyn at imendio.com>  Thu,  1 Sep 2007 17:00:00 +0100
 
 libhildonmime (1.9.14-1) unstable; urgency=low

Modified: projects/haf/trunk/libhildonmime/libhildonmime/hildon-mime-open.c
===================================================================
--- projects/haf/trunk/libhildonmime/libhildonmime/hildon-mime-open.c	2007-08-31 13:17:25 UTC (rev 13534)
+++ projects/haf/trunk/libhildonmime/libhildonmime/hildon-mime-open.c	2007-08-31 14:03:40 UTC (rev 13535)
@@ -91,12 +91,11 @@
 
 #define X_OSSO_SERVICE "X-Osso-Service"
 
-/* From osso-rpc.c */
-#define TASK_NAV_SERVICE                    "com.nokia.tasknav"
-/* NOTICE: Keep these in sync with values in hildon-navigator/windowmanager.c! */
-#define APP_LAUNCH_BANNER_METHOD_INTERFACE  "com.nokia.tasknav.app_launch_banner"
-#define APP_LAUNCH_BANNER_METHOD_PATH       "/com/nokia/tasknav/app_launch_banner"
-#define APP_LAUNCH_BANNER_METHOD            "app_launch_banner"
+/* Updated from patch in NB#67710 */
+#define APP_LAUNCH_BANNER_SERVICE           "com.nokia.hildon-desktop"
+#define APP_LAUNCH_BANNER_METHOD_INTERFACE  "com.nokia.hildon.hdwm.startupnotification"
+#define APP_LAUNCH_BANNER_METHOD_PATH       "/com/nokia/hildon/hdwm"
+#define APP_LAUNCH_BANNER_METHOD            "starting"
 
 typedef struct {
 	gchar  *service_name;
@@ -232,10 +231,10 @@
 
 	/* From osso-rpc.c */
 	/* Inform the task navigator that we are launching the service */
-	dprint ("Notifying the task navigator...");
+	dprint ("Notifying the application-launching-banner service...");
 
-	dprint ("Creating message for service: '%s'", TASK_NAV_SERVICE);
-	msg = dbus_message_new_method_call (TASK_NAV_SERVICE,
+	dprint ("Creating message for service: '%s'", APP_LAUNCH_BANNER_SERVICE);
+	msg = dbus_message_new_method_call (APP_LAUNCH_BANNER_SERVICE,
 					    APP_LAUNCH_BANNER_METHOD_PATH,
 					    APP_LAUNCH_BANNER_METHOD_INTERFACE,
 					    APP_LAUNCH_BANNER_METHOD);
@@ -247,17 +246,17 @@
 			
 			if (dbus_connection_send (con, msg, NULL) == TRUE) {
 				dprint ("Sent message to service: '%s'", 
-					TASK_NAV_SERVICE);
+					APP_LAUNCH_BANNER_SERVICE);
 				dbus_connection_flush (con);
 			} else {
 				dprint ("Couldn't send message to service: '%s'", 
-					TASK_NAV_SERVICE);
+					APP_LAUNCH_BANNER_SERVICE);
 				success = FALSE;
 			}
 			
 		} else {
 			dprint ("Couldn't append msg with service: '%s'", 
-				TASK_NAV_SERVICE);
+				APP_LAUNCH_BANNER_SERVICE);
 			success = FALSE;
 		}
 		
@@ -265,7 +264,7 @@
 	} else {
 		dprint ("Couldn't create msg with method: '%s' to service: '%s'", 
 			APP_LAUNCH_BANNER_METHOD, 
-			TASK_NAV_SERVICE);
+			APP_LAUNCH_BANNER_SERVICE);
 		success = FALSE;
 	}
 	

Modified: projects/haf/trunk/libhildonmime/libhildonmime/hildon-uri.c
===================================================================
--- projects/haf/trunk/libhildonmime/libhildonmime/hildon-uri.c	2007-08-31 13:17:25 UTC (rev 13534)
+++ projects/haf/trunk/libhildonmime/libhildonmime/hildon-uri.c	2007-08-31 14:03:40 UTC (rev 13535)
@@ -55,16 +55,14 @@
 #define HILDON_URI_DEFAULTS_GROUP             "Default Actions"
 #define HILDON_URI_DEFAULTS_GROUP_FORMAT      "X-Osso-URI-Scheme %s"      /* new */
 
-/* From osso-rpc.c */
-#define TASK_NAV_SERVICE                      "com.nokia.tasknav"
-/* NOTICE: Keep these in sync with values in hildon-navigator/windowmanager.c! */
-#define APP_LAUNCH_BANNER_METHOD_INTERFACE    "com.nokia.tasknav.app_launch_banner"
-#define APP_LAUNCH_BANNER_METHOD_PATH         "/com/nokia/tasknav/app_launch_banner"
-#define APP_LAUNCH_BANNER_METHOD              "app_launch_banner"
+/* Updated from patch in NB#67710 */
+#define APP_LAUNCH_BANNER_SERVICE           "com.nokia.hildon-desktop"
+#define APP_LAUNCH_BANNER_METHOD_INTERFACE  "com.nokia.hildon.hdwm.startupnotification"
+#define APP_LAUNCH_BANNER_METHOD_PATH       "/com/nokia/hildon/hdwm"
+#define APP_LAUNCH_BANNER_METHOD            "starting"
 
+#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");  
 
- #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");  
-
 /* The ID is the group name in the desktop file for this
  * action, the domain is the translation domain used for the
  * name which is a translated string id. 
@@ -1224,10 +1222,10 @@
 
 	/* From osso-rpc.c */
 	/* Inform the task navigator that we are launching the service */
-	DEBUG_MSG (("URI: Notifying the task navigator..."));
+	DEBUG_MSG (("URI: Notifying the application-launching-banner service..."));
 
-	DEBUG_MSG (("URI: Creating message for service: '%s'", TASK_NAV_SERVICE));
-	msg = dbus_message_new_method_call (TASK_NAV_SERVICE,
+	DEBUG_MSG (("URI: Creating message for service: '%s'", APP_LAUNCH_BANNER_SERVICE));
+	msg = dbus_message_new_method_call (APP_LAUNCH_BANNER_SERVICE,
 					    APP_LAUNCH_BANNER_METHOD_PATH,
 					    APP_LAUNCH_BANNER_METHOD_INTERFACE,
 					    APP_LAUNCH_BANNER_METHOD);
@@ -1239,17 +1237,17 @@
 			
 			if (dbus_connection_send (connection, msg, NULL) == TRUE) {
 				DEBUG_MSG (("URI: Sent message to service: '%s'", 
-					    TASK_NAV_SERVICE));
+					    APP_LAUNCH_BANNER_SERVICE));
 				dbus_connection_flush (connection);
 			} else {
 				DEBUG_MSG (("URI: Couldn't send message to service: '%s'", 
-					    TASK_NAV_SERVICE));
+					    APP_LAUNCH_BANNER_SERVICE));
 				success = FALSE;
 			}
 			
 		} else {
 			DEBUG_MSG (("URI: Couldn't append msg with service: '%s'", 
-				    TASK_NAV_SERVICE));
+				    APP_LAUNCH_BANNER_SERVICE));
 			success = FALSE;
 		}
 		
@@ -1257,7 +1255,7 @@
 	} else {
 		DEBUG_MSG (("URI: Couldn't create msg with method: '%s' to service: '%s'", 
 			    APP_LAUNCH_BANNER_METHOD, 
-			    TASK_NAV_SERVICE));
+			    APP_LAUNCH_BANNER_SERVICE));
 		success = FALSE;
 	}
 	


More information about the maemo-commits mailing list