[maemo-commits] [maemo-commits] r12084 - in projects/haf/trunk/libosso: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-06-04 11:31:54 +0300 (Mon, 04 Jun 2007)
New Revision: 12084

Modified:
   projects/haf/trunk/libosso/debian/changelog
   projects/haf/trunk/libosso/src/osso-rpc.c
Log:
removed deprecated launch banner code


Modified: projects/haf/trunk/libosso/debian/changelog
===================================================================
--- projects/haf/trunk/libosso/debian/changelog	2007-06-04 08:08:36 UTC (rev 12083)
+++ projects/haf/trunk/libosso/debian/changelog	2007-06-04 08:31:54 UTC (rev 12084)
@@ -1,7 +1,7 @@
 libosso (2.10-1) unstable; urgency=low
 
-  * Corrected D-Bus service name for the launch banner service.
-    Fixes: NB#55804
+  * UNRELEASED
+  * Removed deprecated launch banner code.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 04 Jun 2007 10:53:52 +0300
 

Modified: projects/haf/trunk/libosso/src/osso-rpc.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-rpc.c	2007-06-04 08:08:36 UTC (rev 12083)
+++ projects/haf/trunk/libosso/src/osso-rpc.c	2007-06-04 08:31:54 UTC (rev 12084)
@@ -23,16 +23,6 @@
  * 02110-1301 USA
  */
 
-#define TASK_NAV_SERVICE "com.nokia.hildon-desktop"
-/* 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"
-
-
 #include "osso-internal.h"
 #include <assert.h>
 #include <stdlib.h>
@@ -212,26 +202,6 @@
 	b = dbus_connection_send(conn, msg, NULL);
         dbus_message_unref(msg);
         if (b) {
-
-	    /* Tell hildon-desktop to show the launch banner */
-	    msg = dbus_message_new_method_call(TASK_NAV_SERVICE,
-			    APP_LAUNCH_BANNER_METHOD_PATH,
-			    APP_LAUNCH_BANNER_METHOD_INTERFACE,
-			    APP_LAUNCH_BANNER_METHOD);
-   
-	    if (msg != NULL) {
-                dbus_message_append_args(msg, DBUS_TYPE_STRING, &service,
-                                         DBUS_TYPE_INVALID);
-
-                b = dbus_connection_send(conn, msg, NULL);
-                if (!b) {
-                    ULOG_WARN_F("dbus_connection_send failed");
-                }
-                dbus_message_unref(msg);
-	    }
-            else {
-                ULOG_WARN_F("dbus_message_new_method_call failed");
-            }
             return OSSO_OK;
         }
         else {
@@ -274,27 +244,6 @@
 		_get_arg(&iter, retval);
 	    
 		dbus_message_unref(reply);
-	
-		/* Tell TaskNavigator to show "launch banner" */
-		msg = dbus_message_new_method_call(TASK_NAV_SERVICE,
-				APP_LAUNCH_BANNER_METHOD_PATH,
-				APP_LAUNCH_BANNER_METHOD_INTERFACE,
-				APP_LAUNCH_BANNER_METHOD );
-
-		if (msg != NULL) {
-                    dbus_message_append_args(msg, DBUS_TYPE_STRING,
-                                             &service, DBUS_TYPE_INVALID);
-
-                    b = dbus_connection_send(conn, msg, NULL);
-
-                    if (!b) {
-                        ULOG_WARN_F("dbus_connection_send failed");
-                    }
-                    dbus_message_unref(msg);
-		}
-                else {
-                    ULOG_WARN_F("dbus_message_new_method_call failed");
-                }
                 return OSSO_OK;
 	      default:
                 ULOG_WARN_F("got unknown message type as reply");
@@ -429,28 +378,6 @@
             rpc = NULL;
         }
 	dbus_message_unref(msg);
-
-	/* Tell TaskNavigator to show "launch banner" */
-	msg = dbus_message_new_method_call(TASK_NAV_SERVICE,
-                        APP_LAUNCH_BANNER_METHOD_PATH,
-                        APP_LAUNCH_BANNER_METHOD_INTERFACE,
-                        APP_LAUNCH_BANNER_METHOD );
-
-	if (msg != NULL) {
-            dbus_message_append_args(msg, DBUS_TYPE_STRING, &service,
-                                     DBUS_TYPE_INVALID);
-
-            succ = dbus_connection_send(osso->conn, msg, NULL);
-
-            if (!succ) {
-                ULOG_WARN_F("dbus_connection_send failed");
-            }
-            dbus_message_unref(msg);
-	}
-        else {
-            ULOG_WARN_F("dbus_message_new_method_call failed");
-        }
-
 	return OSSO_OK;
     }
     else {