* Removed some comments

	* Removed a function that was only emitting a signal

pmo-trunk-r3829

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 1c3021b..5edaf83 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -216,15 +216,6 @@ modest_tny_account_store_base_init (gpointer g_class)
                                      NULL, NULL,
                                      g_cclosure_marshal_VOID__OBJECT,
                                      G_TYPE_NONE, 1, TNY_TYPE_ACCOUNT);
-               
-/*             signals[TNY_ACCOUNT_STORE_CONNECTING_FINISHED] = */
-/*                     g_signal_new ("connecting_finished", */
-/*                                   TNY_TYPE_ACCOUNT_STORE, */
-/*                                   G_SIGNAL_RUN_FIRST, */
-/*                                   G_STRUCT_OFFSET (TnyAccountStoreIface, connecting_finished), */
-/*                                   NULL, NULL, */
-/*                                   g_cclosure_marshal_VOID__VOID,  */
-/*                                   G_TYPE_NONE, 0); */
 
                signals[PASSWORD_REQUESTED_SIGNAL] =
                        g_signal_new ("password_requested",
@@ -602,20 +593,6 @@ show_wrong_password_dialog (TnyAccount *account)
 }
 #endif
 
-
-static void
-request_password_and_wait (ModestTnyAccountStore *account_store, 
-                                        const gchar* server_account_id,
-                                        gchar **username,
-                                        gchar **password,
-                                        gboolean *cancel, 
-                                        gboolean *remember)
-{
-       g_signal_emit (G_OBJECT(account_store), signals[PASSWORD_REQUESTED_SIGNAL], 0,
-                      server_account_id, /* server_account_name */
-                      username, password, cancel, remember);
-}
-
 /* 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,
@@ -715,9 +692,12 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
                        /* Show an info banner, before we show the protected password dialog: */
                        show_password_warning_only();
                }
-               
-               request_password_and_wait (self, account_id, 
+
+               /* Request password */
+               g_signal_emit (G_OBJECT(account_store), signals[PASSWORD_REQUESTED_SIGNAL], 0,
+                              account_id, /* server_account_name */
                               &username, &pwd, cancel, &remember);
+
                
                if (!*cancel) {
                        /* The password will be returned as the result,

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 7cf832d..e2b1e71 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -2403,10 +2403,6 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
        }
        
        /* Get the currently-active transport account for this modest account: */
-/*     TnyTransportAccount *transport_account = */
-/*             TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_transport_account_for_open_connection */
-/*                                   (modest_runtime_get_account_store(), */
-/*                                    account_name)); */
        if (strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) != 0) {
                transport_account = TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account
                                                          (modest_runtime_get_account_store(),