X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-platform.c;h=7a15417a88fbfff91d268310c3bfa2b5e4dec94d;hp=eb9d8becc75258f47394c195b40861d3e2ae3506;hb=d3152f5a6ea0f939f9535fd8024538d95f14b588;hpb=4db44f57690ed2e6f418a12a2e0eeddf4cf22084 diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c index eb9d8be..7a15417 100644 --- a/src/hildon2/modest-platform.c +++ b/src/hildon2/modest-platform.c @@ -79,6 +79,7 @@ #include #include #include +#include #ifdef MODEST_HAVE_MCE #include @@ -107,8 +108,12 @@ #define COMMON_FOLDER_DIALOG_ENTRY "entry" #define COMMON_FOLDER_DIALOG_ACCOUNT_PICKER "account-picker" #define FOLDER_PICKER_CURRENT_FOLDER "current-folder" +#define FOLDER_PICKER_ORIGINAL_ACCOUNT "original-account" #define MODEST_ALARMD_APPID PACKAGE_NAME +static ca_context *ca_con = NULL; +static gboolean ca_con_opened = FALSE; + static void modest_platform_play_email_tone (void); @@ -163,23 +168,16 @@ gboolean modest_platform_init (int argc, char *argv[]) { osso_context_t *osso_context; - osso_hw_state_t hw_state = { 0 }; - DBusConnection *con; + DBusConnection *con; GSList *acc_names; - + if (!check_required_files ()) { g_printerr ("modest: missing required files\n"); return FALSE; } - - osso_context = osso_initialize(PACKAGE,PACKAGE_VERSION, - FALSE, NULL); - if (!osso_context) { - g_printerr ("modest: failed to acquire osso context\n"); - return FALSE; - } - modest_maemo_utils_set_osso_context (osso_context); + + osso_context = modest_maemo_utils_get_osso_context(); if ((con = osso_get_dbus_connection (osso_context)) == NULL) { g_printerr ("modest: could not get dbus connection\n"); @@ -479,9 +477,9 @@ modest_platform_show_uri_popup (const gchar *uri) * and/or might have security implications * we still allow to copy the url though */ - if (!g_str_has_prefix (uri, "file:")) { - - GSList *node; + if (!g_str_has_prefix (uri, "file:")) { + + GSList *node; popup_info->actions = actions_list; popup_info->uri = g_strdup (uri); @@ -493,6 +491,7 @@ modest_platform_show_uri_popup (const gchar *uri) action_name = hildon_uri_action_get_name (action); translation_domain = hildon_uri_action_get_translation_domain (action); menu_item = gtk_menu_item_new_with_label (dgettext(translation_domain, action_name)); + hildon_gtk_widget_set_theme_size (menu_item, MODEST_EDITABLE_SIZE); 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); @@ -539,7 +538,7 @@ modest_platform_get_icon (const gchar *name, guint icon_size) GTK_ICON_LOOKUP_NO_SVG, &err); if (!pixbuf) { - g_printerr ("modest: error loading theme icon '%s': %s\n", + g_warning ("Error loading theme icon '%s': %s\n", name, err->message); g_error_free (err); } @@ -692,12 +691,14 @@ folder_chooser_activated (ModestFolderView *folder_view, } static TnyFolderStore * -folder_chooser_dialog_run (ModestFolderView *original, TnyFolderStore *current) +folder_chooser_dialog_run (ModestFolderView *original, + TnyFolderStore *current, + GtkButton *picker) { GtkWidget *folder_view; FolderChooserData userdata = {NULL, NULL}; GtkWidget *pannable; - gchar *visible_id = NULL; + const gchar *visible_id = NULL; userdata.dialog = hildon_dialog_new (); pannable = hildon_pannable_area_new (); @@ -705,30 +706,36 @@ folder_chooser_dialog_run (ModestFolderView *original, TnyFolderStore *current) gtk_window_set_title (GTK_WINDOW (userdata.dialog), _FM("ckdg_ti_change_folder")); - modest_folder_view_copy_model (MODEST_FOLDER_VIEW (original), + modest_folder_view_copy_model (MODEST_FOLDER_VIEW (original), MODEST_FOLDER_VIEW (folder_view)); - if (TNY_IS_FOLDER_STORE (current)) { - if (TNY_IS_ACCOUNT (current)) { - visible_id = g_strdup (tny_account_get_id (TNY_ACCOUNT (current))); - } else if (TNY_IS_FOLDER (current)) { - TnyAccount *account; - - account = tny_folder_get_account (TNY_FOLDER (current)); - if (account) { - visible_id = g_strdup (tny_account_get_id (TNY_ACCOUNT (current))); + if (TNY_IS_ACCOUNT (current)) { + /* Local folders and MMC account are always shown + along with the currently visible server account */ + if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (current)) || + modest_tny_account_is_memory_card_account (TNY_ACCOUNT (current))) + visible_id = g_object_get_data ((GObject *) picker, FOLDER_PICKER_ORIGINAL_ACCOUNT); + else + visible_id = tny_account_get_id (TNY_ACCOUNT (current)); + } else if (TNY_IS_FOLDER (current)) { + TnyAccount *account; + account = modest_tny_folder_get_account ((TnyFolder *) current); + if (account) { + if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (account)) || + modest_tny_account_is_memory_card_account (TNY_ACCOUNT (account))) { + visible_id = g_object_get_data ((GObject *) picker, FOLDER_PICKER_ORIGINAL_ACCOUNT); + } else { + visible_id = tny_account_get_id (account); } + g_object_unref (account); } - } - - if (visible_id == NULL) { - visible_id = g_strdup ( - modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(original))); + } else { + visible_id = + modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(original)); } modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(folder_view), visible_id); - g_free (visible_id); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (userdata.dialog)->vbox), pannable); gtk_container_add (GTK_CONTAINER (pannable), folder_view); @@ -809,7 +816,7 @@ get_image_for_folder_store (TnyFolderStore *store, icon_name = MODEST_FOLDER_ICON_INBOX; break; default: - icon_name = MODEST_FOLDER_ICON_ACCOUNT; + icon_name = MODEST_FOLDER_ICON_REMOTE_FOLDER; } } else if (modest_tny_folder_is_local_folder (TNY_FOLDER (store))) { switch (type) { @@ -917,7 +924,7 @@ folder_picker_clicked (GtkButton *button, current = g_object_get_data (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER); - store = folder_chooser_dialog_run (helper->folder_view, current); + store = folder_chooser_dialog_run (helper->folder_view, current, button); if (store) { const gchar *current_name; gboolean exists = FALSE; @@ -943,15 +950,37 @@ static GtkWidget * folder_picker_new (TnyFolderStore *suggested, FolderPickerHelper *helper) { GtkWidget *button; + const gchar *acc_id = NULL; button = hildon_button_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL); hildon_button_set_alignment (HILDON_BUTTON (button), 0.0, 0.5, 1.0, 1.0); - if (suggested) + if (suggested) { + folder_picker_set_store (GTK_BUTTON (button), suggested); + if (TNY_IS_ACCOUNT (suggested)) { + if (!modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (suggested)) && + !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (suggested))) + acc_id = tny_account_get_id ((TnyAccount *) suggested); + } else { + TnyAccount *account = modest_tny_folder_get_account ((TnyFolder *) suggested); + if (account) { + acc_id = tny_account_get_id ((TnyAccount *) account); + g_object_unref (account); + } + } + } + + if (!acc_id) + acc_id = modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(helper->folder_view)); + + g_object_set_data_full (G_OBJECT (button), FOLDER_PICKER_ORIGINAL_ACCOUNT, + g_strdup (acc_id), (GDestroyNotify) g_free); + + g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (folder_picker_clicked), helper); @@ -971,7 +1000,7 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, gchar **folder_name, TnyFolderStore **parent) { - GtkWidget *accept_btn = NULL; + GtkWidget *accept_btn = NULL; GtkWidget *dialog, *entry = NULL, *label_entry = NULL, *label_location = NULL, *hbox; GtkWidget *account_picker = NULL; GList *buttons = NULL; @@ -1134,14 +1163,16 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, suggested_folder); /* In hildon 2.2 we always suggest the archive folder as parent */ - acc_store = modest_runtime_get_account_store (); - account = modest_tny_account_store_get_mmc_folders_account (acc_store); - if (account) { - suggested_folder = (TnyFolderStore *) - modest_tny_account_get_special_folder (account, - TNY_FOLDER_TYPE_ARCHIVE); - g_object_unref (account); - account = NULL; + if (!suggested_folder) { + acc_store = modest_runtime_get_account_store (); + account = modest_tny_account_store_get_mmc_folders_account (acc_store); + if (account) { + suggested_folder = (TnyFolderStore *) + modest_tny_account_get_special_folder (account, + TNY_FOLDER_TYPE_ARCHIVE); + g_object_unref (account); + account = NULL; + } } /* If there is not archive folder then fallback to local folders account */ @@ -1455,43 +1486,53 @@ gboolean modest_platform_set_update_interval (guint minutes) { #ifdef MODEST_HAVE_LIBALARM - + + cookie_t alarm_cookie, *alarm_cookies; ModestConf *conf = modest_runtime_get_conf (); if (!conf) return FALSE; - - cookie_t alarm_cookie = modest_conf_get_int (conf, MODEST_CONF_ALARM_ID, NULL); - - /* Delete any existing alarm, - * because we will replace it: */ - if (alarm_cookie) { - if (alarmd_event_del(alarm_cookie) != 0) - g_debug ("%s: alarm %d was not on the queue", __FUNCTION__, (int)alarm_cookie); - alarm_cookie = 0; + + if (minutes > 0) { + GSList *acc_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE); + if (!acc_names) { + minutes = 0; + } else { + modest_account_mgr_free_account_names (acc_names); + } + } + + /* cookie_t alarm_cookie = modest_conf_get_int (conf, MODEST_CONF_ALARM_ID, NULL); */ + + /* Delete any existing alarm, because we will replace it: */ + alarm_cookies = alarmd_event_query (0,0, 0,0, MODEST_ALARMD_APPID); + if (alarm_cookies) { + /* alarmd_event_query returns a zero terminated array */ + for (; *alarm_cookies != 0; alarm_cookies++) { + alarmd_event_del (*alarm_cookies); + } modest_conf_set_int (conf, MODEST_CONF_ALARM_ID, 0, NULL); } - + /* 0 means no updates: */ if (minutes == 0) return TRUE; - - + /* Register alarm: */ - + /* Set the interval in alarm_event_t structure: */ alarm_event_t *event = alarm_event_create (); alarm_event_add_actions (event, 1); alarm_action_t *action = alarm_event_get_action (event, 0); alarm_event_set_alarm_appid (event, MODEST_ALARMD_APPID); event->alarm_time = minutes * 60; /* seconds */ - + /* Set recurrence every few minutes: */ event->recur_secs = minutes*60; event->recur_count = -1; /* Means infinite */ /* Specify what should happen when the alarm happens: * It should call this D-Bus method: */ - + action->dbus_path = g_strdup(MODEST_DBUS_OBJECT); action->dbus_interface = g_strdup (MODEST_DBUS_IFACE); action->dbus_service = g_strdup (MODEST_DBUS_SERVICE); @@ -1505,24 +1546,24 @@ modest_platform_set_update_interval (guint minutes) * (The old maemo email-client did this, though it isn't specified in the UI spec.) * ALARM_EVENT_CONNECTED will prevent the alarm from being called in case that the device is offline */ - event->flags = ALARM_EVENT_CONNECTED; - + event->flags = ALARM_EVENT_CONNECTED | ALARM_EVENT_RUN_DELAYED; + alarm_cookie = alarmd_event_add (event); /* now, free it */ alarm_event_delete (event); - + /* Store the alarm ID in GConf, so we can remove it later: * This is apparently valid between application instances. */ modest_conf_set_int (conf, MODEST_CONF_ALARM_ID, alarm_cookie, NULL); - + if (!alarm_cookie) { /* Error */ g_warning ("Error setting alarm event. \n"); - + return FALSE; } -#endif /* MODEST_HAVE_LIBALARM */ +#endif /* MODEST_HAVE_LIBALARM */ return TRUE; } @@ -1564,108 +1605,97 @@ modest_platform_on_new_headers_received (GList *URI_list, if (g_list_length (URI_list) == 0) return; - /* If the window is in the foreground don't do anything */ - if (hildon_program_get_is_topmost (hildon_program_get_instance ())) - return; - #ifdef MODEST_HAVE_HILDON_NOTIFY /* For any other case issue a notification */ HildonNotification *notification; - GList *iter; - GSList *notifications_list = NULL; + ModestMsgNotificationData *data; + gint notif_id; + gchar *from; + TnyAccountStore *acc_store; + TnyAccount *account; - /* Get previous notifications ids */ - notifications_list = modest_conf_get_list (modest_runtime_get_conf (), - MODEST_CONF_NOTIFICATION_IDS, - MODEST_CONF_VALUE_INT, NULL); - - iter = URI_list; - while (iter) { - ModestMsgNotificationData *data; - gboolean first_notification = TRUE; - gint notif_id; - gchar *from; - - data = (ModestMsgNotificationData *) iter->data; - - /* String is changed in-place. There is no need to - actually dup the data->from string but we just do - it in order not to modify the original contents */ - from = g_strdup (data->from); - modest_text_utils_get_display_address (from); - - notification = hildon_notification_new (from, - data->subject, - "qgn_list_messagin", - MODEST_NOTIFICATION_CATEGORY); - g_free (from); - - hildon_notification_add_dbus_action(notification, - "default", - "Cancel", - MODEST_DBUS_SERVICE, - MODEST_DBUS_OBJECT, - MODEST_DBUS_IFACE, - MODEST_DBUS_METHOD_OPEN_MESSAGE, - G_TYPE_STRING, data->uri, - -1); - - /* Play sound if the user wants. Show the LED - pattern. Show and play just one */ - if (G_UNLIKELY (first_notification)) { - TnyAccountStore *acc_store; - TnyAccount *account; - - first_notification = FALSE; - - /* Set the led pattern and make the notification persistent */ - notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification), - "dialog-type", 4); - notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification), - "led-pattern", - MODEST_NEW_MAIL_LIGHTING_PATTERN); - notify_notification_set_hint_byte (NOTIFY_NOTIFICATION (notification), - "persistent", TRUE); - - /* Set the account of the headers */ - acc_store = (TnyAccountStore *) modest_runtime_get_account_store (); - account = tny_account_store_find_account (acc_store, data->uri); - if (account) { - const gchar *acc_name; - acc_name = - modest_tny_account_get_parent_modest_account_name_for_server_account (account); - notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification), - "email-account", - acc_name); - g_object_unref (account); - } + data = (ModestMsgNotificationData *) URI_list->data; + + /* String is changed in-place. There is no need to + actually dup the data->from string but we just do + it in order not to modify the original contents */ + from = g_strdup (data->from); + modest_text_utils_get_display_address (from); + + /* Create notification */ + notification = hildon_notification_new (from, + data->subject, + "qgn_list_messagin", + MODEST_NOTIFICATION_CATEGORY); + g_free (from); + + /* Add DBus action */ + hildon_notification_add_dbus_action(notification, + "default", + "Cancel", + MODEST_DBUS_SERVICE, + MODEST_DBUS_OBJECT, + MODEST_DBUS_IFACE, + MODEST_DBUS_METHOD_OPEN_MESSAGE, + G_TYPE_STRING, data->uri, + -1); + + /* Set the led pattern */ + if (data->time) + notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification), + "time", data->time); + + notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification), + "dialog-type", 4); + notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification), + "led-pattern", + MODEST_NEW_MAIL_LIGHTING_PATTERN); + + /* Make the notification persistent */ + notify_notification_set_hint_byte (NOTIFY_NOTIFICATION (notification), + "persistent", TRUE); + + /* Set the number of new notifications */ + notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification), + "amount", g_list_length (URI_list)); + + /* Set the account of the headers */ + acc_store = (TnyAccountStore *) modest_runtime_get_account_store (); + account = tny_account_store_find_account (acc_store, data->uri); + if (account) { + const gchar *acc_name; + acc_name = + modest_tny_account_get_parent_modest_account_name_for_server_account (account); + notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification), + "email-account", + acc_name); + g_object_unref (account); + } - /* Play sound */ - modest_platform_play_email_tone (); - } + if (notify_notification_show (NOTIFY_NOTIFICATION (notification), NULL)) { + GSList *notifications_list = NULL; - /* Notify. We need to do this in an idle because this function - could be called from a thread */ - if (!notify_notification_show (NOTIFY_NOTIFICATION (notification), NULL)) { - g_warning ("Failed to send notification"); - } + /* Get previous notifications ids */ + notifications_list = modest_conf_get_list (modest_runtime_get_conf (), + MODEST_CONF_NOTIFICATION_IDS, + MODEST_CONF_VALUE_INT, NULL); /* Save id in the list */ - g_object_get(G_OBJECT(notification), "id", ¬if_id, NULL); + g_object_get(G_OBJECT (notification), "id", ¬if_id, NULL); notifications_list = g_slist_prepend (notifications_list, GINT_TO_POINTER(notif_id)); + /* We don't listen for the "closed" signal, because we don't care about if the notification was removed or not to store the list in gconf */ - /* Free & carry on */ - iter = g_list_next (iter); - } - - /* Save the ids */ - modest_conf_set_list (modest_runtime_get_conf (), MODEST_CONF_NOTIFICATION_IDS, - notifications_list, MODEST_CONF_VALUE_INT, NULL); + /* Save the ids */ + modest_conf_set_list (modest_runtime_get_conf (), MODEST_CONF_NOTIFICATION_IDS, + notifications_list, MODEST_CONF_VALUE_INT, NULL); - g_slist_free (notifications_list); + g_slist_free (notifications_list); + } else { + g_warning ("Failed to send notification"); + } #endif /*MODEST_HAVE_HILDON_NOTIFY*/ } @@ -1776,11 +1806,6 @@ modest_platform_create_folder_view_full (TnyFolderStoreQuery *query, gboolean do modest_folder_view_set_style (MODEST_FOLDER_VIEW (widget), MODEST_FOLDER_VIEW_STYLE_SHOW_ONE); - /* Restore settings */ - modest_widget_memory_restore (modest_runtime_get_conf(), - G_OBJECT (widget), - MODEST_CONF_FOLDER_VIEW_KEY); - return widget; } @@ -1803,7 +1828,7 @@ modest_platform_information_banner (GtkWidget *parent, const gchar *icon_name, const gchar *text) { - GtkWidget *banner, *banner_parent = NULL; + GtkWidget *banner_parent = NULL; ModestWindowMgr *mgr = modest_runtime_get_window_mgr (); if (modest_window_mgr_get_num_windows (mgr) == 0) @@ -1826,8 +1851,23 @@ modest_platform_information_banner (GtkWidget *parent, return; } + modest_platform_system_banner (banner_parent, icon_name, text); +} + +void +modest_platform_system_banner (GtkWidget *parent, + const gchar *icon_name, + const gchar *text) +{ + GtkWidget *banner = NULL; + ModestWindowMgr *mgr = modest_runtime_get_window_mgr (); + + if (parent && GTK_IS_WINDOW (parent)) { + if (!gtk_window_is_active (GTK_WINDOW (parent))) + parent = NULL; + } - banner = hildon_banner_show_information (banner_parent, icon_name, text); + banner = hildon_banner_show_information (parent, icon_name, text); modest_window_mgr_register_banner (mgr); g_object_ref (mgr); @@ -1885,17 +1925,14 @@ on_timeout_check_account_is_online(CheckAccountIdleData* data) { gboolean stop_trying = FALSE; g_return_val_if_fail (data && data->account, FALSE); - - printf ("DEBUG: %s: tny_account_get_connection_status()==%d\n", __FUNCTION__, - tny_account_get_connection_status (data->account)); - + if (data && data->account && /* We want to wait until TNY_CONNECTION_STATUS_INIT has changed to something else, * after which the account is likely to be usable, or never likely to be usable soon: */ (tny_account_get_connection_status (data->account) != TNY_CONNECTION_STATUS_INIT) ) { data->is_online = TRUE; - + stop_trying = TRUE; } else { /* Give up if we have tried too many times: */ @@ -1906,15 +1943,15 @@ on_timeout_check_account_is_online(CheckAccountIdleData* data) ++(data->count_tries); } } - + if (stop_trying) { /* Allow the function that requested this idle callback to continue: */ if (data->loop) g_main_loop_quit (data->loop); - + if (data->account) g_object_unref (data->account); - + return FALSE; /* Don't call this again. */ } else { return TRUE; /* Call this timeout callback again. */ @@ -2024,14 +2061,17 @@ modest_platform_run_certificate_confirmation_dialog (const gchar* server_name, example. With GTK_RESPONSE_HELP the view button is aligned to the left while the other two to the right */ note = hildon_note_new_confirmation_add_buttons ( - NULL, + (GtkWindow *) win, question, _HL("wdgt_bd_yes"), GTK_RESPONSE_OK, _HL("wdgt_bd_view"), GTK_RESPONSE_APPLY, /* abusing this... */ _HL("wdgt_bd_no"), GTK_RESPONSE_CANCEL, NULL, NULL); - g_signal_connect (G_OBJECT(note), "response", + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + (GtkWindow *) note, (GtkWindow *) win); + + g_signal_connect (G_OBJECT(note), "response", G_CALLBACK(on_cert_dialog_response), (gpointer) certificate); @@ -2568,14 +2608,27 @@ modest_platform_get_osso_context (void) return modest_maemo_utils_get_osso_context (); } +static gfloat +convert_volume_to_db (int linear_volume) +{ + gfloat linear_converted = linear_volume / 100.0; + gfloat db_vol = 0.0; + + db_vol = 20 * log10 (linear_converted); + if (isinf (db_vol) != 0) + return -60.0; + + return db_vol; +} + static void modest_platform_play_email_tone (void) { gchar *mail_tone; gint mail_volume_int; int ret; - ca_context *ca_con = NULL; ca_proplist *pl = NULL; + gfloat db_volume; #ifdef MODEST_USE_PROFILE gchar *active_profile; @@ -2588,7 +2641,7 @@ modest_platform_play_email_tone (void) g_free (mail_volume); g_free (active_profile); #else - mail_tone = MAIL_TONE; + mail_tone = g_strdup (MAIL_TONE); mail_volume_int = 100; #endif @@ -2602,26 +2655,37 @@ modest_platform_play_email_tone (void) if (mail_volume_int > 0) { - if ((ret = ca_context_create(&ca_con)) != CA_SUCCESS) { - g_warning("ca_context_create: %s\n", ca_strerror(ret)); - return; + if (ca_con == NULL) { + if ((ret = ca_context_create (&ca_con)) != CA_SUCCESS) { + g_warning("ca_context_create: %s\n", ca_strerror(ret)); + ca_con = NULL; + return; + } + if ((ret = ca_context_set_driver (ca_con, "gstreamer")) != CA_SUCCESS) { + g_warning ("ca_context_set_driver: %s\n", ca_strerror (ret)); + ca_con = NULL; + return; + } } - if ((ret = ca_context_open(ca_con)) != CA_SUCCESS) { - g_warning("ca_context_open: %s\n", ca_strerror(ret)); - ca_context_destroy(ca_con); - return; + if (!ca_con_opened) { + if ((ret = ca_context_open(ca_con)) != CA_SUCCESS) { + g_warning("ca_context_open: %s\n", ca_strerror(ret)); + return; + } else { + ca_con_opened = TRUE; + } } ca_proplist_create(&pl); ca_proplist_sets(pl, CA_PROP_MEDIA_FILENAME, mail_tone); - ca_proplist_setf(pl, CA_PROP_CANBERRA_VOLUME, "%f", (gfloat) mail_volume_int); + db_volume = convert_volume_to_db (mail_volume_int); + ca_proplist_setf(pl, CA_PROP_CANBERRA_VOLUME, "%f", db_volume); ret = ca_context_play_full(ca_con, 0, pl, NULL, NULL); g_debug("ca_context_play_full (vol %f): %s\n", (gfloat) mail_volume_int, ca_strerror(ret)); ca_proplist_destroy(pl); - ca_context_destroy(ca_con); } g_free (mail_tone); @@ -2635,6 +2699,52 @@ modest_platform_play_email_tone (void) #define MOVE_TO_FOLDER_SEPARATOR "/" static void +translate_path (gchar **path) +{ + gchar **parts; + gchar **current; + GString *output; + gboolean add_separator; + + parts = g_strsplit (*path, MOVE_TO_FOLDER_SEPARATOR, 0); + g_free (*path); + + current = parts; + output = g_string_new (""); + add_separator = FALSE; + + while (*current != NULL) { + TnyFolderType folder_type; + gchar *downcase; + + if (add_separator) { + output = g_string_append (output, MOVE_TO_FOLDER_SEPARATOR); + } else { + add_separator = TRUE; + } + + downcase = g_ascii_strdown (*current, -1); + folder_type = modest_local_folder_info_get_type (downcase); + if (strcmp (downcase, "inbox") == 0) { + output = g_string_append (output, _("mcen_me_folder_inbox")); + } else if (folder_type == TNY_FOLDER_TYPE_ARCHIVE || + folder_type == TNY_FOLDER_TYPE_DRAFTS || + folder_type == TNY_FOLDER_TYPE_SENT || + folder_type == TNY_FOLDER_TYPE_OUTBOX) { + output = g_string_append (output, modest_local_folder_info_get_type_display_name (folder_type)); + } else { + output = g_string_append (output, *current); + } + g_free (downcase); + + current++; + } + + g_strfreev (parts); + *path = g_string_free (output, FALSE); +} + +static void move_to_dialog_set_selected_folder_store (GtkWidget *dialog, TnyFolderStore *folder_store) { @@ -2684,6 +2794,7 @@ move_to_dialog_set_selected_folder_store (GtkWidget *dialog, short_name, NULL); } + translate_path (&full_name); hildon_button_set_value (HILDON_BUTTON (action_button), full_name); g_free (full_name); } @@ -2834,13 +2945,14 @@ on_move_to_dialog_row_activated (GtkTreeView *tree_view, valid = !modest_protocol_registry_protocol_type_has_tag (modest_runtime_get_protocol_registry (), protocol_type, - MODEST_PROTOCOL_REGISTRY_STORE_FORBID_MESSAGE_ADD); + MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS); } if (valid) move_to_dialog_show_folders (dialog, selected); } else { move_to_dialog_set_selected_folder_store (dialog, selected); } + g_object_unref (selected); } static void @@ -2883,7 +2995,14 @@ on_move_to_dialog_action_clicked (GtkButton *selection, selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); if (selected) { - gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + /* It's not possible to select root folders as + targets unless they're the local account or + the memory card account */ + if ((TNY_IS_FOLDER (selected) && !TNY_IS_MERGE_FOLDER (selected)) || + (TNY_IS_ACCOUNT (selected) && + (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (selected)) || + modest_tny_account_is_memory_card_account (TNY_ACCOUNT (selected))))) + gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); g_object_unref (selected); } }