* code cleanups (removing unused variables)

* tinymail API update for get_passowrd_func
* code formatting cleanup

pmo-trunk-r198

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index dcceba2..549a7c6 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -213,7 +213,7 @@ modest_tny_account_store_new (ModestAccountMgr *modest_acc_mgr)
 
 
 static gchar*
-get_password (TnyAccountIface *account, const gchar *prompt)
+get_password (TnyAccountIface *account, const gchar *prompt, gboolean *cancel)
 {
        const gchar *key;
        const TnyAccountStoreIface *account_store;
@@ -230,20 +230,16 @@ get_password (TnyAccountIface *account, const gchar *prompt)
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
 
        val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key,
-                                                           MODEST_ACCOUNT_PASSWORD,
-                                                            NULL);
-       if (!val)
-        {
-                /* 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);
-
+                                                                                               MODEST_ACCOUNT_PASSWORD, NULL);
+       if (!val) {
+               /* 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);
        }
 
-        return val;
+       return val;
 }
 
 
@@ -289,7 +285,6 @@ add_account  (TnyAccountStoreIface *self, TnyAccountIface *account)
 }
 
 
-
 static void
 modest_tny_account_store_add_store_account  (TnyAccountStoreIface *self,
                                             TnyStoreAccountIface *account)
@@ -299,7 +294,6 @@ modest_tny_account_store_add_store_account  (TnyAccountStoreIface *self,
 }
 
 
-
 static void
 modest_tny_account_store_add_transport_account  (TnyAccountStoreIface *self,
                                                 TnyTransportAccountIface *account)
@@ -309,7 +303,6 @@ modest_tny_account_store_add_transport_account  (TnyAccountStoreIface *self,
 }
 
 
-
 static TnyAccountIface*
 tny_account_from_key (ModestTnyAccountStore *self, const gchar *key,
                      gboolean is_store)
@@ -406,7 +399,6 @@ tny_accounts_from_server_accounts (ModestTnyAccountStore *self, GSList *accounts
 }
 
 
-
 static const GList*
 modest_tny_account_store_get_store_accounts  (TnyAccountStoreIface *iface)
 {
@@ -440,7 +432,6 @@ modest_tny_account_store_get_store_accounts  (TnyAccountStoreIface *iface)
 }
 
 
-
 static const GList*
 modest_tny_account_store_get_transport_accounts (TnyAccountStoreIface *iface)
 {
@@ -487,7 +478,6 @@ ModestAccountMgr
 }
 
 
-
 TnySessionCamel*
 tny_account_store_get_session (TnyAccountStore *self)
 {
@@ -500,7 +490,6 @@ tny_account_store_get_session (TnyAccountStore *self)
 }
 
 
-
 /**
  * modest_tny_account_store_get_cache_dir:
  * @self: self a TnyAccountStoreIface instance
@@ -526,7 +515,6 @@ modest_tny_account_store_get_cache_dir (TnyAccountStoreIface *self)
 }
 
 
-
 static const TnyDeviceIface*
 modest_tny_account_store_get_device (TnyAccountStoreIface *self)
 {
@@ -538,7 +526,6 @@ modest_tny_account_store_get_device (TnyAccountStoreIface *self)
 }
 
 
-
 static void
 modest_tny_account_store_iface_init (gpointer g_iface, gpointer iface_data)
 {
@@ -548,17 +535,16 @@ modest_tny_account_store_iface_init (gpointer g_iface, gpointer iface_data)
 
        klass = (TnyAccountStoreIfaceClass *)g_iface;
 
-        klass->add_store_account_func      =
+       klass->add_store_account_func      =
                modest_tny_account_store_add_store_account;
-        klass->get_store_accounts_func     =
+       klass->get_store_accounts_func     =
                modest_tny_account_store_get_store_accounts;
-        klass->add_transport_account_func  =
+       klass->add_transport_account_func  =
                modest_tny_account_store_add_transport_account;
-        klass->get_transport_accounts_func =
+       klass->get_transport_accounts_func =
                modest_tny_account_store_get_transport_accounts;
        klass->get_cache_dir_func =
                modest_tny_account_store_get_cache_dir;
        klass->get_device_func =
                modest_tny_account_store_get_device;
-
 }

diff --git a/src/modest-tny-header-tree-view.c b/src/modest-tny-header-tree-view.c
index d7c56c4..c2aaa82 100644 (file)
--- a/src/modest-tny-header-tree-view.c
+++ b/src/modest-tny-header-tree-view.c
@@ -296,7 +296,7 @@ remove_all_columns (ModestTnyHeaderTreeView *obj)
 static void
 init_columns (ModestTnyHeaderTreeView *obj)
 {
-       GtkTreeViewColumn *column;
+       GtkTreeViewColumn *column=NULL;
        GtkCellRenderer *renderer_msgtype,
                *renderer_header,
                *renderer_attach;
@@ -721,7 +721,7 @@ selection_changed (GtkTreeSelection *sel, gpointer user_data)
                            &header, -1);
        
        if (header) {
-               const TnyMsgIface *msg;
+               const TnyMsgIface *msg = NULL;
                const TnyMsgFolderIface *folder;
                
                folder = tny_msg_header_iface_get_folder (TNY_MSG_HEADER_IFACE(header));

diff --git a/src/modest-tny-msg-view.c b/src/modest-tny-msg-view.c
index c6b4e63..0f5262c 100644 (file)
--- a/src/modest-tny-msg-view.c
+++ b/src/modest-tny-msg-view.c
@@ -12,6 +12,7 @@
 #include <ctype.h>
 #include <glib/gi18n.h>
 #include <gtkhtml/gtkhtml.h>
+#include <gtkhtml/gtkhtml-stream.h>
 
 /* 'private'/'protected' functions */
 static void     modest_tny_msg_view_class_init   (ModestTnyMsgViewClass *klass);

diff --git a/src/modest-tny-store-actions.c b/src/modest-tny-store-actions.c
index ad8826a..870bbfc 100644 (file)
--- a/src/modest-tny-store-actions.c
+++ b/src/modest-tny-store-actions.c
@@ -52,10 +52,11 @@ void
 modest_tny_store_actions_update_folders (ModestTnyStoreActions *self,
                                           TnyStoreAccountIface *storage_account)
 {
+#if 0
        const TnyListIface* folders;
        TnyIteratorIface* ifolders;
        gpointer *cur_folder;
-#if 0  
+
        folders = tny_store_account_iface_get_folders (storage_account, 
                                                                                                  TNY_STORE_ACCOUNT_FOLDER_TYPE_SUBSCRIBED);
        
@@ -136,4 +137,3 @@ modest_tny_store_actions_new (void)
 {
        return G_OBJECT(g_object_new(MODEST_TYPE_TNY_STORE_ACTIONS, NULL));
 }
-