Dbus interface name change

diff --git a/libsignon-glib/signon-auth-service.c b/libsignon-glib/signon-auth-service.c
index 33111429332aafa17f724bae17ab82cf296396e1..5a8f4a8390a990d254a72ee3ec770a71c2e95806 100644 (file)
--- a/libsignon-glib/signon-auth-service.c
+++ b/libsignon-glib/signon-auth-service.c
@@ -198,7 +198,7 @@ signon_auth_service_query_methods (SignonAuthService *auth_service,
     cb_data->cb = cb;
     cb_data->userdata = user_data;
 
-    com_nokia_singlesignon_SignonDaemon_query_methods_async (DBUS_G_PROXY(priv->signon_proxy),
+    com_nokia_SingleSignOn_AuthService_query_methods_async (DBUS_G_PROXY(priv->signon_proxy),
                                                              auth_query_methods_cb,
                                                              cb_data);
 }
@@ -230,7 +230,7 @@ signon_auth_service_query_mechanisms (SignonAuthService *auth_service,
     SignonAuthServicePrivate *priv;
     priv = SIGNON_AUTH_SERVICE_PRIV (auth_service);
 
-    com_nokia_singlesignon_SignonDaemon_query_mechanisms_async (DBUS_G_PROXY(priv->signon_proxy),
+    com_nokia_SingleSignOn_AuthService_query_mechanisms_async (DBUS_G_PROXY(priv->signon_proxy),
                                                                 method,
                                                                 auth_query_mechanisms_cb,
                                                                 cb_data);

diff --git a/libsignon-glib/signon-auth-session.c b/libsignon-glib/signon-auth-session.c
index 0420304b295614e14e9283733ea93845892785d4..d2a169ae7a33c35ea152e1b4dd39c3a934fba07f 100644 (file)
--- a/libsignon-glib/signon-auth-session.c
+++ b/libsignon-glib/signon-auth-session.c
@@ -156,7 +156,7 @@ signon_auth_session_dispose (GObject *object)
 
     if (priv->proxy)
     {
-        com_nokia_singlesignon_SignonAuthSession_object_unref (priv->proxy, &err);
+        com_nokia_SingleSignOn_AuthSession_object_unref (priv->proxy, &err);
         g_object_unref (priv->proxy);
         priv->proxy = NULL;
     }
@@ -248,7 +248,7 @@ auth_session_set_id_ready_cb (gpointer object,
     gint id = GPOINTER_TO_INT(user_data);
 
     GError *err = NULL;
-    com_nokia_singlesignon_SignonAuthSession_set_id (priv->proxy,
+    com_nokia_SingleSignOn_AuthSession_set_id (priv->proxy,
                                                      id,
                                                      &err);
     priv->id = id;
@@ -480,7 +480,7 @@ auth_session_priv_init (SignonAuthSession *self, guint id,
     priv->id = id;
     priv->method_name = g_strdup (method_name);
 
-    (void)com_nokia_singlesignon_SignonDaemon_get_auth_session_object_path_async (DBUS_G_PROXY (priv->signon_proxy),
+    (void)com_nokia_SingleSignOn_AuthService_get_auth_session_object_path_async (DBUS_G_PROXY (priv->signon_proxy),
                                                                                   (const guint)id,
                                                                                   method_name,
                                                                                   auth_session_get_object_path_reply,
@@ -560,7 +560,7 @@ auth_session_query_available_mechanisms_ready_cb (gpointer object, const GError
     else
     {
         g_return_if_fail (priv->proxy != NULL);
-        (void) com_nokia_singlesignon_SignonAuthSession_query_available_mechanisms_async (
+        (void) com_nokia_SingleSignOn_AuthSession_query_available_mechanisms_async (
                     priv->proxy,
                     (const char **)operation_data->wanted_mechanisms,
                     auth_session_query_mechanisms_reply,
@@ -615,7 +615,7 @@ auth_session_process_ready_cb (gpointer object, const GError *error, gpointer us
     {
         g_return_if_fail (priv->proxy != NULL);
 
-        (void)com_nokia_singlesignon_SignonAuthSession_process_async(
+        (void)com_nokia_SingleSignOn_AuthSession_process_async(
                     priv->proxy,
                     operation_data->session_data,
                     operation_data->mechanism,
@@ -652,7 +652,7 @@ auth_session_cancel_ready_cb (gpointer object, const GError *error, gpointer use
         DEBUG("error during initialization");
     }
     else if (priv->proxy && priv->busy)
-        com_nokia_singlesignon_SignonAuthSession_cancel (priv->proxy, NULL);
+        com_nokia_SingleSignOn_AuthSession_cancel (priv->proxy, NULL);
 
     priv->busy = FALSE;
     priv->canceled = FALSE;
@@ -670,7 +670,7 @@ auth_session_check_remote_object(SignonAuthSession *self)
 
     g_return_if_fail (priv->signon_proxy != NULL);
 
-    (void)com_nokia_singlesignon_SignonDaemon_get_auth_session_object_path_async (DBUS_G_PROXY (priv->signon_proxy),
+    (void)com_nokia_SingleSignOn_AuthService_get_auth_session_object_path_async (DBUS_G_PROXY (priv->signon_proxy),
                                                                                   (const guint)priv->id,
                                                                                   priv->method_name,
                                                                                   auth_session_get_object_path_reply,

diff --git a/libsignon-glib/signon-identity.c b/libsignon-glib/signon-identity.c
index 2b5a59210af1da1f29d015df3c0b10715e16e7d3..cfd1003b677ca1ebc71dbbbfc3731006f2f3dd32 100644 (file)
--- a/libsignon-glib/signon-identity.c
+++ b/libsignon-glib/signon-identity.c
@@ -522,10 +522,10 @@ identity_check_remote_registration (SignonIdentity *self)
         return;
 
     if (priv->id != 0)
-        com_nokia_singlesignon_SignonDaemon_register_stored_identity_async
+        com_nokia_SingleSignOn_AuthService_register_stored_identity_async
             (DBUS_G_PROXY (priv->signon_proxy), priv->id, identity_new_from_db_cb, self);
     else
-        com_nokia_singlesignon_SignonDaemon_register_new_identity_async
+        com_nokia_SingleSignOn_AuthService_register_new_identity_async
             (DBUS_G_PROXY (priv->signon_proxy), identity_new_cb, self);
 
     priv->registration_state = PENDING_REGISTRATION;
@@ -797,7 +797,7 @@ identity_store_credentials_ready_cb (gpointer object, const GError *error, gpoin
     {
         g_return_if_fail (priv->proxy != NULL);
 
-        (void)com_nokia_singlesignon_SignonIdentity_store_credentials_async(
+        (void)com_nokia_SingleSignOn_Identity_store_credentials_async(
                     priv->proxy,
                     priv->id,
                     operation_data->username,
@@ -944,14 +944,14 @@ identity_verify_ready_cb (gpointer object, const GError *error, gpointer user_da
 
         switch (operation_data->operation) {
             case SIGNON_VERIFY_SECRET:
-                com_nokia_singlesignon_SignonIdentity_verify_secret_async(
+                com_nokia_SingleSignOn_Identity_verify_secret_async(
                         priv->proxy,
                         operation_data->data_to_send,
                         identity_verify_reply,
                         cb_data);
             break;
             case SIGNON_VERIFY_USER:
-            com_nokia_singlesignon_SignonIdentity_verify_user_async(
+            com_nokia_SingleSignOn_Identity_verify_user_async(
                     priv->proxy,
                     operation_data->data_to_send,
                     identity_verify_reply,
@@ -1306,7 +1306,7 @@ identity_info_ready_cb(gpointer object, const GError *error, gpointer user_data)
     else if (priv->updated == FALSE)
     {
         g_return_if_fail (priv->proxy != NULL);
-        com_nokia_singlesignon_SignonIdentity_query_info_async (
+        com_nokia_SingleSignOn_Identity_query_info_async (
                                                         priv->proxy,
                                                         identity_info_reply,
                                                         cb_data);
@@ -1365,7 +1365,7 @@ identity_signout_ready_cb(gpointer object, const GError *error, gpointer user_da
     else
     {
         g_return_if_fail (priv->proxy != NULL);
-        com_nokia_singlesignon_SignonIdentity_sign_out_async(
+        com_nokia_SingleSignOn_Identity_sign_out_async(
                 priv->proxy,
                 identity_signout_reply,
                 cb_data);
@@ -1411,7 +1411,7 @@ identity_remove_ready_cb(gpointer object, const GError *error, gpointer user_dat
     else
     {
         g_return_if_fail (priv->proxy != NULL);
-        com_nokia_singlesignon_SignonIdentity_remove_async(
+        com_nokia_SingleSignOn_Identity_remove_async(
                 priv->proxy,
                 identity_removed_reply,
                 cb_data);

diff --git a/libsignon-glib/signonauthsession.xml b/libsignon-glib/signonauthsession.xml
index 6d4dd0354a7cbe069cbe0408072117a319f595ca..a816374a2356bc14ef5e57ad2c5b3d8ffbd93e00 100644 (file)
--- a/libsignon-glib/signonauthsession.xml
+++ b/libsignon-glib/signonauthsession.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="com.nokia.singlesignon.SignonAuthSession">
+  <interface name="com.nokia.SingleSignOn.AuthSession">
     <signal name="stateChanged">
       <arg name="state" type="i" direction="out"/>
       <arg name="message" type="s" direction="out"/>

diff --git a/libsignon-glib/signondaemon.xml b/libsignon-glib/signondaemon.xml
index 315d1d2c110d4ce4c44158ce6dd2d6571fbaf687..3e6b13a9d15f71bb6e10b3c71ee4dc536fca806f 100644 (file)
--- a/libsignon-glib/signondaemon.xml
+++ b/libsignon-glib/signondaemon.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="com.nokia.singlesignon.SignonDaemon">
+  <interface name="com.nokia.SingleSignOn.AuthService">
     <method name="registerNewIdentity">
       <arg name="objectPath" type="o" direction="out"/>
     </method>

diff --git a/libsignon-glib/signonidentity.xml b/libsignon-glib/signonidentity.xml
index 1464f12a40b1add3941d611b2dd554e5611f55b5..84dd6b72812afeb131b9243f61a0eac10ded13a9 100644 (file)
--- a/libsignon-glib/signonidentity.xml
+++ b/libsignon-glib/signonidentity.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="com.nokia.singlesignon.SignonIdentity">
+  <interface name="com.nokia.SingleSignOn.Identity">
     <signal name="infoUpdated">
       <arg type="i" direction="out"/>
     </signal>

diff --git a/tests/check_signon.c b/tests/check_signon.c
index 50c39134873957eede0a8c4b3bfb29aacb4cb946..7f581741fe0e5e3a4e6439af3a2ddca1968c4f3f 100644 (file)
--- a/tests/check_signon.c
+++ b/tests/check_signon.c
@@ -506,9 +506,9 @@ new_identity()
     if(connection)
     {
         proxy = dbus_g_proxy_new_for_name (connection,
-                                           "com.nokia.singlesignon",
-                                           "/SignonDaemon",
-                                           "com.nokia.singlesignon.SignonDaemon");
+                                           "com.nokia.SingleSignOn",
+                                           "/com/nokia/SingleSignOn",
+                                           "com.nokia.SingleSignOn.AuthService");
     }
     else if (error)
     {
@@ -518,7 +518,7 @@ new_identity()
     }
 
     gchar *objectPath;
-    com_nokia_singlesignon_SignonDaemon_register_new_identity (proxy, &objectPath, &error);
+    com_nokia_SingleSignOn_AuthService_register_new_identity (proxy, &objectPath, &error);
 
     if (error)
     {
@@ -530,11 +530,11 @@ new_identity()
     GHashTable *methods = g_hash_table_new (g_str_hash, g_str_equal);
 
     proxy = dbus_g_proxy_new_for_name (connection,
-                                       "com.nokia.singlesignon",
+                                       "com.nokia.SingleSignOn",
                                        objectPath,
-                                       "com.nokia.singlesignon.SignonIdentity");
+                                       "com.nokia.SingleSignOn.Identity");
 
-    com_nokia_singlesignon_SignonIdentity_store_credentials (proxy,
+    com_nokia_SingleSignOn_Identity_store_credentials (proxy,
                                                              0,
                                                              "James Bond",
                                                              "007",