~ubuntu-desktop/gnome-control-center/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/02_new_goa.patch

  • Committer: Martin Pitt
  • Author(s): Tim Lunn
  • Date: 2014-09-30 12:51:59 UTC
  • mfrom: (646.1.2 g-c-c)
  • Revision ID: martin.pitt@canonical.com-20140930125159-busza4a4mli50axi
merge with 1:3.12.1-5 from Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Index: gnome-control-center-3.8.6/panels/online-accounts/cc-online-accounts-panel.c
2
 
===================================================================
3
 
--- gnome-control-center-3.8.6.orig/panels/online-accounts/cc-online-accounts-panel.c   2013-12-12 14:00:10.759923318 +1300
4
 
+++ gnome-control-center-3.8.6/panels/online-accounts/cc-online-accounts-panel.c        2013-12-12 14:00:10.755923318 +1300
5
 
@@ -617,8 +617,11 @@
6
 
 /* ---------------------------------------------------------------------------------------------------- */
7
 
 
8
 
 static void
9
 
-add_account (CcGoaPanel *panel)
10
 
+get_all_providers_cb (GObject      *source,
11
 
+                      GAsyncResult *res,
12
 
+                      gpointer      user_data)
13
 
 {
14
 
+  CcGoaPanel *panel = CC_GOA_PANEL (user_data);
15
 
   GtkWindow *parent;
16
 
   GtkWidget *dialog;
17
 
   gint response;
18
 
@@ -629,12 +632,14 @@
19
 
 
20
 
   providers = NULL;
21
 
 
22
 
+  if (!goa_provider_get_all_finish (&providers, res, NULL))
23
 
+    goto out;
24
 
+
25
 
   parent = GTK_WINDOW (cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (panel))));
26
 
 
27
 
   dialog = goa_panel_add_account_dialog_new (panel->client);
28
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
29
 
 
30
 
-  providers = goa_provider_get_all ();
31
 
   for (l = providers; l != NULL; l = l->next)
32
 
     {
33
 
       GoaProvider *provider;
34
 
@@ -697,6 +703,12 @@
35
 
   g_list_free (providers);
36
 
 }
37
 
 
38
 
+static void
39
 
+add_account (CcGoaPanel *panel)
40
 
+{
41
 
+  goa_provider_get_all (get_all_providers_cb, panel);
42
 
+}
43
 
+
44
 
 /* ---------------------------------------------------------------------------------------------------- */
45
 
 
46
 
 static void