#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 void _modest_platform_play_email_tone (void);
+
+static void modest_platform_play_email_tone (void);
static void
static gboolean
check_required_files (void)
{
- FILE *mcc_file = modest_utils_open_mcc_mapping_file (NULL);
+ FILE *mcc_file = modest_utils_open_mcc_mapping_file (FALSE, NULL);
if (!mcc_file) {
- g_printerr ("modest: check for mcc file failed\n");
+ g_printerr ("modest: check for mcc file (for LANG) failed\n");
+ return FALSE;
+ } else
+ fclose (mcc_file);
+
+ mcc_file = modest_utils_open_mcc_mapping_file (TRUE, NULL);
+ if (!mcc_file) {
+ g_printerr ("modest: check for mcc file (for LC_MESSAGES) failed\n");
return FALSE;
} else
fclose (mcc_file);
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");
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;
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);
}
parent = g_object_get_data (G_OBJECT (picker), FOLDER_PICKER_CURRENT_FOLDER);
/* Look for another folder with the same name */
- if (modest_tny_folder_has_subfolder_with_name (parent, new_name, TRUE))
+ if (!TNY_IS_MERGE_FOLDER (parent) &&
+ modest_tny_folder_has_subfolder_with_name (parent, new_name, TRUE))
exists = TRUE;
if (!exists) {
}
static TnyFolderStore *
-folder_chooser_dialog_run (ModestFolderView *original)
+folder_chooser_dialog_run (ModestFolderView *original,
+ TnyFolderStore *current,
+ GtkButton *picker)
{
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));
- 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_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);
+ }
+ } 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);
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) {
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, button);
if (store) {
const gchar *current_name;
- gboolean exists;
+ gboolean exists = FALSE;
folder_picker_set_store (GTK_BUTTON (button), store);
/* Update the name of the folder */
current_name = gtk_entry_get_text (helper->entry);
- exists = modest_tny_folder_has_subfolder_with_name (store,
- current_name,
- TRUE);
+
+ if (TNY_IS_FOLDER_STORE (store))
+ exists = modest_tny_folder_has_subfolder_with_name (store,
+ current_name,
+ TRUE);
if (exists) {
gchar *new_name = get_next_folder_name (NULL, store);
gtk_entry_set_text (helper->entry, new_name);
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);
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 */
ModestConf *conf = modest_runtime_get_conf ();
if (!conf)
return FALSE;
-
+
+ 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: */
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);
}
if (!alarm_cookie) {
/* Error */
- g_debug ("Error setting alarm event. \n");
+ g_warning ("Error setting alarm event. \n");
return FALSE;
}
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 */
}
}
-void
-modest_platform_on_new_headers_received (TnyList *header_list,
+void
+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) == 0) {
- g_warning ("%s: header list is empty", __FUNCTION__);
+ /* 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 (!show_visual) {
- modest_platform_push_email_notification ();
- /* We do a return here to avoid indentation with an else */
+ 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 */
+ 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);
+ }
- /* 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);
+ } else {
+ g_warning ("Failed to send notification");
+ }
- g_slist_free (notifications_list);
-
#endif /*MODEST_HAVE_HILDON_NOTIFY*/
}
}
}
-GtkWidget *
-modest_platform_create_folder_view (TnyFolderStoreQuery *query)
+static GtkWidget *
+modest_platform_create_folder_view_full (TnyFolderStoreQuery *query, gboolean do_refresh)
{
- GtkWidget *widget = modest_folder_view_new (query);
+ GtkWidget *widget = modest_folder_view_new_full (query, do_refresh);
/* Show one account by default */
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;
}
+GtkWidget *
+modest_platform_create_folder_view (TnyFolderStoreQuery *query)
+{
+ return modest_platform_create_folder_view_full (query, TRUE);
+}
+
void
banner_finish (gpointer data, GObject *object)
{
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);
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;
}
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);
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;
}
}
/* 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);
}
static void
-_modest_platform_play_email_tone (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;
#ifdef MODEST_USE_PROFILE
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));
+ 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;
}
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);
#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)
{
GtkWidget *action_button;
GtkWidget *image = NULL;
TnyAccount *account;
- gchar *account_name = NULL;
+ gchar *account_name = NULL, *short_name = NULL;
action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
g_object_unref (account);
/* Set title of button: account or folder name */
- if (TNY_IS_FOLDER (folder_store)) {
- hildon_button_set_title (HILDON_BUTTON (action_button),
- tny_folder_get_name (TNY_FOLDER (folder_store)));
- } else {
- hildon_button_set_title (HILDON_BUTTON (action_button), account_name);
- }
+ if (TNY_IS_FOLDER (folder_store))
+ short_name = folder_store_get_display_name (folder_store);
+ else
+ short_name = g_strdup (account_name);
+
+ hildon_button_set_title (HILDON_BUTTON (action_button), short_name);
/* Set value of button, folder full name */
if (TNY_IS_CAMEL_FOLDER (folder_store)) {
- gchar *full_name = g_strconcat (account_name, MOVE_TO_FOLDER_SEPARATOR,
- tny_camel_folder_get_full_name (TNY_CAMEL_FOLDER (folder_store)),
- NULL);
+ const gchar *camel_full_name;
+ gchar *last_slash, *full_name;
+
+ camel_full_name = tny_camel_folder_get_full_name (TNY_CAMEL_FOLDER (folder_store));
+ last_slash = g_strrstr (camel_full_name, "/");
+ if (last_slash) {
+ gchar *prefix = g_strndup (camel_full_name, last_slash - camel_full_name + 1);
+ full_name = g_strconcat (account_name, MOVE_TO_FOLDER_SEPARATOR, prefix, short_name, NULL);
+ g_free (prefix);
+ } else {
+ full_name = g_strconcat (account_name, MOVE_TO_FOLDER_SEPARATOR,
+ short_name,
+ NULL);
+ }
+ translate_path (&full_name);
hildon_button_set_value (HILDON_BUTTON (action_button), full_name);
g_free (full_name);
}
g_free (account_name);
+ g_free (short_name);
/* Set image for the button */
image = get_image_for_folder_store (folder_store, MODEST_ICON_SIZE_BIG);
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);
on_move_to_dialog_action_clicked (GtkButton *selection,
gpointer user_data)
{
- TnyFolderStore *selected;
GtkWidget *dialog;
- GtkWidget *folder_view;
gboolean showing_folders;
dialog = (GtkWidget *) user_data;
showing_folders = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS));
if (showing_folders) {
+ TnyFolderStore *selected;
+ GtkWidget *folder_view;
+
folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
- if (selected)
- gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+ if (selected) {
+ /* 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);
+ }
}
}
+static void
+move_to_dialog_activity_changed (ModestFolderView *folder_view, gboolean activity, GtkDialog *dialog)
+{
+ hildon_gtk_window_set_progress_indicator (GTK_WINDOW (dialog), activity?1:0);
+}
+
GtkWidget *
modest_platform_create_move_to_dialog (GtkWindow *parent_window,
GtkWidget **folder_view)
top_vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
/* Create folder view */
- *folder_view = modest_platform_create_folder_view (NULL);
+ *folder_view = modest_platform_create_folder_view_full (NULL, FALSE);
+ g_signal_connect (G_OBJECT (*folder_view), "activity-changed", G_CALLBACK (move_to_dialog_activity_changed),
+ dialog);
modest_folder_view_set_cell_style (MODEST_FOLDER_VIEW (*folder_view),
MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT);
projects / modest / blobdiff