2007-05-09 Murray Cumming <murrayc@murrayc.com>

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

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index ed80eeb..d57b6f1 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -46,11 +46,13 @@
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkmain.h>
 #include <string.h>
+
+static osso_context_t *osso_context = NULL;
        
 gboolean
 modest_platform_init (void)
 {      
-       osso_context_t *osso_context =
+       osso_context =
                osso_initialize(PACKAGE, PACKAGE_VERSION,
                                TRUE, NULL);    
        if (!osso_context) {
@@ -193,6 +195,32 @@ modest_platform_activate_uri (const gchar *uri)
        return result;
 }
 
+gboolean 
+modest_platform_activate_file (const gchar *path)
+{
+       gint result;
+       DBusConnection *con;
+       gchar *uri_path = NULL;
+
+       uri_path = g_strconcat ("file://", path, NULL);
+       
+       con = osso_get_dbus_connection (osso_context);
+#ifdef MODEST_HILDON_VERSION_0
+       result = osso_mime_open_file (con, uri_path);
+
+       if (result != 1)
+               hildon_banner_show_information (NULL, NULL, _("mcen_ni_noregistered_viewer"));
+       return result != 1;
+#else
+       result = hildon_mime_open_file (con, uri_path);
+
+       if (result != 1)
+               hildon_banner_show_information (NULL, NULL, _("mcen_ni_noregistered_viewer"));
+       return result != 1;
+#endif
+
+}
+
 typedef struct  {
        GSList * actions;
        gchar *uri;
@@ -311,8 +339,8 @@ GdkPixbuf*
 modest_platform_get_icon (const gchar *name)
 {
        GError *err = NULL;
-       GdkPixbuf* pixbuf;
-       GtkIconTheme *current_theme;
+       GdkPixbuf* pixbuf = NULL;
+       GtkIconTheme *current_theme = NULL;
 
        g_return_val_if_fail (name, NULL);
 
@@ -419,6 +447,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
        GList *tmp = NULL;
        GtkSortType sort_type;
        gint sort_key;
+       gint default_key = 0;
        gint result;
        
        /* Get header window */
@@ -476,19 +505,24 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
                        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:
-                       return;
+                       g_printerr ("modest: column (id: %i) not valid", col_id);
+                       goto frees;
                }
        }
        
        /* Launch dialogs */
+       hildon_sort_dialog_set_sort_key (dialog, default_key);
+       hildon_sort_dialog_set_sort_order (dialog, GTK_SORT_DESCENDING);
        result = gtk_dialog_run (GTK_DIALOG (dialog));
        if (result == GTK_RESPONSE_OK) {
                sort_key = hildon_sort_dialog_get_sort_key (dialog);
@@ -505,6 +539,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
        }
        
        /* free */
+ frees:
        g_list_free(cols);      
 }
 
@@ -695,6 +730,10 @@ gboolean modest_platform_set_update_interval (guint minutes)
        event.dbus_interface = g_strdup (MODEST_DBUS_IFACE);
        event.dbus_service = g_strdup (MODEST_DBUS_SERVICE);
        event.dbus_name = g_strdup (MODEST_DBUS_METHOD_SEND_RECEIVE);
+
+       /* Otherwise, a dialog will be shown if exect_name or dbus_path is NULL,
+       even though we have specified no dialog text: */
+       event.flags = ALARM_EVENT_NO_DIALOG;
        
        alarm_cookie = alarm_event_add (&event);