use the 48x48 version of the local-xmpp icon

[empathy.git] / libempathy-gtk / empathy-account-chooser.c

diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index f743db99e3e65ff32096c4628d34c1219e6a268f..ae3f1dd154e3538ac0c5eda34f73ef0dd09a2c52 100644 (file)
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -65,6 +65,8 @@ struct _EmpathyAccountChooserPriv
   EmpathyAccountChooserFilterFunc filter;
   gpointer filter_data;
   gboolean ready;
+
+  TpAccount *select_when_ready;
 };
 
 typedef struct
@@ -88,6 +90,10 @@ filter_result_callback_data_new (EmpathyAccountChooser *self,
 {
   FilterResultCallbackData *data;
 
+  g_return_val_if_fail (self != NULL, NULL);
+  g_return_val_if_fail (account != NULL, NULL);
+  g_return_val_if_fail (iter != NULL, NULL);
+
   data = g_slice_new0 (FilterResultCallbackData);
   data->self = g_object_ref (self);
   data->account = g_object_ref (account);
@@ -135,7 +141,7 @@ static void account_chooser_account_removed_cb (TpAccountManager *manager,
     TpAccount *account,
     EmpathyAccountChooser *self);
 static void account_chooser_account_remove_foreach (TpAccount *account,
-    EmpathyAccountChooser*self);
+    EmpathyAccountChooser *self);
 static void account_chooser_update_iter (EmpathyAccountChooser *self,
     GtkTreeIter *iter);
 static void account_chooser_status_changed_cb (TpAccount *account,
@@ -154,6 +160,8 @@ static gboolean account_chooser_set_account_foreach (GtkTreeModel *model,
     SetAccountData *data);
 static void update_account (EmpathyAccountChooser *self,
     TpAccount *account);
+static gboolean select_account (EmpathyAccountChooser *self,
+    TpAccount *account);
 
 enum {
   PROP_0,
@@ -295,6 +303,13 @@ account_manager_prepared_cb (GObject *source_object,
 
   g_list_free (accounts);
 
+  if (self->priv->select_when_ready != NULL)
+    {
+      select_account (self, self->priv->select_when_ready);
+
+      g_clear_object (&self->priv->select_when_ready);
+    }
+
   self->priv->ready = TRUE;
   g_signal_emit (self, signals[READY], 0);
 }
@@ -354,6 +369,7 @@ account_chooser_dispose (GObject *object)
   EmpathyAccountChooser *self = EMPATHY_ACCOUNT_CHOOSER (object);
 
   g_clear_object (&self->priv->manager);
+  g_clear_object (&self->priv->select_when_ready);
 
   G_OBJECT_CLASS (empathy_account_chooser_parent_class)->dispose (object);
 }
@@ -529,17 +545,8 @@ empathy_account_chooser_get_connection (EmpathyAccountChooser *self)
   return connection;
 }
 
-/**
- * empathy_account_chooser_set_account:
- * @self: an #EmpathyAccountChooser
- * @account: a #TpAccount
- *
- * Sets the currently selected account to @account, if it exists in the list.
- *
- * Return value: whether the chooser was set to @account.
- */
-gboolean
-empathy_account_chooser_set_account (EmpathyAccountChooser *self,
+static gboolean
+select_account (EmpathyAccountChooser *self,
     TpAccount *account)
 {
   GtkComboBox *combobox;
@@ -566,6 +573,32 @@ empathy_account_chooser_set_account (EmpathyAccountChooser *self,
   return data.set;
 }
 
+/**
+ * empathy_account_chooser_set_account:
+ * @self: an #EmpathyAccountChooser
+ * @account: a #TpAccount
+ *
+ * Sets the currently selected account to @account, if it exists in the list.
+ *
+ * Return value: whether the chooser was set to @account.
+ */
+gboolean
+empathy_account_chooser_set_account (EmpathyAccountChooser *self,
+    TpAccount *account)
+{
+  if (self->priv->ready)
+    return select_account (self, account);
+
+  /* Account chooser is not ready yet, we'll try selecting the account once it
+   * is */
+  g_clear_object (&self->priv->select_when_ready);
+
+  if (account != NULL)
+    self->priv->select_when_ready = g_object_ref (account);
+
+  return FALSE;
+}
+
 void
 empathy_account_chooser_set_all (EmpathyAccountChooser *self)
 {
@@ -762,7 +795,7 @@ account_chooser_find_account_foreach (GtkTreeModel *model,
 static gboolean
 account_chooser_find_account (EmpathyAccountChooser *self,
     TpAccount *account,
-    GtkTreeIter*iter)
+    GtkTreeIter *iter)
 {
   GtkListStore *store;
   GtkComboBox *combobox;