X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=bf01e38be834390244c3ba2c1736256ad137e411;hb=dc84efe84c22be9c1b6247a8ee29cfd1d675d21d;hp=a7b5bfdbfccd86147523be56273106f117fef09c;hpb=486e6090d3a05349a4227c059d9203e573765208;p=modest diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index a7b5bfd..bf01e38 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -343,37 +343,50 @@ on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor, static void on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account, - gboolean is_server_account, gpointer user_data) { + TnyAccount *store_account = NULL, *transport_account = NULL; ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); - TnyAccount *server_account; - /* Clear the account cache */ - server_account = modest_tny_account_store_get_tny_account_by (self, - MODEST_TNY_ACCOUNT_STORE_QUERY_ID, - account); - if (server_account) { - if (TNY_IS_STORE_ACCOUNT (server_account)) { + /* Get the server and the transport account */ + store_account = + modest_tny_account_store_get_server_account (self, account, TNY_ACCOUNT_TYPE_STORE); + transport_account = + modest_tny_account_store_get_server_account (self, account, TNY_ACCOUNT_TYPE_TRANSPORT); + + /* Clear the cache */ + tny_store_account_delete_cache (TNY_STORE_ACCOUNT (store_account)); + + /* Notify the observers */ + g_signal_emit (G_OBJECT (self), + tny_account_store_signals [TNY_ACCOUNT_STORE_ACCOUNT_REMOVED], + 0, store_account); + g_signal_emit (G_OBJECT (self), + tny_account_store_signals [TNY_ACCOUNT_STORE_ACCOUNT_REMOVED], + 0, transport_account); + + /* Frees */ + g_object_unref (store_account); + g_object_unref (transport_account); +} - tny_store_account_delete_cache (TNY_STORE_ACCOUNT (server_account)); - - g_signal_emit (G_OBJECT (self), - tny_account_store_signals [TNY_ACCOUNT_STORE_ACCOUNT_REMOVED], - 0, server_account); - -/* /\* FIXME: make this more finegrained; changes do not */ -/* * really affect _all_ accounts, and some do not */ -/* * affect tny accounts at all (such as 'last_update') */ -/* *\/ */ -/* recreate_all_accounts (self); */ - -/* g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, */ -/* account); */ - } - g_object_unref (server_account); - } else - g_printerr ("modest: cannot find server account for %s", account); +/** + * modest_tny_account_store_forget_password_in_memory + * @self: a TnyAccountStore instance + * @account: A server account. + * + * Forget any password stored in memory for this account. + * For instance, this should be called when the user has changed the password in the account settings. + */ +static void +modest_tny_account_store_forget_password_in_memory (ModestTnyAccountStore *self, const gchar * server_account_name) +{ + /* printf ("DEBUG: %s\n", __FUNCTION__); */ + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + if (server_account_name && priv->password_hash) { + g_hash_table_remove (priv->password_hash, server_account_name); + } } static void @@ -383,15 +396,38 @@ on_account_changed (ModestAccountMgr *acc_mgr, const gchar *account, { ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); + /* + printf ("DEBUG: %s\n", __FUNCTION__); + const GSList *iter = keys; + for (iter = keys; iter; iter = g_slist_next (iter)) { + printf (" DEBUG: %s: key=%s\n", __FUNCTION__, (const gchar*)iter->data); + } + */ + /* Ignore the change if it's a change in the last_updated value */ if (g_slist_length ((GSList *)keys) == 1 && - g_str_has_suffix ((const gchar *) keys->data, MODEST_ACCOUNT_LAST_UPDATED)) + g_str_has_suffix ((const gchar *) keys->data, MODEST_ACCOUNT_LAST_UPDATED)) { return; + } /* FIXME: make this more finegrained; changes do not really affect _all_ * accounts */ recreate_all_accounts (self); + + /* TODO: This doesn't actually work, because + * a) The account name is not sent correctly per key: + * b) We should test the end of the key, not the whole keym + * c) We don't seem to be getting all keys here. + * Instead, we just forget the password for all accounts when we create them, for now. + */ + #if 0 + /* If a password has changed, then forget the previously cached password for this account: */ + if (server_account && keys && g_slist_find_custom ((GSList *)keys, MODEST_ACCOUNT_PASSWORD, (GCompareFunc)strcmp)) { + printf ("DEBUG: %s: Forgetting cached password for account ID=%s\n", __FUNCTION__, account); + modest_tny_account_store_forget_password_in_memory (self, account); + } + #endif g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, account); @@ -443,20 +479,19 @@ gboolean on_idle_wrong_password (gpointer user_data) * for instance because of a previous get_password() call: */ gpointer dialog_as_gpointer = NULL; - priv->account_settings_dialog_hash && - g_hash_table_lookup_extended (priv->account_settings_dialog_hash, - modest_account_name, - NULL, - (gpointer*)&dialog_as_gpointer); - + gboolean found = FALSE; + if (priv->account_settings_dialog_hash) { + found = g_hash_table_lookup_extended (priv->account_settings_dialog_hash, + modest_account_name, NULL, (gpointer*)&dialog_as_gpointer); + } ModestAccountSettingsDialog *dialog = dialog_as_gpointer; ModestWindow *main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); - + + gdk_threads_enter (); gboolean created_dialog = FALSE; - if (!dialog) { - + if (!found || !dialog) { dialog = modest_account_settings_dialog_new (); modest_account_settings_dialog_set_account_name (dialog, modest_account_name); modest_account_settings_dialog_switch_to_user_info (dialog); @@ -481,14 +516,79 @@ gboolean on_idle_wrong_password (gpointer user_data) else { /* Just show it instead of showing it and deleting it when it closes, * though it is probably open already: */ - gtk_widget_show (GTK_WIDGET (dialog)); + gtk_window_present (GTK_WINDOW (dialog)); } g_object_unref (account); + gdk_threads_leave (); return FALSE; /* Dont' call this again. */ } +typedef struct +{ + GMainLoop *loop; + ModestTnyAccountStore* account_store; + const gchar* server_account_id; + gchar **username; + gchar **password; + gboolean *cancel; + gboolean *remember; +} IdlePasswordRequest; + +static gboolean +on_idle_request_password (gpointer user_data) +{ + gdk_threads_enter(); + + IdlePasswordRequest* info = (IdlePasswordRequest*)user_data; + g_signal_emit (G_OBJECT(info->account_store), signals[PASSWORD_REQUESTED_SIGNAL], 0, + info->server_account_id, /* server_account_name */ + info->username, info->password, info->cancel, info->remember); + + if (info->loop) + g_main_loop_quit (info->loop); + + gdk_threads_leave(); + + return FALSE; /* Don't call again. */ +} + +static void +request_password_in_main_loop_and_wait (ModestTnyAccountStore *account_store, + const gchar* server_account_id, + gchar **username, + gchar **password, + gboolean *cancel, + gboolean *remember) +{ + IdlePasswordRequest *data = g_slice_new0 (IdlePasswordRequest); + data->account_store = account_store; + data->server_account_id = server_account_id; + data->username = username; + data->password = password; + data->cancel = cancel; + data->remember = remember; + + data->loop = g_main_loop_new (NULL, FALSE /* not running */); + + /* Cause the function to be run in an idle-handler, which is always + * in the main thread: + */ + g_idle_add (&on_idle_request_password, data); + + /* This main loop will run until the idle handler has stopped it: */ + printf ("DEBUG: %s: before g_main_loop_run()\n", __FUNCTION__); + GDK_THREADS_LEAVE(); + g_main_loop_run (data->loop); + GDK_THREADS_ENTER(); + printf ("DEBUG: %s: after g_main_loop_run()\n", __FUNCTION__); + printf ("DEBUG: %s: Finished\n", __FUNCTION__); + g_main_loop_unref (data->loop); + + g_slice_free (IdlePasswordRequest, data); +} + /* This callback will be called by Tinymail when it needs the password * from the user or the account settings. * It can also call forget_password() before calling this, @@ -522,7 +622,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc account_store = TNY_ACCOUNT_STORE(get_account_store_for_account (account)); if (!server_account_name || !account_store) { - g_warning ("%s: could not retrieve account_store for account %s", + g_warning ("modest: %s: could not retrieve account_store for account %s", __FUNCTION__, server_account_name ? server_account_name : ""); if (cancel) *cancel = TRUE; @@ -580,8 +680,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc gboolean remember = FALSE; pwd = NULL; - g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0, - account_id, /* server_account_name */ + request_password_in_main_loop_and_wait (self, account_id, &username, &pwd, cancel, &remember); if (!*cancel) { @@ -589,6 +688,9 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc * but we need to tell tinymail about the username too: */ tny_account_set_user (account, username); + /* Do not save the password in gconf, + * because the UI spec says "The password will never be saved in the account": */ + /* if (remember) { printf ("%s: Storing username=%s, password=%s\n", __FUNCTION__, username, pwd); @@ -597,6 +699,8 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc modest_server_account_set_password (priv->account_mgr, server_account_name, pwd); } + */ + /* We need to dup the string even knowing that it's already a dup of the contents of an entry, because it if it's wrong, then camel @@ -651,6 +755,19 @@ forget_password (TnyAccount *account) */ } +static void +destroy_password_hashtable (ModestTnyAccountStore *self) +{ + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + g_free (priv->cache_dir); + priv->cache_dir = NULL; + + if (priv->password_hash) { + g_hash_table_destroy (priv->password_hash); + priv->password_hash = NULL; + } +} static void modest_tny_account_store_finalize (GObject *obj) @@ -668,10 +785,7 @@ modest_tny_account_store_finalize (GObject *obj) priv->password_hash = NULL; } - if (priv->account_settings_dialog_hash) { - g_hash_table_destroy (priv->account_settings_dialog_hash); - priv->account_settings_dialog_hash = NULL; - } + destroy_password_hashtable (self); if (priv->account_mgr) { g_object_unref (G_OBJECT(priv->account_mgr)); @@ -837,6 +951,15 @@ get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) get_password, forget_password); if (tny_account) { + /* Forget any cached password for the account, + * so that we use a new account if any. + * TODO: Really we should do this in a more precise way in + * on_account_changed(). + */ + modest_tny_account_store_forget_password_in_memory ( + MODEST_TNY_ACCOUNT_STORE (self), + tny_account_get_id (tny_account)); + g_object_set_data (G_OBJECT(tny_account), "account_store", (gpointer)self); if (list) @@ -901,6 +1024,7 @@ get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) * modest account: */ GSList *iter = list_specifics; while (iter) { + /* The list alternates between the connection name and the transport name: */ /* const gchar* this_connection_name = (const gchar*)(iter->data); */ iter = g_slist_next (iter); if (iter) { @@ -911,6 +1035,7 @@ get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) tny_account = modest_tny_account_new_from_server_account_name ( priv->account_mgr, priv->session, transport_account_name); if (tny_account) { + modest_tny_account_set_parent_modest_account_name_for_server_account (tny_account, account_name); g_object_set_data (G_OBJECT(tny_account), "account_store", (gpointer)self); if (list) @@ -1013,6 +1138,9 @@ modest_tny_account_store_get_accounts (TnyAccountStore *self, TnyList *list, TNY_ACCOUNT_STORE_STORE_ACCOUNTS); modest_tny_account_store_get_accounts (self, list, TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS); + + tny_session_camel_set_initialized (priv->session); + return; } @@ -1021,12 +1149,16 @@ modest_tny_account_store_get_accounts (TnyAccountStore *self, TnyList *list, get_server_accounts (self, list, TNY_ACCOUNT_TYPE_STORE); else get_cached_accounts (self, list, TNY_ACCOUNT_TYPE_STORE); + + tny_session_camel_set_initialized (priv->session); } else if (request_type == TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS) { if (!priv->transport_accounts) get_server_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT); else get_cached_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT); + + tny_session_camel_set_initialized (priv->session); } else g_return_if_reached (); /* incorrect req type */ } @@ -1075,11 +1207,9 @@ modest_tny_account_store_find_account_by_url (TnyAccountStore *self, const gchar static gboolean -modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, +modest_tny_account_store_alert (TnyAccountStore *self, TnyAccount *account, TnyAlertType type, gboolean question, const GError *error) { - /* TODO: It would be nice to know what account caused this error. */ - g_return_val_if_fail (error, FALSE); if ((error->domain != TNY_ACCOUNT_ERROR) @@ -1093,7 +1223,28 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, printf("DEBUG: %s: GError code: %d, message=%s\n", __FUNCTION__, error->code, error->message); - + /* Get the server name: */ + const gchar* server_name = NULL; + if (account && TNY_IS_ACCOUNT (account)) { + server_name = tny_account_get_hostname (account); + printf ("modest: %s: account name = %s, server_name=%s\n", __FUNCTION__, + tny_account_get_id (account), server_name); + } + + if (!server_name) + server_name = _("Unknown Server"); + + ModestTransportStoreProtocol proto = MODEST_PROTOCOL_STORE_POP; /* Arbitrary default. */ + if (account) { + const gchar *proto_name = tny_account_get_proto (account); + if (proto_name) + proto = modest_protocol_info_get_transport_store_protocol (proto_name); + else { + g_warning("modest: %s: account with id=%s has no proto.\n", __FUNCTION__, + tny_account_get_id (account)); + } + } + /* const gchar *prompt = NULL; */ gchar *prompt = NULL; switch (error->code) { @@ -1105,16 +1256,32 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, __FUNCTION__, error->domain, error->code, error->message); prompt = NULL; break; + case TNY_ACCOUNT_ERROR_TRY_CONNECT_HOST_LOOKUP_FAILED: + /* TODO: Show the appropriate message, depending on whether it's POP or IMAP: */ g_debug ("%s: Handling GError domain=%d, code=%d (lookup failed), message=%s", __FUNCTION__, error->domain, error->code, error->message); - prompt = g_strdup (_("emev_ni_ui_pop3_msg_connect_error")); + + switch (proto) { + case MODEST_PROTOCOL_STORE_POP: + prompt = g_strdup_printf (_("emev_ni_ui_pop3_msg_connect_error"), server_name); + break; + case MODEST_PROTOCOL_STORE_IMAP: + prompt = g_strdup_printf (_("emev_ni_ui_imap_connect_server_error"), server_name); + break; + case MODEST_PROTOCOL_TRANSPORT_SMTP: + default: /* Arbitrary default. */ + prompt = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); + break; + } + /* prompt = g_strdup_printf( _("Incorrect Account Settings:\n Host lookup failed.%s"), error->message); */ break; + case TNY_ACCOUNT_ERROR_TRY_CONNECT_AUTHENTICATION_NOT_SUPPORTED: g_debug ("%s: Handling GError domain=%d, code=%d (authentication not supported), message=%s", __FUNCTION__, error->domain, error->code, error->message); @@ -1123,6 +1290,7 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, _("Incorrect Account Settings:\nThe secure authentication method is not supported.\n%s"), error->message); break; + case TNY_ACCOUNT_ERROR_TRY_CONNECT_CERTIFICATE: g_debug ("%s: Handling GError domain=%d, code=%d (certificatae), message=%s", __FUNCTION__, error->domain, error->code, error->message); @@ -1153,43 +1321,10 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, _("Incorrect Account Settings"), error->message); - /* TODO: If we can ever determine that the problem is a wrong password: - * In this case, the UI spec wants us to show a banner, and then - * open the Account Settings dialog. */ - /* Note: Sometimes, the get_password() function seems to be called again - * when a password is wrong, but sometimes this alert_func is called. */ - #if 0 - GtkWidget *parent_widget = - GTK_WIDGET ( - modest_window_mgr_get_main_window ( - modest_runtime_get_window_mgr ())); - - hildon_banner_show_information ( - parent_widget, - NULL /* icon name */, - _("mcen_ib_username_pw_incorrect") ); - - /* Show the Account Settings window: */ - ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new (); - /* TODO: Get the account somehow. Maybe tinymail should send it with the signal. */ - const gchar* modest_account_name = - modest_tny_account_get_parent_modest_account_name_for_server_account (account); - g_assert (modest_account_name); - modest_account_settings_dialog_set_account_name (dialog, - modest_account_name); - - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self)); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (GTK_WIDGET (dialog)); - #endif + /* Note: If the password was wrong then get_password() would be called again, + * instead of this vfunc being called. */ break; - - //TODO: We have started receiving errors of - //domain=TNY_ACCOUNT_ERROR, code=TNY_ACCOUNT_ERROR_TRY_CONNECT, message="Canceled". - //If this is really a result of us cancelling our own operation then - //a) this probably shouldn't be an error, and - //b) should have its own error code. default: g_warning ("%s: Unhandled GError code: %d, message=%s", @@ -1201,48 +1336,31 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, if (!prompt) return FALSE; -#ifdef MODEST_PLATFORM_MAEMO - /* The Tinymail documentation says that we should show Yes and No buttons, - * when it is a question. - * Obviously, we need tinymail to use more specific error codes instead, - * so we know what buttons to show. */ - GtkWidget *dialog = NULL; - if (question) { - dialog = GTK_WIDGET (hildon_note_new_confirmation (NULL, + ModestWindow *main_window = + modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); + gboolean retval = TRUE; + if (question) { + /* The Tinymail documentation says that we should show Yes and No buttons, + * when it is a question. + * Obviously, we need tinymail to use more specific error codes instead, + * so we know what buttons to show. */ + + /* TODO: Do this in the main context: */ + GtkWidget *dialog = GTK_WIDGET (hildon_note_new_confirmation (GTK_WINDOW (main_window), prompt)); + const int response = gtk_dialog_run (GTK_DIALOG (dialog)); + if (question) { + retval = (response == GTK_RESPONSE_YES) || + (response == GTK_RESPONSE_OK); + } + + gtk_widget_destroy (dialog); + } else { - dialog = GTK_WIDGET (hildon_note_new_information (NULL, - prompt)); + /* Just show the error text and use the default response: */ + modest_maemo_show_information_note_in_main_context_and_forget (GTK_WINDOW (main_window), + prompt); } -#else - - GtkMessageType gtktype = GTK_MESSAGE_ERROR; - switch (type) - { - case TNY_ALERT_TYPE_INFO: - gtktype = GTK_MESSAGE_INFO; - break; - case TNY_ALERT_TYPE_WARNING: - gtktype = GTK_MESSAGE_WARNING; - break; - case TNY_ALERT_TYPE_ERROR: - default: - gtktype = GTK_MESSAGE_ERROR; - break; - } - - GtkWidget *dialog = gtk_message_dialog_new (NULL, 0, - gtktype, GTK_BUTTONS_YES_NO, prompt); -#endif /* #ifdef MODEST_PLATFORM_MAEMO */ - - gboolean retval = TRUE; - const int response = gtk_dialog_run (GTK_DIALOG (dialog)); - if (question) { - retval = (response == GTK_RESPONSE_YES) || - (response == GTK_RESPONSE_OK); - } - - gtk_widget_destroy (dialog); /* TODO: Don't free this when we no longer strdup the message for testers. */ g_free (prompt); @@ -1381,59 +1499,50 @@ modest_tny_account_store_get_tny_account_by (ModestTnyAccountStore *self, TnyAccount* modest_tny_account_store_get_server_account (ModestTnyAccountStore *self, - const gchar *account_name, - TnyAccountType type) + const gchar *account_name, + TnyAccountType type) { + ModestTnyAccountStorePrivate *priv = NULL; TnyAccount *account = NULL; - gchar *id = NULL; - ModestTnyAccountStorePrivate *priv; + GSList *account_list = NULL; + gboolean found = FALSE; g_return_val_if_fail (self, NULL); g_return_val_if_fail (account_name, NULL); - g_return_val_if_fail (type == TNY_ACCOUNT_TYPE_STORE || type == TNY_ACCOUNT_TYPE_TRANSPORT, + g_return_val_if_fail (type == TNY_ACCOUNT_TYPE_STORE || + type == TNY_ACCOUNT_TYPE_TRANSPORT, NULL); priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - /* Special case for the local account */ - if (!strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) { - if(type == TNY_ACCOUNT_TYPE_STORE) - id = g_strdup (MODEST_LOCAL_FOLDERS_ACCOUNT_ID); - else { - /* The local folders modest account has no transport server account. */ - return NULL; - } - } else { - ModestAccountData *account_data; - account_data = modest_account_mgr_get_account_data (priv->account_mgr, account_name); - if (!account_data) { - g_printerr ("modest: %s: cannot get account data for account '%s'\n", __FUNCTION__, - account_name); - return NULL; - } - - if (type == TNY_ACCOUNT_TYPE_STORE && account_data->store_account) - id = g_strdup (account_data->store_account->account_name); - else if (type == TNY_ACCOUNT_TYPE_TRANSPORT && account_data->transport_account) - id = g_strdup (account_data->transport_account->account_name); + account_list = (type == TNY_ACCOUNT_TYPE_STORE) ? + priv->store_accounts : + priv->transport_accounts; + + /* Look for the server account */ + while (account_list && !found) { + const gchar *modest_acc_name; - modest_account_mgr_free_account_data (priv->account_mgr, account_data); + account = TNY_ACCOUNT (account_list->data);; + modest_acc_name = + modest_tny_account_get_parent_modest_account_name_for_server_account (account); + + if (!strcmp (account_name, modest_acc_name)) + found = TRUE; + else + account_list = g_slist_next (account_list); } - if (!id) - g_printerr ("modest: could not get an id for account %s\n", + if (!found) { + g_printerr ("modest: could not get tny %s account for %s\n", + (type == TNY_ACCOUNT_TYPE_STORE) ? "store" : "transport", account_name); - else - account = modest_tny_account_store_get_tny_account_by (self, - MODEST_TNY_ACCOUNT_STORE_QUERY_ID, id); - - if (!account) - g_printerr ("modest: could not get tny %s account for %s (id=%s)\n", - type == TNY_ACCOUNT_TYPE_STORE ? "store" : "transport", - account_name, id ? id : ""); - g_free (id); + } else { + /* Pick a reference */ + g_object_ref (account); + } - return account; + return account; } static TnyAccount*