* fixed some typos / comments

* add FIXMEs:
  - append the prompt to the emitted signal, so the password dialog shows the
    prompt supplied by the caller of this function.
  - handling of cancel event in password dialog

pmo-trunk-r74

diff --git a/src/gtk-glade/modest-ui.c b/src/gtk-glade/modest-ui.c
index e96defe..92a8cd4 100644 (file)
--- a/src/gtk-glade/modest-ui.c
+++ b/src/gtk-glade/modest-ui.c
@@ -447,7 +447,6 @@ on_password_requested (ModestTnyAccountStore *account_store,
        gint retval;
        const gchar *infostring=g_strconcat("Please enter the password for ", account_name, ".", NULL);
 
-
        passdialog = gtk_dialog_new_with_buttons("MyDialog",
                                                 NULL,
                                                 GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -478,7 +477,9 @@ on_password_requested (ModestTnyAccountStore *account_store,
                                                             NULL);
                break;
        case GTK_RESPONSE_CANCEL:
-               g_message("Dann halt nich!\n");
+               /* FIXME:
+                * What happens, if canceled?"
+                */
                break;
        }
 

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 21456ca..2da76db 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -207,7 +207,7 @@ get_password (TnyAccountIface *account, const gchar *prompt)
        ModestTnyAccountStorePrivate *priv;
        gchar *val;
 
-       g_message (__FUNCTION__);
+        g_message (__FUNCTION__);
 
        g_return_val_if_fail (account, NULL);
 
@@ -221,10 +221,13 @@ get_password (TnyAccountIface *account, const gchar *prompt)
                                                            MODEST_ACCOUNT_PASSWORD,
                                                            NULL);
        if (!val || strlen(val)==0)
-       {
-               g_message("Key vor Aufruf: %s", key);
-               /* g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0, key); */
-               g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0, key);
+        {
+                /* FIXME:
+                 * append the prompt to the emitted signal,
+                 * so the password dialog shows the prompt supplied by the caller of this function.
+                 */
+                g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0,
+                               key);
 
        }
 
@@ -464,7 +467,8 @@ modest_tny_account_store_get_transport_accounts (TnyAccountStoreIface *iface)
 }
 
 
-ModestAccountMgr *modest_tny_account_store_get_accout_mgr(ModestTnyAccountStore *self)
+ModestAccountMgr
+*modest_tny_account_store_get_accout_mgr(ModestTnyAccountStore *self)
 {
        ModestTnyAccountStorePrivate *priv;
        g_return_val_if_fail (self, NULL);