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

Proposed by Alejandro J. Cura on 2011-04-19
Status: Merged
Approved by: Alejandro J. Cura on 2011-04-19
Approved revision: 959
Merged at revision: 959
Proposed branch: lp:~alecu/ubuntuone-client/revert-dbus-interface-change-stable
Merge into: lp:ubuntuone-client/stable-1-6
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-stable
Reviewer Review Type Date Requested Status
Natalia Bidart Approve on 2011-04-19
Roman Yepishev (community) code 2011-04-19 Approve on 2011-04-19
Review via email: mp+58322@code.launchpad.net

This proposal supersedes a proposal from 2011-04-19.

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.
Roman Yepishev (rye) wrote :

This worked fine with trunk version so approving.

review: Approve (code)
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libsyncdaemon/syncdaemon-authentication.c'
2--- libsyncdaemon/syncdaemon-authentication.c 2011-04-12 23:55:19 +0000
3+++ libsyncdaemon/syncdaemon-authentication.c 2011-04-19 14:59:31 +0000
4@@ -26,8 +26,6 @@
5 #include "syncdaemon-authentication.h"
6 #include "syncdaemon-marshal.h"
7
8-#define DEFAULT_ERROR_MESSAGE "No error specified"
9-
10 G_DEFINE_TYPE(SyncdaemonAuthentication, syncdaemon_authentication, G_TYPE_OBJECT)
11
12 struct _SyncdaemonAuthenticationPrivate {
13@@ -133,21 +131,16 @@
14 static void
15 credentials_error_cb (DBusGProxy *proxy,
16 const gchar *app_name,
17- GHashTable *error_dict,
18+ const gchar *error_message,
19+ const gchar *detailed_error,
20 gpointer user_data)
21 {
22- gchar *error_message;
23-
24 g_debug ("Authorization error");
25 if (g_strcmp0 (app_name, SSO_APP_NAME) != 0) {
26 g_debug ("Credentials are not for '" SSO_APP_NAME "', ignoring");
27 return;
28 }
29
30- error_message = g_hash_table_lookup (error_dict, "error_message");
31- if (error_message == NULL)
32- error_message = DEFAULT_ERROR_MESSAGE;
33-
34 g_signal_emit (user_data, auth_signals[ERROR_SIGNAL], 0, error_message);
35 }
36
37@@ -166,7 +159,7 @@
38 g_error_free (error);
39 } else {
40 auth->priv->proxy = dbus_g_proxy_new_for_name (auth->priv->bus, "com.ubuntu.sso",
41- "/com/ubuntu/sso/credentials", "com.ubuntu.sso.CredentialsManagement");
42+ "/credentials", "com.ubuntu.sso.ApplicationCredentials");
43 if (auth->priv->proxy != NULL) {
44 dbus_g_object_register_marshaller (_syncdaemon_marshal_VOID__STRING_POINTER,
45 G_TYPE_NONE,
46@@ -193,9 +186,8 @@
47
48 dbus_g_proxy_add_signal (auth->priv->proxy, "CredentialsError",
49 G_TYPE_STRING,
50- dbus_g_type_get_map ("GHashTable",
51- G_TYPE_STRING,
52- G_TYPE_STRING),
53+ G_TYPE_STRING,
54+ G_TYPE_STRING,
55 G_TYPE_INVALID);
56 dbus_g_proxy_connect_signal (auth->priv->proxy, "CredentialsError",
57 G_CALLBACK (credentials_error_cb), auth, NULL);

Subscribers

People subscribed via source and target branches