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);
}
}
static TnyFolderStore *
-folder_chooser_dialog_run (ModestFolderView *original, TnyFolderStore *current)
+folder_chooser_dialog_run (ModestFolderView *original,
+ TnyFolderStore *current)
{
GtkWidget *folder_view;
FolderChooserData userdata = {NULL, NULL};
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)) {
+ 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) {
- 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);
}
- }
-
- if (visible_id == NULL) {
+ } else {
visible_id = g_strdup (
modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(original)));
}
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) {
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 */
modest_platform_on_new_headers_received (GList *URI_list,
gboolean show_visual)
{
- if (g_list_length (URI_list) == 0)
+ gboolean screen_on, app_in_foreground;
+
+ /* 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;
- 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 */
+ 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 ();
- }
+ /* 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*/
}
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)
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);
#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)
{
short_name,
NULL);
}
+ translate_path (&full_name);
hildon_button_set_value (HILDON_BUTTON (action_button), full_name);
g_free (full_name);
}
projects / modest / blobdiff