X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-platform.c;h=41e5381b5ac946421be3074c5a2ce91dab716e3e;hp=18db4b34e0af4ca7868c3f08f12e966653da863e;hb=238ae1b0834f8400cfdbc99c139c245f4d8e9009;hpb=22f687bc1a5543f49b3ff3acdb53e00fe6c165a0 diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c index 18db4b3..41e5381 100644 --- a/src/hildon2/modest-platform.c +++ b/src/hildon2/modest-platform.c @@ -110,7 +110,7 @@ #define MODEST_ALARMD_APPID PACKAGE_NAME -static void _modest_platform_play_email_tone (void); +static void modest_platform_play_email_tone (void); static void @@ -374,7 +374,7 @@ modest_platform_activate_uri (const gchar *uri) modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE); hildon_banner_show_information (parent ? GTK_WIDGET(parent): NULL, NULL, _("mcen_ib_unsupported_link")); - g_warning ("%s: cannot open uri '%s'", __FUNCTION__,uri); + g_debug ("%s: cannot open uri '%s'", __FUNCTION__,uri); } return result; @@ -539,7 +539,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 +692,13 @@ folder_chooser_activated (ModestFolderView *folder_view, } static TnyFolderStore * -folder_chooser_dialog_run (ModestFolderView *original) +folder_chooser_dialog_run (ModestFolderView *original, + TnyFolderStore *current) { GtkWidget *folder_view; FolderChooserData userdata = {NULL, NULL}; GtkWidget *pannable; - const gchar *visible_id = NULL; + gchar *visible_id = NULL; userdata.dialog = hildon_dialog_new (); pannable = hildon_pannable_area_new (); @@ -705,13 +706,39 @@ folder_chooser_dialog_run (ModestFolderView *original) 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)); - visible_id = - modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(original)); + 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_strdup (modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (original))); + else + 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) { + if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (account)) || + modest_tny_account_is_memory_card_account (TNY_ACCOUNT (account))) { + visible_id = + g_strdup (modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (original))); + } else { + visible_id = g_strdup (tny_account_get_id (account)); + } + g_object_unref (account); + } + } else { + visible_id = g_strdup ( + 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); @@ -792,7 +819,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) { @@ -896,9 +923,11 @@ static void folder_picker_clicked (GtkButton *button, FolderPickerHelper *helper) { - TnyFolderStore *store; + TnyFolderStore *store, *current; - store = folder_chooser_dialog_run (helper->folder_view); + current = g_object_get_data (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER); + + store = folder_chooser_dialog_run (helper->folder_view, current); if (store) { const gchar *current_name; gboolean exists = FALSE; @@ -1115,14 +1144,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 */ @@ -1447,7 +1478,7 @@ modest_platform_set_update_interval (guint minutes) * because we will replace it: */ if (alarm_cookie) { if (alarmd_event_del(alarm_cookie) != 0) - g_warning ("%s: alarm %d was not on the queue", __FUNCTION__, (int)alarm_cookie); + g_debug ("%s: alarm %d was not on the queue", __FUNCTION__, (int)alarm_cookie); alarm_cookie = 0; modest_conf_set_int (conf, MODEST_CONF_ALARM_ID, 0, NULL); } @@ -1499,7 +1530,7 @@ modest_platform_set_update_interval (guint minutes) if (!alarm_cookie) { /* Error */ - g_debug ("Error setting alarm event. \n"); + g_warning ("Error setting alarm event. \n"); return FALSE; } @@ -1521,7 +1552,7 @@ modest_platform_push_email_notification(void) foreground we don't show anything */ if (!(screen_on && app_in_foreground)) { - _modest_platform_play_email_tone (); + modest_platform_play_email_tone (); /* Activate LED. This must be deactivated by modest_platform_remove_new_mail_notifications */ @@ -1539,115 +1570,112 @@ modest_platform_push_email_notification(void) } void -modest_platform_on_new_headers_received (TnyList *header_list, +modest_platform_on_new_headers_received (GList *URI_list, gboolean show_visual) { - g_return_if_fail (TNY_IS_LIST (header_list)); + gboolean screen_on, app_in_foreground; - if (tny_list_get_length (header_list) < 1) + /* Get the window status */ + app_in_foreground = hildon_program_get_is_topmost (hildon_program_get_instance ()); + screen_on = modest_window_mgr_screen_is_on (modest_runtime_get_window_mgr ()); + + /* If the screen is on and the app is in the + foreground we don't show anything */ + if (screen_on && app_in_foreground) return; - /* If the window is in the foreground don't do anything */ - if (hildon_program_get_is_topmost (hildon_program_get_instance ())) + if (g_list_length (URI_list) == 0) return; #ifdef MODEST_HAVE_HILDON_NOTIFY /* For any other case issue a notification */ HildonNotification *notification; - TnyIterator *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 = tny_list_create_iterator (header_list); - while (!tny_iterator_is_done (iter)) { - gchar *url = NULL, *display_address = NULL; - TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); - TnyFolder *folder = tny_header_get_folder (header); - gboolean first_notification = TRUE; - gint notif_id; - gchar *str; - - display_address = tny_header_dup_from (header); - /* string is changed in-place */ - modest_text_utils_get_display_address (display_address); - - str = tny_header_dup_subject (header); - notification = hildon_notification_new (display_address, - str, - "qgn_list_messagin", - MODEST_NOTIFICATION_CATEGORY); - g_free (str); - /* Create the message URL */ - str = tny_header_dup_uid (header); - url = g_strdup_printf ("%s/%s", tny_folder_get_url_string (folder), - str); - g_free (str); - - 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, url, - -1); - - /* Play sound if the user wants. Show the LED - pattern. Show and play just one */ - if (G_UNLIKELY (first_notification)) { - TnyAccount *account; - - first_notification = FALSE; - - /* Set the led pattern */ - 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); - - /* Set the account of the headers */ - account = tny_folder_get_account (folder); - if (account) { - notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification), - "email-account", - tny_account_get_id (account)); - 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 */ + 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); + } - /* 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"); - } + /* Play sound */ + modest_platform_play_email_tone (); + if (notify_notification_show (NOTIFY_NOTIFICATION (notification), NULL)) { + GSList *notifications_list = NULL; + + /* 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 */ - g_free (display_address); - g_free (url); - g_object_unref (folder); - g_object_unref (header); - tny_iterator_next (iter); - } - g_object_unref (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*/ } @@ -1785,7 +1813,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) @@ -1808,8 +1836,23 @@ modest_platform_information_banner (GtkWidget *parent, return; } + modest_platform_system_banner (banner_parent, icon_name, text); +} - banner = hildon_banner_show_information (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 (parent, icon_name, text); modest_window_mgr_register_banner (mgr); g_object_ref (mgr); @@ -1993,8 +2036,8 @@ modest_platform_run_certificate_confirmation_dialog (const gchar* server_name, win = MODEST_WINDOW (hildon_window_stack_peek (stack)); if (!win) { - g_warning ("%s: don't show dialogs if there's no window shown; assuming 'Cancel'", - __FUNCTION__); + g_debug ("%s: don't show dialogs if there's no window shown; assuming 'Cancel'", + __FUNCTION__); return FALSE; } @@ -2036,8 +2079,8 @@ modest_platform_run_alert_dialog (const gchar* prompt, top_win = MODEST_WINDOW (hildon_window_stack_peek (stack)); if (!top_win) { - g_warning ("%s: don't show dialogs if there's no window shown; assuming 'Cancel'", - __FUNCTION__); + g_debug ("%s: don't show dialogs if there's no window shown; assuming 'Cancel'", + __FUNCTION__); return FALSE; } @@ -2534,7 +2577,7 @@ modest_platform_run_header_details_dialog (GtkWindow *parent_window, } /* Run dialog */ - modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), parent_window); gtk_widget_show_all (dialog); @@ -2551,7 +2594,7 @@ modest_platform_get_osso_context (void) } static void -_modest_platform_play_email_tone (void) +modest_platform_play_email_tone (void) { gchar *mail_tone; gint mail_volume_int; @@ -2617,6 +2660,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) { @@ -2666,6 +2755,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); }