[gnome-online-accounts] daemon: set icon and provider name after building the object

[Marco Barisione <mbari src gnome org>]

commit 5abe666ba628fcc4f7534604b5036e59919a6338
Author: Marco Barisione <marco barisione collabora co uk>
Date:   Wed Jul 10 17:08:30 2013 +0100

    daemon: set icon and provider name after building the object
    
    If provider name and type can change based on the GoaObject, but, if the
    methods are called before the object is built, there is no way to do
    anything useful.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=696267

 src/daemon/goadaemon.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/src/daemon/goadaemon.c b/src/daemon/goadaemon.c
index 5da951d..cc5a3fe 100644
--- a/src/daemon/goadaemon.c
+++ b/src/daemon/goadaemon.c
@@ -480,14 +480,8 @@ update_account_object (GoaDaemon           *daemon,
       goto out;
     }
 
-  name = goa_provider_get_provider_name (provider, GOA_OBJECT (object));
-  icon = goa_provider_get_provider_icon (provider, GOA_OBJECT (object));
-  serialized_icon = g_icon_to_string (icon);
-
   goa_account_set_id (account, g_strrstr (g_dbus_object_get_object_path (G_DBUS_OBJECT (object)), "/") + 1);
   goa_account_set_provider_type (account, type);
-  goa_account_set_provider_name (account, name);
-  goa_account_set_provider_icon (account, serialized_icon);
   goa_account_set_identity (account, identity);
   goa_account_set_presentation_identity (account, presentation_identity);
 
@@ -500,6 +494,13 @@ update_account_object (GoaDaemon           *daemon,
       goto out;
     }
 
+  name = goa_provider_get_provider_name (provider, GOA_OBJECT (object));
+  goa_account_set_provider_name (account, name);
+
+  icon = goa_provider_get_provider_icon (provider, GOA_OBJECT (object));
+  serialized_icon = g_icon_to_string (icon);
+  goa_account_set_provider_icon (account, serialized_icon);
+
   ret = TRUE;
 
  out: