[gnome-initial-setup/gnome-3-14] goa: Deal gracefully with absence of goa



commit 74cd04c7c3857565721bbe61ea2a89e0a5f12780
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu May 28 17:44:57 2015 -0400

    goa: Deal gracefully with absence of goa
    
    No need to error out for this, the page simply won't show
    up if goa is not present.

 gnome-initial-setup/pages/goa/gis-goa-page.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gnome-initial-setup/pages/goa/gis-goa-page.c b/gnome-initial-setup/pages/goa/gis-goa-page.c
index d67fbba..75ed95a 100644
--- a/gnome-initial-setup/pages/goa/gis-goa-page.c
+++ b/gnome-initial-setup/pages/goa/gis-goa-page.c
@@ -286,16 +286,18 @@ gis_goa_page_constructed (GObject *object)
 
   G_OBJECT_CLASS (gis_goa_page_parent_class)->constructed (object);
 
+  gis_page_set_skippable (GIS_PAGE (page), TRUE);
+
+  priv->providers = g_hash_table_new (g_str_hash, g_str_equal);
+
   priv->goa_client = goa_client_new_sync (NULL, &error);
 
   if (priv->goa_client == NULL) {
-    g_error ("Failed to get a GoaClient: %s", error->message);
+    g_warning ("Failed to get a GoaClient: %s", error->message);
     g_error_free (error);
     return;
   }
 
-  priv->providers = g_hash_table_new (g_str_hash, g_str_equal);
-
   g_signal_connect (priv->goa_client, "account-added",
                     G_CALLBACK (accounts_changed), page);
   g_signal_connect (priv->goa_client, "account-removed",
@@ -311,8 +313,6 @@ gis_goa_page_constructed (GObject *object)
 
   populate_provider_list (page);
   sync_accounts (page);
-
-  gis_page_set_skippable (GIS_PAGE (page), TRUE);
 }
 
 static void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]