#include <gtk/gtkmain.h>
#include <modest-text-utils.h>
#include "modest-tny-folder.h"
+#include "modest-tny-account.h"
#include <string.h>
#include <libgnomevfs/gnome-vfs-mime-utils.h>
/* Register hardware event dbus callback: */
hw_state.shutdown_ind = TRUE;
- osso_hw_set_event_cb(osso_context, NULL,/*&hw_state*/ modest_osso_cb_hw_state_handler, NULL);
+ osso_hw_set_event_cb(osso_context, NULL, NULL, NULL);
/* Register osso auto-save callbacks: */
result = osso_application_set_autosave_cb (osso_context,
g_free (chars);
}
+static guint
+checked_hildon_sort_dialog_add_sort_key (HildonSortDialog *dialog, const gchar* key, guint max)
+{
+ gint sort_key;
+
+ g_return_val_if_fail (dialog && HILDON_IS_SORT_DIALOG(dialog), 0);
+ g_return_val_if_fail (key, 0);
+
+ sort_key = hildon_sort_dialog_add_sort_key (dialog, key);
+ if (sort_key < 0 || sort_key >= max) {
+ g_warning ("%s: out of range (%d) for %s", __FUNCTION__, sort_key, key);
+ return 0;
+ } else
+ return (guint)sort_key;
+}
+
+
static void
launch_sort_headers_dialog (GtkWindow *parent_window,
HildonSortDialog *dialog)
outgoing = (GPOINTER_TO_INT (g_object_get_data(G_OBJECT(cols->data), MODEST_HEADER_VIEW_COLUMN))==
MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT);
- sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_sender_recipient"));
+ sort_key = checked_hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_sender_recipient"),
+ SORT_ID_NUM - 1);
if (outgoing) {
sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN;
sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT;
sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN;
}
- sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_date"));
+ sort_key = checked_hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_date"),
+ SORT_ID_NUM - 1);
if (outgoing) {
sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN;
sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE;
}
default_key = sort_key;
- sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_subject"));
+ sort_key = checked_hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_subject"),
+ SORT_ID_NUM -1);
sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN;
if (outgoing)
sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT;
else
sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN;
- sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_attachment"));
+ sort_key = checked_hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_attachment"),
+ SORT_ID_NUM - 1);
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_key = checked_hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_size"),
+ SORT_ID_NUM - 1);
sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN;
sort_ids[sort_key] = 0;
- sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_priority"));
+ sort_key = checked_hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_priority"),
+ SORT_ID_NUM - 1);
sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN;
sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY_MASK;
priority_sort_id = sort_key;
result = gtk_dialog_run (GTK_DIALOG (dialog));
if (result == GTK_RESPONSE_OK) {
sort_key = hildon_sort_dialog_get_sort_key (dialog);
+ if (sort_key < 0 || sort_key > SORT_ID_NUM -1) {
+ g_warning ("%s: out of range (%d)", __FUNCTION__, sort_key);
+ sort_key = 0;
+ }
+
sort_type = hildon_sort_dialog_get_sort_order (dialog);
if (sort_model_ids[sort_key] == TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN) {
g_object_set_data (G_OBJECT(cols->data), MODEST_HEADER_VIEW_FLAG_SORT,
modest_widget_memory_save (modest_runtime_get_conf (),
G_OBJECT (header_view), MODEST_CONF_HEADER_VIEW_KEY);
-/* while (gtk_events_pending ()) */
-/* gtk_main_iteration (); */
-
/* free */
g_list_free(cols);
}
GList *child_vbox, *child_hbox;
GtkWidget *hbox, *entry;
TnyFolderStore *parent;
+ const gchar *new_name;
+ gboolean exists;
if (response != GTK_RESPONSE_ACCEPT)
return;
-
+
/* Get entry */
child_vbox = gtk_container_get_children (GTK_CONTAINER (dialog->vbox));
hbox = child_vbox->data;
child_hbox = gtk_container_get_children (GTK_CONTAINER (hbox));
entry = child_hbox->next->data;
-
+
parent = TNY_FOLDER_STORE (user_data);
-
+ new_name = gtk_entry_get_text (GTK_ENTRY (entry));
+ exists = FALSE;
+
/* Look for another folder with the same name */
if (modest_tny_folder_has_subfolder_with_name (parent,
- gtk_entry_get_text (GTK_ENTRY (entry)),
+ new_name,
TRUE)) {
-
+ exists = TRUE;
+ }
+
+ if (!exists) {
+ if (TNY_IS_ACCOUNT (parent) &&
+ modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (parent)) &&
+ modest_tny_local_folders_account_folder_name_in_use (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (parent),
+ new_name)) {
+ exists = TRUE;
+ }
+ }
+
+ if (exists) {
+
/* Show an error */
hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (dialog)),
NULL, _CS("ckdg_ib_folder_already_exists"));
gboolean device_online;
TnyDevice *device;
TnyConnectionStatus conn_status;
+ gboolean user_requested;
device = modest_runtime_get_device();
device_online = tny_device_is_online (device);
+ /* Whether the connection is user requested or automatically
+ requested, for example via D-Bus */
+ user_requested = (parent_window) ? TRUE : FALSE;
+
/* If there is no account check only the device status */
if (!account) {
if (device_online)
return TRUE;
else
- return tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device), NULL);
+ return tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device),
+ NULL, user_requested);
}
/* Return if the account is already connected */
G_CALLBACK (on_connection_status_changed),
data);
/* Try to connect the device */
- device_online = tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device), NULL);
+ device_online = tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device),
+ NULL, user_requested);
/* If the device connection failed then exit */
if (!device_online && data->handler)
void
modest_platform_connect_and_perform (GtkWindow *parent_window,
- TnyAccount *account, ModestConnectedPerformer callback, gpointer user_data)
+ TnyAccount *account,
+ ModestConnectedPerformer callback,
+ gpointer user_data)
{
gboolean device_online;
TnyDevice *device;
TnyConnectionStatus conn_status;
OnWentOnlineInfo *info;
+ gboolean user_requested;
device = modest_runtime_get_device();
device_online = tny_device_is_online (device);
+ /* Whether the connection is user requested or automatically
+ requested, for example via D-Bus */
+ user_requested = (parent_window) ? TRUE : FALSE;
+
/* If there is no account check only the device status */
if (!account) {
info->callback = callback;
tny_maemo_conic_device_connect_async (TNY_MAEMO_CONIC_DEVICE (device), NULL,
- on_conic_device_went_online, info);
+ user_requested, on_conic_device_went_online,
+ info);
/* We'll cleanup in on_conic_device_went_online */
}
* and the account */
tny_maemo_conic_device_connect_async (TNY_MAEMO_CONIC_DEVICE (device), NULL,
- on_conic_device_went_online, info);
+ user_requested, on_conic_device_went_online,
+ info);
} else {
}
void
-modest_platform_connect_and_perform_if_network_folderstore (GtkWindow *parent_window, TnyFolderStore *folder_store,
- ModestConnectedPerformer callback, gpointer user_data)
+modest_platform_connect_and_perform_if_network_folderstore (GtkWindow *parent_window,
+ TnyFolderStore *folder_store,
+ ModestConnectedPerformer callback,
+ gpointer user_data)
{
if (!folder_store) {
projects / modest / blobdiff