X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-platform.c;h=01a8f96f1994f99533217e822ba5a9af495e76bf;hp=85c2833384a4fbf212d036ff8787bbdb687eed52;hb=839a44d74460225883a7f8e9f718c5cae4928ed9;hpb=964fa297ed3f4e25f31b46cd8e12235201684f2c diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c index 85c2833..01a8f96 100644 --- a/src/maemo/modest-platform.c +++ b/src/maemo/modest-platform.c @@ -241,7 +241,7 @@ modest_platform_activate_uri (const gchar *uri) for (iter = actions; iter; iter = g_slist_next (iter)) { action = (OssoURIAction*) iter->data; - if (action && strcmp (hildon_uri_action_get_service (action), "com.nokia.modest") == 0) { + if (action && strcmp (osso_uri_action_get_name (action), "uri_link_compose_email") == 0) { GError *err = NULL; result = osso_uri_open (uri, action, &err); if (!result && err) { @@ -258,7 +258,7 @@ modest_platform_activate_uri (const gchar *uri) return result; } -#else /* MODEST_HILDON_VERSION_0*/ +#else /* !MODEST_HILDON_VERSION_0*/ gboolean @@ -427,11 +427,13 @@ modest_platform_show_uri_popup (const gchar *uri) for (node = actions_list; node != NULL; node = g_slist_next (node)) { GtkWidget *menu_item; - const gchar* action_name; + const gchar *action_name; + const gchar *translation_domain; #ifdef MODEST_HILDON_VERSION_0 OssoURIAction *action = (OssoURIAction *) node->data; - action_name = osso_uri_action_get_name (action); - menu_item = gtk_menu_item_new_with_label (dgettext("osso-uri",action_name)); + action_name = osso_uri_action_get_name (action); + translation_domain = osso_uri_action_get_translation_domain (action); + menu_item = gtk_menu_item_new_with_label (dgettext(translation_domain,action_name)); g_object_set_data (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION, (gpointer)action_name); /* hack, we add it as a gobject property*/ g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item), @@ -445,7 +447,8 @@ modest_platform_show_uri_popup (const gchar *uri) #else HildonURIAction *action = (HildonURIAction *) node->data; action_name = hildon_uri_action_get_name (action); - menu_item = gtk_menu_item_new_with_label (dgettext("osso-uri", action_name)); + translation_domain = hildon_uri_action_get_translation_domain (action); + menu_item = gtk_menu_item_new_with_label (dgettext(translation_domain, action_name)); g_object_set_data (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION, (gpointer)action_name); /* hack */ g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item), popup_info); @@ -596,6 +599,11 @@ launch_sort_headers_dialog (GtkWindow *parent_window, gint default_key = 0; gint result; gboolean outgoing = FALSE; + gint current_sort_colid = -1; + GtkSortType current_sort_type; + gint attachments_sort_id; + gint priority_sort_id; + GtkTreeSortable *sortable; /* Get header window */ if (MODEST_IS_MAIN_WINDOW (parent_window)) { @@ -605,11 +613,12 @@ launch_sort_headers_dialog (GtkWindow *parent_window, if (!header_view) return; /* Add sorting keys */ - cols = modest_header_view_get_columns (header_view); + cols = modest_header_view_get_columns (header_view); if (cols == NULL) return; 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); @@ -642,6 +651,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window, 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; + attachments_sort_id = sort_key; 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; @@ -650,10 +660,34 @@ 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_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY; + 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))))); /* Launch dialogs */ - hildon_sort_dialog_set_sort_key (dialog, default_key); - hildon_sort_dialog_set_sort_order (dialog, GTK_SORT_DESCENDING); + if (!gtk_tree_sortable_get_sort_column_id (sortable, + ¤t_sort_colid, ¤t_sort_type)) { + hildon_sort_dialog_set_sort_key (dialog, default_key); + hildon_sort_dialog_set_sort_order (dialog, GTK_SORT_DESCENDING); + } else { + hildon_sort_dialog_set_sort_order (dialog, current_sort_type); + 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) + hildon_sort_dialog_set_sort_key (dialog, priority_sort_id); + else + hildon_sort_dialog_set_sort_key (dialog, attachments_sort_id); + } else { + gint current_sort_keyid = 0; + while (current_sort_keyid < 6) { + if (sort_model_ids[current_sort_keyid] == current_sort_colid) + break; + else + current_sort_keyid++; + } + hildon_sort_dialog_set_sort_key (dialog, current_sort_keyid); + } + } result = gtk_dialog_run (GTK_DIALOG (dialog)); if (result == GTK_RESPONSE_OK) { sort_key = hildon_sort_dialog_get_sort_key (dialog); @@ -671,8 +705,11 @@ launch_sort_headers_dialog (GtkWindow *parent_window, } 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)))); + gtk_tree_sortable_sort_column_changed (sortable); } + + modest_widget_memory_save (modest_runtime_get_conf (), + G_OBJECT (header_view), MODEST_CONF_HEADER_VIEW_KEY); /* free */ g_list_free(cols); @@ -896,30 +933,27 @@ modest_platform_get_global_settings_dialog () void modest_platform_on_new_msg (void) { - return; /* TODO: Reenable this later. I disabled it to avoid having one notification per email. */ -#ifndef MODEST_HILDON_VERSION_0 - HildonNotification *not; - - /* Create a new notification. FIXME put the right values, need - some more specs */ - not = hildon_notification_new ("TODO: (new email) Summary", - "TODO: (new email) Description", - "qgn_contact_group_chat_invitation", - "system.note.dialog"); - - /* Play sound SR-SND-18. TODO: play the right file */ +/* HildonNotification *not; */ + +/* /\* Create a new notification. FIXME put the right values, need */ +/* some more specs *\/ */ +/* not = hildon_notification_new ("TODO: (new email) Summary", */ +/* "TODO: (new email) Description", */ +/* "qgn_contact_group_chat_invitation", */ +/* "system.note.dialog"); */ + +/* /\* Play sound SR-SND-18. TODO: play the right file *\/ */ /* hildon_notification_set_sound (not, "/usr/share/sounds/ui-new_email.wav"); */ - /* Set the led pattern */ - notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (not), "led-pattern", 3); +/* /\* Set the led pattern *\/ */ +/* notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (not), "led-pattern", 3); */ - /* Notify. We need to do this in an idle because this function - could be called from a thread */ - if (!notify_notification_show (NOTIFY_NOTIFICATION (not), NULL)) - g_error ("Failed to send notification"); +/* /\* Notify. We need to do this in an idle because this function */ +/* could be called from a thread *\/ */ +/* if (!notify_notification_show (NOTIFY_NOTIFICATION (not), NULL)) */ +/* g_error ("Failed to send notification"); */ - g_object_unref (not); -#endif /*MODEST_HILDON_VERSION_0*/ +/* g_object_unref (not); */ } @@ -957,7 +991,7 @@ modest_platform_show_search_messages (GtkWindow *parent_window) 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 */ + g_warning ("%s: osso_rpc_run_with_defaults() failed.\n", __FUNCTION__); } } @@ -969,7 +1003,7 @@ modest_platform_show_addressbook (GtkWindow *parent_window) result = osso_rpc_run_with_defaults (osso_context, "osso_addressbook", "top_application", NULL, DBUS_TYPE_INVALID); if (result != OSSO_OK) { - /* TODO: warning about error showing dialog */ + g_warning ("%s: osso_rpc_run_with_defaults() failed.\n", __FUNCTION__); } }