log messages corrected

diff --git a/daemon/dbus-manager.c b/daemon/dbus-manager.c
index d6abf05..76b4d86 100644 (file)
--- a/daemon/dbus-manager.c
+++ b/daemon/dbus-manager.c
@@ -98,7 +98,8 @@ _dbus_manager_handle_register_service (
     MsgPortDbusService *dbus_service = NULL;
     msgport_return_val_if_fail (dbus_mgr &&  MSGPORT_IS_DBUS_MANAGER (dbus_mgr), FALSE);
 
-    DBG ("register service request from %p for port %s", dbus_mgr, port_name);
+    DBG ("register service request from %p('%s') for port '%s', is_trusted: %d",
+        dbus_mgr, dbus_mgr->priv->app_id, port_name, is_trusted);
 
     dbus_service = msgport_manager_register_service (
             dbus_mgr->priv->manager, dbus_mgr, 
@@ -132,7 +133,7 @@ _dbus_manager_handle_check_for_remote_service (
 
     msgport_return_val_if_fail (dbus_mgr && MSGPORT_IS_DBUS_MANAGER (dbus_mgr), FALSE);
 
-    DBG ("check remote service request from %p for %s %s %d", 
+    DBG ("check remote service request from %p for '%s' '%s', is_trusted: %d", 
             dbus_mgr, remote_app_id, remote_port_name, is_trusted);
 
     remote_dbus_manager = msgport_dbus_server_get_dbus_manager_by_app_id (
@@ -169,7 +170,8 @@ _dbus_manager_handle_send_message (
 
     msgport_return_val_if_fail (dbus_mgr && MSGPORT_IS_DBUS_MANAGER (dbus_mgr), FALSE);
 
-    DBG ("send_message from %p : %d ", dbus_mgr, service_id);
+    DBG ("send_message from %p('%s') to service_id %d", 
+        dbus_mgr, dbus_mgr->priv->app_id, service_id);
 
     peer_dbus_service = msgport_manager_get_service_by_id (
             dbus_mgr->priv->manager, service_id, &error);

diff --git a/daemon/dbus-service.c b/daemon/dbus-service.c
index d6d9727..2e0c1ca 100644 (file)
--- a/daemon/dbus-service.c
+++ b/daemon/dbus-service.c
@@ -268,7 +268,7 @@ msgport_dbus_service_send_message (
         return FALSE;
     }
 
-    DBG ("Sending message to %p from '%s:%s'", dbus_service, r_app_id, r_port);
+    DBG ("Sending message to %p from ('%s':'%s':%d)", dbus_service, r_app_id, r_port, r_is_trusted);
     msgport_dbus_glue_service_emit_on_message (dbus_service->priv->dbus_skeleton, data, r_app_id, r_port, r_is_trusted);
  
     return TRUE;

diff --git a/daemon/manager.c b/daemon/manager.c
index 1d3a02e..38bd493 100644 (file)
--- a/daemon/manager.c
+++ b/daemon/manager.c
@@ -122,21 +122,24 @@ _manager_get_service_internal (
     gboolean            is_trusted)
 {
     GList *service_list = g_hash_table_lookup (manager->priv->owner_service_map, owner);
+    
+    DBG ("Checking for port '%s', is_tursted : %d owned by : %p('%s')",
+            port_name, is_trusted, owner, msgport_dbus_manager_get_app_id (owner));
+
     while (service_list != NULL) {
         MsgPortDbusService *dbus_service = MSGPORT_DBUS_SERVICE (service_list->data);
 
-        DBG ("Owner : %p - Port : %s, Is_trusted : %d", owner,
-            msgport_dbus_service_get_port_name (dbus_service),
-            msgport_dbus_service_get_is_trusted (dbus_service));
-
         if ( !g_strcmp0 (port_name, msgport_dbus_service_get_port_name (dbus_service)) && 
              is_trusted == msgport_dbus_service_get_is_trusted (dbus_service)) {
+            DBG ("   Found with %d", msgport_dbus_service_get_id (dbus_service));
             return dbus_service ;
         }
 
         service_list = service_list->next;
     }
 
+    DBG ("   Not Found");
+
     return NULL;
 }
 
@@ -164,6 +167,7 @@ msgport_manager_register_service (
     /* create  new port/service */
     dbus_service = msgport_dbus_service_new (owner, port_name, is_trusted, error);
     if (!dbus_service) {
+        ERR ("Failed to create new servcie");
         return NULL;
     }
     /* cache newly created service */
@@ -307,4 +311,3 @@ msgport_manager_unregister_services (
 
     return TRUE;
 }
-

diff --git a/lib/msgport-factory.c b/lib/msgport-factory.c
index 7247e09..f64302c 100644 (file)
--- a/lib/msgport-factory.c
+++ b/lib/msgport-factory.c
@@ -1,8 +1,9 @@
 #include "msgport-factory.h"
 #include "msgport-manager.h"
+#include "common/log.h"
 #include <glib.h>
 
-GHashTable *__managers ; /* GThread:MsgPortManager */
+GHashTable *__managers = NULL; /* GThread:MsgPortManager */
 G_LOCK_DEFINE(managers);
 
 static 
@@ -51,4 +52,3 @@ MsgPortManager * msgport_factory_get_manager ()
 
     return manager;
 }
-

diff --git a/lib/msgport-service.c b/lib/msgport-service.c
index 56a2283..f17f7ff 100644 (file)
--- a/lib/msgport-service.c
+++ b/lib/msgport-service.c
@@ -47,11 +47,20 @@ _on_got_message (MsgPortService *service, GVariant *data, const gchar *remote_ap
 {
 #ifdef ENABLE_DEBUG
     gchar *str_data = g_variant_print (data, TRUE);
-    DBG ("Message received : %s(%"G_GSIZE_FORMAT")", str_data, g_variant_n_children (data));
+    DBG ("Message received : '%s' from '%s':'%s':%d",
+            str_data, remote_app_id, remote_port, remote_is_trusted);
     g_free (str_data);
 #endif
     bundle *b = bundle_from_variant_map (data);
 
+    /*
+     * NOTE: wrt plugin cannot handle empty strings for port_id and app_id.
+     * It is expecting NULL in this case, But we get empty stirng from Dbus.
+     * So check for this case:
+     */
+    if (remote_app_id && !remote_app_id[0]) remote_app_id = NULL;
+    if (remote_port   && !remote_port[0])   remote_port = NULL;
+
     service->client_cb (msgport_dbus_glue_service_get_id (service->proxy), remote_app_id, remote_port, remote_is_trusted, b);
 
     bundle_free (b);
@@ -138,4 +147,3 @@ msgport_service_send_message (MsgPortService *service, guint remote_service_id,
 
     return MESSAGEPORT_ERROR_NONE;
 }
-