2007-06-05 Murray Cumming <murrayc@murrayc.com>modest/trunk] > more ChangeLog2
[modest] / src / maemo / modest-platform.c
index 88a5edf..4a6a6a3 100644 (file)
@@ -36,7 +36,7 @@
 #include "maemo/modest-maemo-global-settings-dialog.h"
 
 #include <modest-hildon-includes.h>
-
+#include <osso-helplib.h>
 #include <dbus_api/modest-dbus-callbacks.h>
 #include <maemo/modest-osso-autosave-callbacks.h>
 #include <libosso.h>
 #include <gtk/gtkmain.h>
 #include <string.h>
 
+
 static osso_context_t *osso_context = NULL;
        
+static void    
+on_modest_conf_update_interval_changed (ModestConf* self, const gchar *key, 
+       ModestConfEvent event, gpointer user_data)
+{
+       if (strcmp (key, MODEST_CONF_UPDATE_INTERVAL) == 0) {
+               const guint update_interval_minutes = 
+                       modest_conf_get_int (self, MODEST_CONF_UPDATE_INTERVAL, NULL);
+               modest_platform_set_update_interval (update_interval_minutes);
+       }
+}
+
 gboolean
 modest_platform_init (void)
 {
-       osso_hw_state_t hw_state = { 0 };       
+       osso_hw_state_t hw_state = { 0 };
+       DBusConnection *con;    
        osso_context =
                osso_initialize(PACKAGE,PACKAGE_VERSION,
                                FALSE, NULL);   
@@ -62,6 +75,21 @@ modest_platform_init (void)
                return FALSE;
        }
 
+       if ((con = osso_get_dbus_connection (osso_context)) == NULL) {
+               g_printerr ("Could not get dbus connection\n");
+               return FALSE;
+
+       }
+
+       if (!dbus_connection_add_filter (con,
+                                        modest_dbus_req_filter,
+                                        NULL,
+                                        NULL)) {
+
+               g_printerr ("Could not add dbus filter\n");
+               return FALSE;
+       }
+
        /* Register our D-Bus callbacks, via the osso API: */
        osso_return_t result = osso_rpc_set_cb_f(osso_context, 
                                MODEST_DBUS_SERVICE, 
@@ -95,12 +123,18 @@ modest_platform_init (void)
                g_warning ("osso_application_set_autosave_cb() failed.");       
        }
        
-       
-       /* TODO: Get the actual update interval from gconf, 
-        * when that preferences dialog has been implemented.
-        * And make sure that this is called again whenever that is changed. */
-       const guint update_interval_minutes = 15;
-       modest_platform_set_update_interval (update_interval_minutes);
+
+       /* Make sure that the update interval is changed whenever its gconf key 
+        * is changed: */
+       ModestConf *conf = modest_runtime_get_conf ();
+       g_signal_connect (G_OBJECT(conf),
+                         "key_changed",
+                         G_CALLBACK (on_modest_conf_update_interval_changed), 
+                         NULL);
+                         
+       /* Get the initial update interval from gconf: */
+       on_modest_conf_update_interval_changed(conf, MODEST_CONF_UPDATE_INTERVAL,
+               MODEST_CONF_EVENT_KEY_CHANGED, NULL);
        
        return TRUE;
 }
@@ -447,11 +481,11 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
 {
        ModestHeaderView *header_view = NULL;
        GList *cols = NULL;
-       GList *tmp = NULL;
        GtkSortType sort_type;
        gint sort_key;
        gint default_key = 0;
        gint result;
+       gboolean outgoing = FALSE;
        
        /* Get header window */
        if (MODEST_IS_MAIN_WINDOW (parent_window)) {
@@ -463,66 +497,50 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
        /* Add sorting keys */
        cols = modest_header_view_get_columns (header_view);    
        if (cols == NULL) return;
-       int num_cols = g_list_length(cols);
-       int sort_ids[num_cols];
-       int sort_model_ids[num_cols];
-       GtkTreeViewColumn *sort_cols[num_cols];
-       for (tmp=cols; tmp; tmp=tmp->next) {
-               gint col_id = GPOINTER_TO_INT (g_object_get_data(G_OBJECT(tmp->data), MODEST_HEADER_VIEW_COLUMN));
-               switch (col_id) {
-               case MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG:
-                       sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_attachment"));
-                       sort_ids[sort_key] = col_id;
-                       sort_model_ids[sort_key] = TNY_HEADER_FLAG_ATTACHMENTS;
-                       sort_cols[sort_key] = tmp->data;
-
-                       sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_priority"));
-                       sort_ids[sort_key] = col_id;
-                       sort_model_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY;
-                       sort_cols[sort_key] = tmp->data;
-                       break;
-               case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT:
-                       sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_sender_recipient"));
-                       sort_ids[sort_key] = col_id;
-                       sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN;
-                       sort_cols[sort_key] = tmp->data;
-
-                       sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_subject"));
-                       sort_ids[sort_key] = col_id;
-                       sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN;
-                       sort_cols[sort_key] = tmp->data;
-                       break;
-               case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN:
-                       sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_sender_recipient"));
-                       sort_ids[sort_key] = col_id;
-                       sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN;
-                       sort_cols[sort_key] = tmp->data;
-
-                       sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_subject"));
-                       sort_ids[sort_key] = col_id;
-                       sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN;
-                       sort_cols[sort_key] = tmp->data;
-                       break;
-               case MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE:
-                       sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_date"));
-                       sort_ids[sort_key] = col_id;
-                       sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
-                       sort_cols[sort_key] = tmp->data;
-                       default_key = sort_key;
-                       break;
-               case MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE:
-                       sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_date"));
-                       sort_ids[sort_key] = col_id;
-                       sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
-                       sort_cols[sort_key] = tmp->data;
-                       default_key = sort_key;
-                       break;
-               default:
-                       g_printerr ("modest: column (id: %i) not valid", col_id);
-                       goto frees;
-               }
+       int sort_model_ids[6];
+       int sort_ids[6];
+
+       outgoing = (GPOINTER_TO_INT (g_object_get_data(G_OBJECT(cols->data), MODEST_HEADER_VIEW_COLUMN))==
+                   MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT);
+
+       sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_sender_recipient"));
+       if (outgoing) {
+               sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN;
+               sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT;
+       } else {
+               sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN;
+               sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN;
        }
-       
+
+       sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_date"));
+       if (outgoing) {
+               sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN;
+               sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE;
+       } else {
+               sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN;
+               sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE;
+       }
+       default_key = sort_key;
+
+       sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_subject"));
+       sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN;
+       if (outgoing)
+               sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT;
+       else
+               sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN;
+
+       sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_attachment"));
+       sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN;
+       sort_ids[sort_key] = TNY_HEADER_FLAG_ATTACHMENTS;
+
+       sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_size"));
+       sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN;
+       sort_ids[sort_key] = 0;
+
+       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;
+
        /* Launch dialogs */
        hildon_sort_dialog_set_sort_key (dialog, default_key);
        hildon_sort_dialog_set_sort_order (dialog, GTK_SORT_DESCENDING);
@@ -530,19 +548,23 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
        if (result == GTK_RESPONSE_OK) {
                sort_key = hildon_sort_dialog_get_sort_key (dialog);
                sort_type = hildon_sort_dialog_get_sort_order (dialog);
-               if (sort_ids[sort_key] == MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG)
-                       g_object_set_data(G_OBJECT(sort_cols[sort_key]), 
-                                         MODEST_HEADER_VIEW_FLAG_SORT, 
-                                         GINT_TO_POINTER(sort_model_ids[sort_key]));
-               
-               else
-                       gtk_tree_view_column_set_sort_column_id (sort_cols[sort_key], sort_model_ids[sort_key]);
-               
-               modest_header_view_sort_by_column_id (header_view, sort_ids[sort_key], sort_type);
+               if (sort_model_ids[sort_key] == TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN) {
+                       g_object_set_data (G_OBJECT(cols->data), MODEST_HEADER_VIEW_FLAG_SORT,
+                                          GINT_TO_POINTER (sort_ids[sort_key]));
+                       /* This is a hack to make it resort rows always when flag fields are
+                        * selected. If we do not do this, changing sort field from priority to
+                        * attachments does not work */
+                       modest_header_view_sort_by_column_id (header_view, 0, sort_type);
+               } else {
+                       gtk_tree_view_column_set_sort_column_id (GTK_TREE_VIEW_COLUMN (cols->data), 
+                                                                sort_model_ids[sort_key]);
+               }
+
+               modest_header_view_sort_by_column_id (header_view, sort_model_ids[sort_key], sort_type);
+               gtk_tree_sortable_sort_column_changed (GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view))));
        }
        
        /* free */
- frees:
        g_list_free(cols);      
 }
 
@@ -645,12 +667,8 @@ gboolean modest_platform_connect_and_wait (GtkWindow *parent_window)
        if (tny_device_is_online (device))
                return TRUE;
                
-       /* TODO: Block on the result: */
-       gboolean request_sent = tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device), NULL);
-       if (!request_sent)
-               return FALSE;
-
-       return TRUE;
+       /* This blocks on the result: */
+       return tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device), NULL);
 }
 
 void
@@ -764,3 +782,39 @@ modest_platform_get_global_settings_dialog ()
 {
        return modest_maemo_global_settings_dialog_new ();
 }
+
+void 
+modest_platform_on_new_msg (void)
+{
+       /* TODO: play sound SR-SND-18 */
+       /* TODO: LED lightning pattern */
+       /* TODO: update the application icon in the task navigator */ 
+       g_print ("--------------- NEW MESSAGE ARRIVED ---------------\n");
+}
+
+
+void
+modest_platform_show_help (GtkWindow *parent_window, 
+                          const gchar *help_id)
+{
+       osso_return_t result;
+
+       g_return_if_fail (help_id);
+       g_return_if_fail (osso_context);
+
+       /* Show help */
+#ifdef MODEST_HILDON_VERSION_0
+       result = ossohelp_show (osso_context, help_id, OSSO_HELP_SHOW_DIALOG);
+#else
+       result = hildon_help_show (osso_context, help_id, OSSO_HELP_SHOW_DIALOG);
+#endif
+
+       if (result != OSSO_OK) {
+               gchar *error_msg;
+               error_msg = g_strdup_printf ("FIXME The help topic %s could not be found", help_id); 
+               hildon_banner_show_information (GTK_WIDGET (parent_window),
+                                               NULL,
+                                               error_msg);
+               g_free (error_msg);
+       }
+}