X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmaemo%2Fmodest-platform.c;h=12a4c94caf5d07758f831975a559a4c4cfbcd4bc;hb=8f8039fef5dcff6cbc7b156053fd912c9fad2f43;hp=c62100889bda84ec87b564a0baf2f6cfa70a907b;hpb=e5c34cef889bc07bd0920b421365c005660fd271;p=modest diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c index c621008..12a4c94 100644 --- a/src/maemo/modest-platform.c +++ b/src/maemo/modest-platform.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include /* For alarm_event_add(), etc. */ @@ -48,10 +49,13 @@ #include #include + #define HILDON_OSSO_URI_ACTION "uri-action" #define URI_ACTION_COPY "copy:" static osso_context_t *osso_context = NULL; + +static void folder_name_insensitive_press (GtkWidget *widget, ModestWindow *window); static void on_modest_conf_update_interval_changed (ModestConf* self, const gchar *key, @@ -65,10 +69,11 @@ on_modest_conf_update_interval_changed (ModestConf* self, const gchar *key, } gboolean -modest_platform_init (void) +modest_platform_init (int argc, char *argv[]) { osso_hw_state_t hw_state = { 0 }; DBusConnection *con; + osso_context = osso_initialize(PACKAGE,PACKAGE_VERSION, FALSE, NULL); @@ -78,29 +83,34 @@ modest_platform_init (void) } if ((con = osso_get_dbus_connection (osso_context)) == NULL) { - g_printerr ("Could not get dbus connection\n"); + g_printerr ("modest: could not get dbus connection\n"); return FALSE; } - + + /* Add a D-Bus handler to be used when the main osso-rpc + * D-Bus handler has not handled something. + * We use this for D-Bus methods that need to use more complex types + * than osso-rpc supports. + */ if (!dbus_connection_add_filter (con, modest_dbus_req_filter, NULL, NULL)) { - g_printerr ("Could not add dbus filter\n"); + g_printerr ("modest: Could not add D-Bus filter\n"); return FALSE; } - /* Register our D-Bus callbacks, via the osso API: */ + /* Register our simple D-Bus callbacks, via the osso API: */ osso_return_t result = osso_rpc_set_cb_f(osso_context, MODEST_DBUS_SERVICE, MODEST_DBUS_OBJECT, MODEST_DBUS_IFACE, modest_dbus_req_handler, NULL /* user_data */); if (result != OSSO_OK) { - g_print("Error setting D-BUS callback (%d)\n", result); - return OSSO_ERROR; + g_printerr ("modest: Error setting D-BUS callback (%d)\n", result); + return FALSE; } /* Add handler for Exit D-BUS messages. @@ -122,7 +132,8 @@ modest_platform_init (void) result = osso_application_set_autosave_cb (osso_context, modest_on_osso_application_autosave, NULL /* user_data */); if (result != OSSO_OK) { - g_warning ("osso_application_set_autosave_cb() failed."); + g_printerr ("modest: osso_application_set_autosave_cb() failed.\n"); + return FALSE; } @@ -137,7 +148,13 @@ modest_platform_init (void) /* Get the initial update interval from gconf: */ on_modest_conf_update_interval_changed(conf, MODEST_CONF_UPDATE_INTERVAL, MODEST_CONF_EVENT_KEY_CHANGED, NULL); - + + /* initialize the addressbook */ + if (!osso_abook_init (&argc, &argv, osso_context)) { + g_printerr ("modest: failed to initialized addressbook\n"); + return FALSE; + } + return TRUE; } @@ -197,11 +214,11 @@ modest_platform_get_file_icon_name (const gchar* name, const gchar* mime_type, mime_str = g_string_new (mime_type); g_string_ascii_down (mime_str); } -#ifdef MODEST_HILDON_VERSION_0 +#ifdef MODEST_HAVE_OSSO_MIME icons = osso_mime_get_icon_names (mime_str->str, NULL); #else icons = hildon_mime_get_icon_names (mime_str->str, NULL); -#endif /*MODEST_HILDON_VERSION_0*/ +#endif /*MODEST_HAVE_OSSO_MIME*/ for (cursor = icons; cursor; ++cursor) { if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), *cursor)) { icon_name = g_strdup (*cursor); @@ -218,22 +235,85 @@ modest_platform_get_file_icon_name (const gchar* name, const gchar* mime_type, return icon_name; } + + + +#ifdef MODEST_HAVE_OSSO_MIME gboolean modest_platform_activate_uri (const gchar *uri) { - gboolean result; + OssoURIAction *action; + gboolean result = FALSE; + GSList *actions, *iter = NULL; + const gchar *scheme; + + g_return_val_if_fail (uri, FALSE); + if (!uri) + return FALSE; -#ifdef MODEST_HILDON_VERSION_0 - result = osso_uri_open (uri, NULL, NULL); -#else - result = hildon_uri_open (uri, NULL, NULL); -#endif + /* the default action should be email */ + scheme = osso_uri_get_scheme_from_uri (uri, NULL); + actions = osso_uri_get_actions (scheme, NULL); + + for (iter = actions; iter; iter = g_slist_next (iter)) { + action = (OssoURIAction*) iter->data; + 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) { + g_printerr ("modest: modest_platform_activate_uri : %s", + err->message ? err->message : "unknown error"); + g_error_free (err); + } + break; + } + } + + if (!result) + hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link")); + return result; +} + +#else /* !MODEST_HAVE_OSSO_MIME*/ + +gboolean +modest_platform_activate_uri (const gchar *uri) +{ + HildonURIAction *action; + gboolean result = FALSE; + GSList *actions, *iter = NULL; + const gchar *scheme; + + g_return_val_if_fail (uri, FALSE); + if (!uri) + return FALSE; + /* the default action should be email */ + scheme = hildon_uri_get_scheme_from_uri (uri, NULL); + actions = hildon_uri_get_actions (scheme, NULL); + + for (iter = actions; iter; iter = g_slist_next (iter)) { + action = (HildonURIAction*) iter->data; + if (action && strcmp (hildon_uri_action_get_service (action), "com.nokia.modest") == 0) { + GError *err = NULL; + result = hildon_uri_open (uri, action, &err); + if (!result && err) { + g_printerr ("modest: modest_platform_activate_uri : %s", + err->message ? err->message : "unknown error"); + g_error_free (err); + } + break; + } + } + if (!result) hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link")); return result; } + +#endif /* MODEST_HAVE_OSSO_MIME*/ + gboolean modest_platform_activate_file (const gchar *path, const gchar *mime_type) { @@ -252,7 +332,7 @@ modest_platform_activate_file (const gchar *path, const gchar *mime_type) uri_path = g_strconcat ("file://", path, NULL); con = osso_get_dbus_connection (osso_context); -#ifdef MODEST_HILDON_VERSION_0 +#ifdef MODEST_HAVE_OSSO_MIME result = osso_mime_open_file_with_mime_type (con, uri_path, mime_str->str); g_string_free (mime_str, TRUE); @@ -266,7 +346,7 @@ modest_platform_activate_file (const gchar *path, const gchar *mime_type) if (result != 1) hildon_banner_show_information (NULL, NULL, _("mcen_ni_noregistered_viewer")); return result != 1; -#endif +#endif /*MODEST_HAVE_OSSO_MIME*/ } @@ -283,11 +363,11 @@ delete_uri_popup (GtkWidget *menu, ModestPlatformPopupInfo *popup_info = (ModestPlatformPopupInfo *) userdata; g_free (popup_info->uri); -#ifdef MODEST_HILDON_VERSION_0 +#ifdef MODEST_HAVE_OSSO_MIME osso_uri_free_actions (popup_info->actions); #else hildon_uri_free_actions (popup_info->actions); -#endif +#endif /*MODEST_HAVE_OSSO_MIME*/ return FALSE; } @@ -320,7 +400,7 @@ activate_uri_popup_item (GtkMenuItem *menu_item, /* now, the real uri-actions... */ for (node = popup_info->actions; node != NULL; node = g_slist_next (node)) { -#ifdef MODEST_HILDON_VERSION_0 +#ifdef MODEST_HAVE_OSSO_MIME OssoURIAction *action = (OssoURIAction *) node->data; if (strcmp (action_name, osso_uri_action_get_name (action))==0) { osso_uri_open (popup_info->uri, action, NULL); @@ -332,7 +412,7 @@ activate_uri_popup_item (GtkMenuItem *menu_item, hildon_uri_open (popup_info->uri, action, NULL); break; } -#endif +#endif /*MODEST_HAVE_OSSO_MIME*/ } } @@ -345,13 +425,13 @@ modest_platform_show_uri_popup (const gchar *uri) if (uri == NULL) return FALSE; -#ifdef MODEST_HILDON_VERSION_0 +#ifdef MODEST_HAVE_OSSO_MIME scheme = osso_uri_get_scheme_from_uri (uri, NULL); actions_list = osso_uri_get_actions (scheme, NULL); #else scheme = hildon_uri_get_scheme_from_uri (uri, NULL); actions_list = hildon_uri_get_actions (scheme, NULL); -#endif +#endif /* MODEST_HAVE_OSSO_MIME */ if (actions_list != NULL) { GSList *node; GtkWidget *menu = gtk_menu_new (); @@ -362,11 +442,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; -#ifdef MODEST_HILDON_VERSION_0 + const gchar *action_name; + const gchar *translation_domain; +#ifdef MODEST_HAVE_OSSO_MIME 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), @@ -380,7 +462,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); @@ -390,7 +473,7 @@ modest_platform_show_uri_popup (const gchar *uri) } else { gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); } -#endif +#endif /*MODEST_HAVE_OSSO_MIME*/ gtk_widget_show (menu_item); } @@ -471,7 +554,7 @@ entry_insert_text (GtkEditable *editable, /* Show WID-INF036 */ if (chars_length == 20) { hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (data)), NULL, - _("mcen_ib_maxchar_reached")); + dgettext("hildon-common-strings", "ckdg_ib_maximum_characters_reached")); } else { if (chars_length == 0) { /* A blank space is not valid as first character */ @@ -505,9 +588,10 @@ entry_changed (GtkEditable *editable, gchar *chars; chars = gtk_editable_get_chars (editable, 0, -1); + g_return_if_fail (chars != NULL); - /* Dimm OK button */ - if (strlen (chars) == 0) { + /* Dimm OK button. Do not allow also the "/" */ + if (strlen (chars) == 0 || strchr (chars, '/')) { GtkWidget *ok_button; GList *buttons; @@ -516,7 +600,12 @@ entry_changed (GtkEditable *editable, gtk_widget_set_sensitive (ok_button, FALSE); g_list_free (buttons); + } else if (strlen (chars) == 21) { + hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (user_data)), NULL, + dgettext("hildon-common-strings", "ckdg_ib_maximum_characters_reached")); } + + /* Free */ g_free (chars); } @@ -531,6 +620,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)) { @@ -540,11 +634,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); @@ -577,6 +672,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; @@ -585,10 +681,35 @@ 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); @@ -606,26 +727,30 @@ 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); } - - -gint -modest_platform_run_new_folder_dialog (GtkWindow *parent_window, - TnyFolderStore *parent_folder, - gchar *suggested_name, - gchar **folder_name) +static gint +modest_platform_run_folder_name_dialog (GtkWindow *parent_window, + const gchar *dialog_title, + const gchar *label_text, + const gchar *suggested_name, + gchar **folder_name) { + GtkWidget *accept_btn = NULL; GtkWidget *dialog, *entry, *label, *hbox; + GList *buttons = NULL; gint result; /* Ask the user for the folder name */ - dialog = gtk_dialog_new_with_buttons (_("mcen_ti_new_folder"), + dialog = gtk_dialog_new_with_buttons (dialog_title, parent_window, GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, @@ -634,8 +759,13 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, GTK_RESPONSE_REJECT, NULL); + /* Add accept button (with unsensitive handler) */ + buttons = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area)); + accept_btn = GTK_WIDGET (buttons->next->data); + g_signal_connect (G_OBJECT (accept_btn), "insensitive-press", G_CALLBACK (folder_name_insensitive_press), parent_window); + /* Create label and entry */ - label = gtk_label_new (_("mcen_fi_new_folder_name")); + label = gtk_label_new (label_text); /* TODO: check that the suggested name does not exist */ /* We set 21 as maximum because we want to show WID-INF036 when the user inputs more that 20 */ @@ -667,6 +797,7 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox)); + gtk_window_set_transient_for (GTK_WINDOW (dialog), parent_window); result = gtk_dialog_run (GTK_DIALOG(dialog)); if (result == GTK_RESPONSE_ACCEPT) *folder_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry))); @@ -676,6 +807,38 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, return result; } +static void +folder_name_insensitive_press (GtkWidget *widget, ModestWindow *window) +{ + hildon_banner_show_information (NULL, NULL, _("(empty)")); +} + +gint +modest_platform_run_new_folder_dialog (GtkWindow *parent_window, + TnyFolderStore *parent_folder, + gchar *suggested_name, + gchar **folder_name) +{ + return modest_platform_run_folder_name_dialog (parent_window, + _("mcen_ti_new_folder"), + _("mcen_fi_new_folder_name"), + suggested_name, + folder_name); +} + +gint +modest_platform_run_rename_folder_dialog (GtkWindow *parent_window, + TnyFolderStore *parent_folder, + const gchar *suggested_name, + gchar **folder_name) +{ + return modest_platform_run_folder_name_dialog (parent_window, + _("New folder name"), + _("Enter new folder name:"), + suggested_name, + folder_name); +} + gint modest_platform_run_confirmation_dialog (GtkWindow *parent_window, const gchar *message) @@ -684,6 +847,7 @@ modest_platform_run_confirmation_dialog (GtkWindow *parent_window, gint response; dialog = hildon_note_new_confirmation (parent_window, message); + gtk_window_set_modal (GTK_WINDOW(dialog), TRUE); response = gtk_dialog_run (GTK_DIALOG (dialog)); @@ -831,8 +995,7 @@ 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 +#ifdef MODEST_HAVE_HILDON_NOTIFY HildonNotification *not; /* Create a new notification. FIXME put the right values, need @@ -843,7 +1006,7 @@ modest_platform_on_new_msg (void) "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"); */ + /* TODO: Where is this declared? 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); @@ -854,7 +1017,7 @@ modest_platform_on_new_msg (void) g_error ("Failed to send notification"); g_object_unref (not); -#endif /*MODEST_HILDON_VERSION_0*/ +#endif /*MODEST_HAVE_HILDON_NOTIFY*/ } @@ -868,7 +1031,7 @@ modest_platform_show_help (GtkWindow *parent_window, g_return_if_fail (osso_context); /* Show help */ -#ifdef MODEST_HILDON_VERSION_0 +#ifdef MODEST_HAVE_OSSO_HELP result = ossohelp_show (osso_context, help_id, OSSO_HELP_SHOW_DIALOG); #else result = hildon_help_show (osso_context, help_id, OSSO_HELP_SHOW_DIALOG); @@ -892,7 +1055,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__); } } @@ -904,7 +1067,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__); } } @@ -924,3 +1087,11 @@ modest_platform_create_folder_view (TnyFolderStoreQuery *query) return widget; } + +void +modest_platform_information_banner (GtkWidget *widget, + const gchar *icon_name, + const gchar *text) +{ + hildon_banner_show_information (widget, icon_name, text); +}