Use D-Bus object and interface names from signond-dev

diff --git a/libsignon-glib/signon-auth-session.c b/libsignon-glib/signon-auth-session.c
index d00f57315e526d4f6c0e898ce4512b8c4468d46c..0fe9de43472faa08ae4aed29fba69ce7429d95b2 100644 (file)
--- a/libsignon-glib/signon-auth-session.c
+++ b/libsignon-glib/signon-auth-session.c
@@ -381,7 +381,7 @@ auth_session_get_object_path_reply (DBusGProxy *proxy, char * object_path,
     else
     {
         priv->proxy = dbus_g_proxy_new_from_proxy (DBUS_G_PROXY (priv->signon_proxy),
-                                                   SIGNON_AUTH_SESSION_IFACE,
+                                                   SIGNOND_AUTH_SESSION_INTERFACE,
                                                    object_path);
 
         dbus_g_object_register_marshaller (signon_marshal_VOID__INT_STRING,

diff --git a/libsignon-glib/signon-errors.c b/libsignon-glib/signon-errors.c
index 48bd0e02ea04b61ae483559c1d5382a0d1df8db2..2accdc8a2be42b795acebf217e8a8f656ffa42d7 100644 (file)
--- a/libsignon-glib/signon-errors.c
+++ b/libsignon-glib/signon-errors.c
@@ -27,6 +27,8 @@
 #include "signon-internals.h"
 #include <dbus/dbus-glib.h>
 
+#define SIGNON_ERROR_PREFIX SIGNOND_SERVICE_PREFIX ".Error"
+
 GQuark signon_error_quark (void)
 {
     static gsize quark = 0;

diff --git a/libsignon-glib/signon-errors.h b/libsignon-glib/signon-errors.h
index 7484fa3939cf0be91471c07d3bd29b92263c4bbf..13e00b9cab4728564efff6ad3dd43c876a9453ee 100644 (file)
--- a/libsignon-glib/signon-errors.h
+++ b/libsignon-glib/signon-errors.h
@@ -29,8 +29,6 @@
 #include <glib-object.h>
 #include "signon-enum-types.h"
 
-#define SIGNON_ERROR_PREFIX "com.nokia.singlesignon.Error"
-
 #define SIGNON_ERROR (signon_error_quark())
 
 typedef enum {

diff --git a/libsignon-glib/signon-identity.c b/libsignon-glib/signon-identity.c
index 4f17c3fcf5bf1a8baf3c2fbc6b757bc8331a7021..ba4cb008491a3ec317d9689aed4d351028890154 100644 (file)
--- a/libsignon-glib/signon-identity.c
+++ b/libsignon-glib/signon-identity.c
@@ -40,8 +40,6 @@
 #include "signon-utils.h"
 #include "signon-errors.h"
 
-#define SIGNON_IDENTITY_IFACE  "com.nokia.singlesignon.SignonIdentity"
-
 G_DEFINE_TYPE (SignonIdentity, signon_identity, G_TYPE_OBJECT);
 
 enum
@@ -393,7 +391,7 @@ identity_registered (SignonIdentity *identity, DBusGProxy *proxy,
         g_return_if_fail (priv->proxy == NULL);
 
         priv->proxy = dbus_g_proxy_new_from_proxy (DBUS_G_PROXY (priv->signon_proxy),
-                                                   SIGNON_IDENTITY_IFACE,
+                                                   SIGNOND_IDENTITY_INTERFACE,
                                                    object_path);
 
         dbus_g_object_register_marshaller (g_cclosure_marshal_VOID__INT,

diff --git a/libsignon-glib/signon-internals.h b/libsignon-glib/signon-internals.h
index 33be156131a7d9c30f03e81468c11feaac422289..e85774caf2d9361bafbc3037d7393042d014ef26 100644 (file)
--- a/libsignon-glib/signon-internals.h
+++ b/libsignon-glib/signon-internals.h
@@ -35,11 +35,7 @@
     #define DEBUG(...) do {} while (0)
 #endif
 
-#define SIGNON_SERVICE  "com.nokia.singlesignon"
-#define SIGNON_PATH  "/SignonDaemon"
-#define SIGNON_IFACE  "com.nokia.singlesignon.SignonDaemon"
-#define SIGNON_AUTH_SESSION_IFACE  "com.nokia.singlesignon.SignonAuthSession"
-#define SIGNON_IDENTITY_IFACE  "com.nokia.singlesignon.SignonIdentity"
+#include <signoncommon.h>
 
 #include "signon-identity.h"
 #include "signon-auth-session.h"

diff --git a/libsignon-glib/signon-proxy.c b/libsignon-glib/signon-proxy.c
index a09887fbbc2865e6f2ab1e9ec1419a3c39bf7a1f..4247552dbce35b43997a20fce193076cc8b3693c 100644 (file)
--- a/libsignon-glib/signon-proxy.c
+++ b/libsignon-glib/signon-proxy.c
@@ -94,9 +94,9 @@ signon_proxy_new ()
     }
 
     proxy = g_object_new (SIGNON_TYPE_PROXY,
-                          "name", SIGNON_SERVICE,
-                          "path", SIGNON_PATH,
-                          "interface", SIGNON_IFACE,
+                          "name", SIGNOND_SERVICE,
+                          "path", SIGNOND_DAEMON_OBJECTPATH,
+                          "interface", SIGNOND_DAEMON_INTERFACE,
                           "connection", connection,
                           NULL);