projects / modest / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0c22b6c)
* all:
authorDirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Wed, 21 Feb 2007 21:07:35 +0000 (21:07 +0000)
committerDirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Wed, 21 Feb 2007 21:07:35 +0000 (21:07 +0000)
- compile / -Wall fixes

pmo-trunk-r848

src/maemo/modest-account-assistant.c patch | blob | history
src/maemo/modest-msg-edit-window.c patch | blob | history
src/modest-defs.h patch | blob | history
src/widgets/modest-combo-box.c patch | blob | history
src/widgets/modest-folder-view.c patch | blob | history
tests/check_account-mgr.c patch | blob | history

diff --git a/src/maemo/modest-account-assistant.c b/src/maemo/modest-account-assistant.c
index d68b4bb..2dcca35 100644 (file)
--- a/src/maemo/modest-account-assistant.c
+++ b/src/maemo/modest-account-assistant.c
@@ -627,14 +627,16 @@ on_apply (ModestAccountAssistant *self, gpointer user_data)
        path       = modest_store_widget_get_path (store);
        store_name = get_new_server_account_name (priv->account_mgr, proto,username, servername);
 
        path       = modest_store_widget_get_path (store);
        store_name = get_new_server_account_name (priv->account_mgr, proto,username, servername);
 
-       if (proto == MODEST_PROTOCOL_STORE_MAILDIR ||
-           proto == MODEST_PROTOCOL_STORE_MBOX) {
-               gchar *uri = get_account_uri (proto, path);
+       if (proto            == MODEST_PROTOCOL_STORE_MAILDIR   ||
+           proto            == MODEST_PROTOCOL_STORE_MBOX) {
+               gchar   *uri  = get_account_uri (proto, path);
                modest_account_mgr_add_server_account_uri (priv->account_mgr, store_name, proto, uri);
                g_free (uri);
        } else
                modest_account_mgr_add_server_account (priv->account_mgr, store_name, servername,
                modest_account_mgr_add_server_account_uri (priv->account_mgr, store_name, proto, uri);
                g_free (uri);
        } else
                modest_account_mgr_add_server_account (priv->account_mgr, store_name, servername,
-                                                      username, NULL, proto);
+                                                      username, NULL, proto,
+                                                      MODEST_PROTOCOL_SECURITY_NONE,
+                                                      MODEST_PROTOCOL_AUTH_NONE); /* FIXME */
                
        /* create server account -> transport */
        transport = MODEST_TRANSPORT_WIDGET(priv->transport_widget);
                
        /* create server account -> transport */
        transport = MODEST_TRANSPORT_WIDGET(priv->transport_widget);
@@ -649,9 +651,11 @@ on_apply (ModestAccountAssistant *self, gpointer user_data)
        
        transport_name = get_new_server_account_name (priv->account_mgr, proto,username, servername);
        modest_account_mgr_add_server_account (priv->account_mgr,
        
        transport_name = get_new_server_account_name (priv->account_mgr, proto,username, servername);
        modest_account_mgr_add_server_account (priv->account_mgr,
-                                               transport_name, servername,
-                                               username, NULL,
-                                               proto);
+                                              transport_name,  servername,
+                                              username, NULL,
+                                              proto,
+                                              MODEST_PROTOCOL_SECURITY_NONE,
+                                              MODEST_PROTOCOL_AUTH_NONE); /* FIXME */
 
        /* create account */
        account_name = get_account_name (self);
 
        /* create account */
        account_name = get_account_name (self);
diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 7848ff4..8f5ef27 100644 (file)
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -277,6 +277,7 @@ menubar_to_menu (GtkUIManager *ui_manager)
 }
 
 
 }
 
 
+#if 0
 static void
 set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
 {
 static void
 set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
 {
@@ -316,7 +317,7 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
        
        /* TODO: set attachments */
 }
        
        /* TODO: set attachments */
 }
-
+#endif
 
        
 
 
        
 
diff --git a/src/modest-defs.h b/src/modest-defs.h
index 01c98a7..1a57444 100644 (file)
--- a/src/modest-defs.h
+++ b/src/modest-defs.h
@@ -59,10 +59,13 @@
 #define MODEST_CONF_REPLY_TYPE           MODEST_CONF_NAMESPACE "/reply_type"        /*  int  */
 #define MODEST_CONF_FORWARD_TYPE         MODEST_CONF_NAMESPACE "/forward_type"      /*  int  */
 
 #define MODEST_CONF_REPLY_TYPE           MODEST_CONF_NAMESPACE "/reply_type"        /*  int  */
 #define MODEST_CONF_FORWARD_TYPE         MODEST_CONF_NAMESPACE "/forward_type"      /*  int  */
 
-/* place for widget settings */
-#define MODEST_CONF_WIDGET_NAMESPACE     MODEST_CONF_NAMESPACE "/widgets"
+#define MODEST_CONF_SHOW_TOOLBAR         MODEST_CONF_NAMESPACE "/show_toolbar"      
+#define MODEST_CONF_SHOW_CC              MODEST_CONF_NAMESPACE "/show_cc"           
+#define MODEST_CONF_SHOW_BCC             MODEST_CONF_NAMESPACE "/show_bcc"           
 
 
 
 
+/* place for widget settings */
+#define MODEST_CONF_WIDGET_NAMESPACE     MODEST_CONF_NAMESPACE "/widgets"
 
 #define MODEST_SERVER_ACCOUNT_NAMESPACE  MODEST_CONF_NAMESPACE "/" "server_accounts"
 
 
 #define MODEST_SERVER_ACCOUNT_NAMESPACE  MODEST_CONF_NAMESPACE "/" "server_accounts"
 
diff --git a/src/widgets/modest-combo-box.c b/src/widgets/modest-combo-box.c
index 6020686..3e0fc0e 100644 (file)
--- a/src/widgets/modest-combo-box.c
+++ b/src/widgets/modest-combo-box.c
@@ -223,7 +223,7 @@ modest_combo_box_set_active_id (ModestComboBox *self, gpointer id)
        GtkTreeModel *model;
        GtkTreeIter iter;
        ModestComboBoxPrivate *priv;
        GtkTreeModel *model;
        GtkTreeIter iter;
        ModestComboBoxPrivate *priv;
-       gboolean found;
+       gboolean found = FALSE;
        
        g_return_if_fail (self);
 
        
        g_return_if_fail (self);
 
diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 563d313..215e868 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -1047,7 +1047,7 @@ on_drag_data_received (GtkWidget *widget,
                       gpointer data)
 {
        GtkWidget *source_widget;
                       gpointer data)
 {
        GtkWidget *source_widget;
-       GtkTreeModel *model_sort, *dest_model, *source_model;
+       GtkTreeModel *model_sort=NULL, *dest_model, *source_model; /* FIXME -- removing = NULL gives warn */
        GtkTreePath *source_row, *dest_row, *child_dest_row;
        GtkTreeViewDropPosition pos;
        gboolean success = FALSE, delete_source = FALSE;
        GtkTreePath *source_row, *dest_row, *child_dest_row;
        GtkTreeViewDropPosition pos;
        gboolean success = FALSE, delete_source = FALSE;
diff --git a/tests/check_account-mgr.c b/tests/check_account-mgr.c
index 25fc1cf..697d411 100644 (file)
--- a/tests/check_account-mgr.c
+++ b/tests/check_account-mgr.c
@@ -151,7 +151,9 @@ START_TEST (test_add_exists_remove_account_regular)
                                                        hostname,
                                                        username,
                                                        password,
                                                        hostname,
                                                        username,
                                                        password,
-                                                       proto);
+                                                       proto,
+                                                       MODEST_PROTOCOL_SECURITY_NONE,
+                                                       MODEST_PROTOCOL_AUTH_NONE); 
        fail_unless (result,
                     "modest_account_mgr_add_server_account failed:\n" \
                     "name: %s\nhostname: %s\nusername: %s\npassword: %s\nproto: %s",
        fail_unless (result,
                     "modest_account_mgr_add_server_account failed:\n" \
                     "name: %s\nhostname: %s\nusername: %s\npassword: %s\nproto: %s",
@@ -254,7 +256,9 @@ START_TEST (test_add_exists_remove_account_invalid)
                                                        "hostname",
                                                        "username",
                                                        "password",
                                                        "hostname",
                                                        "username",
                                                        "password",
-                                                       MODEST_PROTOCOL_STORE_IMAP);
+                                                       MODEST_PROTOCOL_STORE_IMAP,
+                                                      MODEST_PROTOCOL_SECURITY_NONE,
+                                                      MODEST_PROTOCOL_AUTH_NONE);
        fail_unless (!result,
                     "modest_account_mgr_add_server_account does not return " \
                     "FALSE when passing a NULL ModestAccountMgr");
        fail_unless (!result,
                     "modest_account_mgr_add_server_account does not return " \
                     "FALSE when passing a NULL ModestAccountMgr");
@@ -265,7 +269,9 @@ START_TEST (test_add_exists_remove_account_invalid)
                                                        "hostname",
                                                        "username",
                                                        "password",
                                                        "hostname",
                                                        "username",
                                                        "password",
-                                                       MODEST_PROTOCOL_STORE_IMAP);
+                                                       MODEST_PROTOCOL_STORE_IMAP,
+                                                       MODEST_PROTOCOL_SECURITY_NONE,
+                                                       MODEST_PROTOCOL_AUTH_NONE); 
        fail_unless (!result,
                     "modest_account_mgr_add_server_account does not return " \
                     "FALSE when passing a NULL account name");
        fail_unless (!result,
                     "modest_account_mgr_add_server_account does not return " \
                     "FALSE when passing a NULL account name");
@@ -276,7 +282,9 @@ START_TEST (test_add_exists_remove_account_invalid)
                                                        "hostname", 
                                                        "username", 
                                                        "password", 
                                                        "hostname", 
                                                        "username", 
                                                        "password", 
-                                                       MODEST_PROTOCOL_STORE_IMAP); 
+                                                       MODEST_PROTOCOL_STORE_IMAP,
+                                                       MODEST_PROTOCOL_SECURITY_NONE,
+                                                       MODEST_PROTOCOL_AUTH_NONE); 
        fail_unless (!result, 
                     "modest_account_mgr_add_server_account does not return " \
                     "FALSE when passing an invalid account name"); 
        fail_unless (!result, 
                     "modest_account_mgr_add_server_account does not return " \
                     "FALSE when passing an invalid account name"); 
"modest" is a lean & mean e-mail program.