X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=28d6680f463444514afcbdb82381bc7c78386d27;hp=47e6b818b67bd0e661ce6e56b1f1be794a4c62bd;hb=3a00a6ff63e2fcd2feb005314753c6d4f32cf105;hpb=e53ed3f6657ffee69d5b5f64692518a63c6df3b4 diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 47e6b81..28d6680 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -112,10 +112,6 @@ static void add_connection_specific_transport_accounts (ModestTnyAcco static void remove_connection_specific_transport_accounts (ModestTnyAccountStore *self); -static void connection_status_changed (TnyAccount *account, - TnyConnectionStatus status, - gpointer data); - static inline gboolean only_local_accounts (ModestTnyAccountStore *self); /* list my signals */ @@ -470,7 +466,7 @@ on_account_changed (ModestAccountMgr *acc_mgr, account_list = (account_type == TNY_ACCOUNT_TYPE_STORE ? priv->store_accounts : priv->transport_accounts); - + iter = tny_list_create_iterator (account_list); while (!tny_iterator_is_done (iter) && !found) { TnyAccount *tny_account; @@ -485,9 +481,7 @@ on_account_changed (ModestAccountMgr *acc_mgr, } tny_iterator_next (iter); } - - if (iter) - g_object_unref (iter); + g_object_unref (iter); } static void @@ -633,7 +627,10 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc gchar *password; password = modest_account_mgr_get_server_account_password (priv->account_mgr, server_account_name); - if (!password || strlen(password) == 0) + + if (already_asked) + msg = g_strdup (_("mcen_ib_username_pw_incorrect")); + else if (!password || strlen(password) == 0) msg = g_strdup_printf (_("emev_ni_ui_smtp_passwd_invalid"), tny_account_get_name (account), tny_account_get_hostname (account)); @@ -1385,17 +1382,17 @@ modest_tny_account_store_get_smtp_specific_transport_account_for_open_connection if (!server_account_name) { return NULL; /* No connection-specific SMTP server was specified for this connection. */ } - + TnyAccount* account = modest_tny_account_store_get_tny_account_by (self, MODEST_TNY_ACCOUNT_STORE_QUERY_ID, server_account_name); /* printf ("DEBUG: %s: account=%p\n", __FUNCTION__, account); */ - g_free (server_account_name); + g_free (server_account_name); /* Unref the get()ed object, as required by the tny_maemo_conic_device_get_iap() documentation. */ g_object_unref (connection); - + return account; #else return NULL; /* TODO: Implement this for GNOME, instead of just Maemo? */ @@ -1499,34 +1496,6 @@ add_existing_accounts (ModestTnyAccountStore *self) modest_account_mgr_free_account_names (account_names); } -static void -connection_status_changed (TnyAccount *account, - TnyConnectionStatus status, - gpointer data) -{ - /* We do this here and not in the connection policy because we - don't want to do it for every account, just for the - accounts that are interactively added when modest is - runnning */ - if (status == TNY_CONNECTION_STATUS_CONNECTED) { - const gchar *account_name; - ModestWindow *top_window; - ModestTnyAccountStorePrivate *priv = NULL; - - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (data); - - /* Remove this handler */ - priv->sighandlers = modest_signal_mgr_disconnect (priv->sighandlers, - G_OBJECT (account), - "connection_status_changed"); - - /* Perform a send receive */ - account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); - top_window = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr ()); - modest_ui_actions_do_send_receive (account_name, FALSE, FALSE, TRUE, top_window); - } -} - static TnyAccount* create_tny_account (ModestTnyAccountStore *self, const gchar *name, @@ -1535,7 +1504,7 @@ create_tny_account (ModestTnyAccountStore *self, { TnyAccount *account = NULL; ModestTnyAccountStorePrivate *priv = NULL; - + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); account = modest_tny_account_new_from_account (priv->account_mgr, @@ -1549,18 +1518,6 @@ create_tny_account (ModestTnyAccountStore *self, we use a new account if any */ forget_password_in_memory (self, tny_account_get_id (account)); - /* Install a signal handler that will refresh the - account the first time it becomes online. Do this - only if we're adding a new account while the - program is running (we do not want to do this - allways) */ - if (type == TNY_ACCOUNT_TYPE_STORE && notify) - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, - G_OBJECT (account), - "connection_status_changed", - G_CALLBACK (connection_status_changed), - self); - /* Set the account store */ g_object_set_data (G_OBJECT(account), "account_store", self); } else { @@ -1753,15 +1710,6 @@ on_account_disconnect_when_removing (TnyCamelAccount *account, self = MODEST_TNY_ACCOUNT_STORE (user_data); priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); - /* Remove the connection-status-changed handler if it's still there */ - if (modest_signal_mgr_is_connected (priv->sighandlers, - G_OBJECT (account), - "connection_status_changed")) { - priv->sighandlers = modest_signal_mgr_disconnect (priv->sighandlers, - G_OBJECT (account), - "connection_status_changed"); - } - /* Cancel all pending operations */ tny_account_cancel (TNY_ACCOUNT (account)); @@ -2180,7 +2128,7 @@ account_shutdown (TnyAccount *account, ShutdownOpData *op_data) } -void +void modest_tny_account_store_shutdown (ModestTnyAccountStore *self, ModestTnyAccountStoreShutdownCallback callback, gpointer userdata) @@ -2190,8 +2138,12 @@ modest_tny_account_store_shutdown (ModestTnyAccountStore *self, ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); /* Get references */ - num_accounts = tny_list_get_length (priv->store_accounts) + - tny_list_get_length (priv->transport_accounts); + num_accounts = 0; + if (priv->store_accounts) + num_accounts += tny_list_get_length (priv->store_accounts); + if (priv->transport_accounts) + num_accounts += tny_list_get_length (priv->transport_accounts); + for (i = 0 ; i < num_accounts ; i++) g_object_ref (self); @@ -2206,7 +2158,7 @@ modest_tny_account_store_shutdown (ModestTnyAccountStore *self, if (priv->store_accounts) { tny_list_foreach (priv->store_accounts, (GFunc)account_shutdown, op_data); } - + if (priv->transport_accounts) { tny_list_foreach (priv->transport_accounts, (GFunc)account_shutdown, op_data); }