Merge lp:~alecu/ubuntuone-client/revert-dbus-interface-change into lp:ubuntuone-client

Proposed by Alejandro J. Cura on 2011-04-18
Status: Merged
Approved by: Roman Yepishev on 2011-04-19
Approved revision: 960
Merged at revision: 960
Proposed branch: lp:~alecu/ubuntuone-client/revert-dbus-interface-change
Merge into: lp:ubuntuone-client
Diff against target: 57 lines (+5/-13)
1 file modified
libsyncdaemon/syncdaemon-authentication.c (+5/-13)
To merge this branch: bzr merge lp:~alecu/ubuntuone-client/revert-dbus-interface-change
Reviewer Review Type Date Requested Status
Roman Yepishev (community) code Approve on 2011-04-19
Natalia Bidart 2011-04-18 Approve on 2011-04-18
Review via email: mp+58189@code.launchpad.net

Commit message

Revert changes from revision 956 (LP: #764646)

Description of the change

Revert changes from revision 956 (LP: #764646)

To post a comment you must log in.
Alejandro J. Cura (alecu) wrote :

To fix Bug #764646 we are reverting the changes made on rev. 956 of trunk.
This means that the fix for bug #759197 will be rolled back; and for this we are creating another branch that depends on this one: lp:~alecu/ubuntuone-client/the-other-signal

review: Approve
Roman Yepishev (rye) wrote :

It looks like this has been proposed against the trunk only, I guess this should be done for stable-1-6 too.

Roman Yepishev (rye) wrote :

Looks ok

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libsyncdaemon/syncdaemon-authentication.c'
--- libsyncdaemon/syncdaemon-authentication.c 2011-04-12 23:55:19 +0000
+++ libsyncdaemon/syncdaemon-authentication.c 2011-04-18 20:34:24 +0000
@@ -26,8 +26,6 @@
26#include "syncdaemon-authentication.h"26#include "syncdaemon-authentication.h"
27#include "syncdaemon-marshal.h"27#include "syncdaemon-marshal.h"
2828
29#define DEFAULT_ERROR_MESSAGE "No error specified"
30
31G_DEFINE_TYPE(SyncdaemonAuthentication, syncdaemon_authentication, G_TYPE_OBJECT)29G_DEFINE_TYPE(SyncdaemonAuthentication, syncdaemon_authentication, G_TYPE_OBJECT)
3230
33struct _SyncdaemonAuthenticationPrivate {31struct _SyncdaemonAuthenticationPrivate {
@@ -133,21 +131,16 @@
133static void131static void
134credentials_error_cb (DBusGProxy *proxy,132credentials_error_cb (DBusGProxy *proxy,
135 const gchar *app_name,133 const gchar *app_name,
136 GHashTable *error_dict,134 const gchar *error_message,
135 const gchar *detailed_error,
137 gpointer user_data)136 gpointer user_data)
138{137{
139 gchar *error_message;
140
141 g_debug ("Authorization error");138 g_debug ("Authorization error");
142 if (g_strcmp0 (app_name, SSO_APP_NAME) != 0) {139 if (g_strcmp0 (app_name, SSO_APP_NAME) != 0) {
143 g_debug ("Credentials are not for '" SSO_APP_NAME "', ignoring");140 g_debug ("Credentials are not for '" SSO_APP_NAME "', ignoring");
144 return;141 return;
145 }142 }
146143
147 error_message = g_hash_table_lookup (error_dict, "error_message");
148 if (error_message == NULL)
149 error_message = DEFAULT_ERROR_MESSAGE;
150
151 g_signal_emit (user_data, auth_signals[ERROR_SIGNAL], 0, error_message);144 g_signal_emit (user_data, auth_signals[ERROR_SIGNAL], 0, error_message);
152}145}
153146
@@ -166,7 +159,7 @@
166 g_error_free (error);159 g_error_free (error);
167 } else {160 } else {
168 auth->priv->proxy = dbus_g_proxy_new_for_name (auth->priv->bus, "com.ubuntu.sso",161 auth->priv->proxy = dbus_g_proxy_new_for_name (auth->priv->bus, "com.ubuntu.sso",
169 "/com/ubuntu/sso/credentials", "com.ubuntu.sso.CredentialsManagement");162 "/credentials", "com.ubuntu.sso.ApplicationCredentials");
170 if (auth->priv->proxy != NULL) {163 if (auth->priv->proxy != NULL) {
171 dbus_g_object_register_marshaller (_syncdaemon_marshal_VOID__STRING_POINTER,164 dbus_g_object_register_marshaller (_syncdaemon_marshal_VOID__STRING_POINTER,
172 G_TYPE_NONE,165 G_TYPE_NONE,
@@ -193,9 +186,8 @@
193186
194 dbus_g_proxy_add_signal (auth->priv->proxy, "CredentialsError",187 dbus_g_proxy_add_signal (auth->priv->proxy, "CredentialsError",
195 G_TYPE_STRING,188 G_TYPE_STRING,
196 dbus_g_type_get_map ("GHashTable",189 G_TYPE_STRING,
197 G_TYPE_STRING,190 G_TYPE_STRING,
198 G_TYPE_STRING),
199 G_TYPE_INVALID);191 G_TYPE_INVALID);
200 dbus_g_proxy_connect_signal (auth->priv->proxy, "CredentialsError",192 dbus_g_proxy_connect_signal (auth->priv->proxy, "CredentialsError",
201 G_CALLBACK (credentials_error_cb), auth, NULL);193 G_CALLBACK (credentials_error_cb), auth, NULL);

Subscribers

People subscribed via source and target branches