* don't accept certificate when user clicked cancel

[modest] / src / maemo / modest-platform.c

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index 576a2cb..614aa13 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -38,7 +38,6 @@
 #include <modest-hildon-includes.h>
 #include <modest-maemo-utils.h>
 #include <dbus_api/modest-dbus-callbacks.h>
 #include <modest-hildon-includes.h>
 #include <modest-maemo-utils.h>
 #include <dbus_api/modest-dbus-callbacks.h>

-#include <libosso-abook/osso-abook.h>

 #include <maemo/modest-osso-autosave-callbacks.h>
 #include <libosso.h>
 #include <alarmd/alarm_event.h> /* For alarm_event_add(), etc. */
 #include <maemo/modest-osso-autosave-callbacks.h>
 #include <libosso.h>
 #include <alarmd/alarm_event.h> /* For alarm_event_add(), etc. */

@@ -55,6 +54,10 @@
 #include <string.h>
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
 
 #include <string.h>
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
 

+#ifdef MODEST_HAVE_ABOOK
+#include <libosso-abook/osso-abook.h>
+#endif /*MODEST_HAVE_ABOOK*/
+

 
 #define HILDON_OSSO_URI_ACTION "uri-action"
 #define URI_ACTION_COPY "copy:"
 
 #define HILDON_OSSO_URI_ACTION "uri-action"
 #define URI_ACTION_COPY "copy:"

@@ -199,12 +202,16 @@ modest_platform_init (int argc, char *argv[])
                modest_account_mgr_free_account_names (acc_names);
        }
 
                modest_account_mgr_free_account_names (acc_names);
        }
 

+       
+#ifdef MODEST_HAVE_ABOOK

        /* initialize the addressbook */
        if (!osso_abook_init (&argc, &argv, osso_context)) {
                g_printerr ("modest: failed to initialized addressbook\n");
                return FALSE;
        }
        /* initialize the addressbook */
        if (!osso_abook_init (&argc, &argv, osso_context)) {
                g_printerr ("modest: failed to initialized addressbook\n");
                return FALSE;
        }

-               
+#endif /*MODEST_HAVE_ABOOK*/
+
+

        return TRUE;
 }
 
        return TRUE;
 }
 

@@ -607,7 +614,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
 
        sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_priority"));
        sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN;
 
        sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_priority"));
        sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN;

-       sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY;
+       sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY_MASK;

        priority_sort_id = sort_key;
 
        sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)))));
        priority_sort_id = sort_key;
 
        sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)))));

@@ -621,7 +628,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
                if (current_sort_colid == TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN) {
                        gpointer flags_sort_type_pointer;
                        flags_sort_type_pointer = g_object_get_data (G_OBJECT (cols->data), MODEST_HEADER_VIEW_FLAG_SORT);
                if (current_sort_colid == TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN) {
                        gpointer flags_sort_type_pointer;
                        flags_sort_type_pointer = g_object_get_data (G_OBJECT (cols->data), MODEST_HEADER_VIEW_FLAG_SORT);

-                       if (GPOINTER_TO_INT (flags_sort_type_pointer) == TNY_HEADER_FLAG_PRIORITY)
+                       if (GPOINTER_TO_INT (flags_sort_type_pointer) == TNY_HEADER_FLAG_PRIORITY_MASK)

                                hildon_sort_dialog_set_sort_key (dialog, priority_sort_id);
                        else
                                hildon_sort_dialog_set_sort_key (dialog, attachments_sort_id);
                                hildon_sort_dialog_set_sort_key (dialog, priority_sort_id);
                        else
                                hildon_sort_dialog_set_sort_key (dialog, attachments_sort_id);

@@ -1625,7 +1632,7 @@ on_cert_dialog_response (GtkDialog *dialog, gint response_id,  const gchar* cert
 
 
 gboolean
 
 
 gboolean

-modest_platform_run_certificate_conformation_dialog (const gchar* server_name,
+modest_platform_run_certificate_confirmation_dialog (const gchar* server_name,

                                                     const gchar *certificate)
 {
        GtkWidget *note;
                                                     const gchar *certificate)
 {
        GtkWidget *note;

@@ -1655,7 +1662,7 @@ modest_platform_run_certificate_conformation_dialog (const gchar* server_name,
        on_destroy_dialog (GTK_DIALOG(note));
        g_free (question);
        
        on_destroy_dialog (GTK_DIALOG(note));
        g_free (question);
        

-       return response;
+       return response == GTK_RESPONSE_OK;

 }
        
 
 }