Merge lp:~dobey/ubuntuone-client/gsd-listen-only-stable into lp:ubuntuone-client/stable-1-4

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 745
Merged at revision: 746
Proposed branch: lp:~dobey/ubuntuone-client/gsd-listen-only-stable
Merge into: lp:ubuntuone-client/stable-1-4
Diff against target: 17 lines (+2/-5)
1 file modified
gsd-plugin/gsd-ubuntuone.c (+2/-5)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/gsd-listen-only-stable
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Manuel de la Peña (community) Approve
Review via email: mp+46288@code.launchpad.net

Commit message

Only listen for the credentials found signal, don't explicitly ask for them

To post a comment you must log in.
Revision history for this message
Manuel de la Peña (mandel) wrote :

Looks good and compiled ok.

review: Approve
Revision history for this message
Roberto Alsina (ralsina) wrote :

+1 the code looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gsd-plugin/gsd-ubuntuone.c'
2--- gsd-plugin/gsd-ubuntuone.c 2010-09-30 14:23:05 +0000
3+++ gsd-plugin/gsd-ubuntuone.c 2011-01-14 17:15:10 +0000
4@@ -232,11 +232,8 @@
5
6 /* Check for authentication */
7 auth = syncdaemon_daemon_get_authentication (plugin->syncdaemon);
8- if (syncdaemon_authentication_has_credentials (auth))
9- check_bookmark_file ();
10- else
11- g_signal_connect (auth, "credentials_found",
12- G_CALLBACK (credentials_found_cb), NULL);
13+ g_signal_connect (auth, "credentials_found",
14+ G_CALLBACK (credentials_found_cb), NULL);
15
16 return FALSE;
17 }

Subscribers

People subscribed via source and target branches

to all changes: