X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-platform.c;h=cc30e487a948c5d39b4202790c3d311ab3957fe3;hp=d16e0c0c099d2985fbb74bf7b59d02e751efb3e0;hb=9d8de13bc46137931a2790969dcb1fb932c7bcc6;hpb=18a79c74494767726e55fc1234dd9489e8f7268b diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c index d16e0c0..cc30e48 100644 --- a/src/maemo/modest-platform.c +++ b/src/maemo/modest-platform.c @@ -36,7 +36,7 @@ #include "maemo/modest-maemo-global-settings-dialog.h" #include - +#include #include #include #include @@ -48,12 +48,25 @@ #include #include + 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; } @@ -137,7 +171,7 @@ guess_mime_type_from_name (const gchar* name) return octet_stream; for (i = 0; i != G_N_ELEMENTS(mime_map); ++i) { - if (g_ascii_strcasecmp (mime_map[i][0], ext + 1)) /* +1: ignore '.'*/ + if (!g_ascii_strcasecmp (mime_map[i][0], ext + 1)) /* +1: ignore '.'*/ return mime_map[i][1]; } return octet_stream; @@ -155,7 +189,7 @@ modest_platform_get_file_icon_name (const gchar* name, const gchar* mime_type, g_return_val_if_fail (name || mime_type, NULL); - if (!mime_type || g_ascii_strcasecmp (mime_type, "application/octet-stream")) + if (!mime_type || !g_ascii_strcasecmp (mime_type, "application/octet-stream")) mime_str = g_string_new (guess_mime_type_from_name(name)); else { mime_str = g_string_new (mime_type); @@ -199,23 +233,33 @@ modest_platform_activate_uri (const gchar *uri) } gboolean -modest_platform_activate_file (const gchar *path) +modest_platform_activate_file (const gchar *path, const gchar *mime_type) { gint result; DBusConnection *con; gchar *uri_path = NULL; + GString *mime_str = NULL; + + if (!mime_type || !g_ascii_strcasecmp (mime_type, "application/octet-stream")) + mime_str = g_string_new (guess_mime_type_from_name(path)); + else { + mime_str = g_string_new (mime_type); + g_string_ascii_down (mime_str); + } 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); + result = osso_mime_open_file_with_mime_type (con, uri_path, mime_str->str); + g_string_free (mime_str, TRUE); 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); + result = hildon_mime_open_file_with_mime_type (con, uri_path, mime_str->str); + g_string_free (mime_str, TRUE); if (result != 1) hildon_banner_show_information (NULL, NULL, _("mcen_ni_noregistered_viewer")); @@ -447,11 +491,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 +507,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 +558,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); } @@ -627,19 +659,9 @@ modest_platform_run_confirmation_dialog (GtkWindow *parent_window, void modest_platform_run_information_dialog (GtkWindow *parent_window, - ModestInformationDialogType type) + const gchar *message) { GtkWidget *dialog; - gchar *message = NULL; - - switch (type) { - case MODEST_INFORMATION_CREATE_FOLDER: - message = _("mail_in_ui_folder_create_error"); - break; - case MODEST_INFORMATION_DELETE_FOLDER: - message = _("mail_in_ui_folder_delete_error"); - break; - }; dialog = hildon_note_new_information (parent_window, message); @@ -655,12 +677,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 @@ -774,3 +792,51 @@ 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); + } +} + +void +modest_platform_show_search_messages (GtkWindow *parent_window) +{ + osso_return_t result = OSSO_ERROR; + + result = osso_rpc_run_with_defaults (osso_context, "osso_global_search", "search_email", NULL, DBUS_TYPE_INVALID); + + if (result != OSSO_OK) { + /* TODO: warning about error showing dialog */ + } +}