#include <modest-platform.h>
#include <modest-defs.h>
+#include <modest-scrollable.h>
#include <modest-runtime.h>
-#include <modest-main-window.h>
#include <modest-header-view.h>
#include "modest-hildon2-global-settings-dialog.h"
#include "modest-widget-memory.h"
#include <modest-maemo-utils.h>
#include <modest-utils.h>
#include <dbus_api/modest-dbus-callbacks.h>
-#include <modest-osso-autosave-callbacks.h>
#include <libosso.h>
#include <tny-maemo-conic-device.h>
#include <tny-camel-folder.h>
#include <hildon/hildon.h>
#include <osso-mem.h>
#include "hildon2/modest-hildon2-details-dialog.h"
-#include "hildon2/modest-hildon2-window-mgr.h"
+#include "widgets/modest-window-mgr.h"
+#include "widgets/modest-msg-view-window.h"
#ifdef MODEST_USE_PROFILE
-#include <keys_nokia.h>
-#include <libprofile.h>
+#include <profiled/keys_nokia.h>
+#include <profiled/libprofile.h>
#endif
#include <canberra.h>
#include <modest-datetime-formatter.h>
#include <modest-selector-picker.h>
#include <modest-icon-names.h>
#include <modest-count-stream.h>
+#include <math.h>
#ifdef MODEST_HAVE_MCE
#include <mce/dbus-names.h>
#define HILDON_OSSO_URI_ACTION "uri-action"
#define URI_ACTION_COPY "copy:"
#define MODEST_NOTIFICATION_CATEGORY "email-message"
-#define MODEST_NEW_MAIL_LIGHTING_PATTERN "PatternCommunicationEmail"
+#define MODEST_NEW_MAIL_LIGHTING_PATTERN "PatternChatAndEmail"
#ifdef MODEST_USE_PROFILE
#define PROFILE_MAIL_TONE PROFILEKEY_EMAIL_ALERT_TONE
#define PROFILE_MAIL_VOLUME PROFILEKEY_EMAIL_ALERT_VOLUME
#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);
+
+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 (FALSE, NULL);
+ FILE *mcc_file = modest_utils_open_mcc_mapping_file ();
+
if (!mcc_file) {
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
+ } else {
fclose (mcc_file);
-
+ }
+
if (access(MODEST_PROVIDER_DATA_FILE, R_OK) != 0 &&
access(MODEST_FALLBACK_PROVIDER_DATA_FILE, R_OK) != 0) {
g_printerr ("modest: cannot find providers data\n");
return FALSE;
}
-
+
return TRUE;
}
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");
hw_state.shutdown_ind = TRUE;
osso_hw_set_event_cb(osso_context, NULL, NULL, NULL);
- /* Register osso auto-save callbacks: */
- result = osso_application_set_autosave_cb (osso_context,
- modest_on_osso_application_autosave, NULL /* user_data */);
- if (result != OSSO_OK) {
- g_printerr ("modest: osso_application_set_autosave_cb() failed.\n");
- return FALSE;
- }
-
-
/* Make sure that the update interval is changed whenever its gconf key
* is changed */
/* CAUTION: we're not using here the
HildonURIAction *action;
gboolean result = FALSE;
GSList *actions, *iter = NULL;
-
+
g_return_val_if_fail (uri, FALSE);
if (!uri)
return FALSE;
/* don't try to activate file: uri's -- they might confuse the user,
* and/or might have security implications */
if (!g_str_has_prefix (uri, "file:")) {
-
+
actions = hildon_uri_get_actions_by_uri (uri, -1, NULL);
-
+
for (iter = actions; iter; iter = g_slist_next (iter)) {
action = (HildonURIAction*) iter->data;
if (action && strcmp (hildon_uri_action_get_service (action),
break;
}
}
-
+
/* if we could not open it with email, try something else */
if (!result)
- result = checked_hildon_uri_open (uri, NULL);
- }
-
+ result = checked_hildon_uri_open (uri, NULL);
+ }
+
if (!result) {
ModestWindow *parent =
- modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE);
+ modest_window_mgr_get_current_top (modest_runtime_get_window_mgr());
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;
}
/* if it's a copy thingy, the uri will look like 'copy:http://slashdot.org' */
if (g_str_has_prefix (action_name, URI_ACTION_COPY)) {
GtkClipboard *clipboard = gtk_clipboard_get (GDK_NONE);
- action_name += strlen(URI_ACTION_COPY); /* jump past the prefix */
+ const gchar *uri = (const gchar *) popup_info->uri;
- if (g_str_has_prefix (action_name, "mailto:")) /* ignore mailto: prefixes */
- action_name += strlen ("mailto:");
-
- gtk_clipboard_set_text (clipboard, action_name, strlen (action_name));
- modest_platform_information_banner (NULL, NULL, _CS("ecoc_ib_edwin_copied"));
+ /* Special case: ignore "mailto:" prefixes */
+ if (g_str_has_prefix (uri, "mailto:"))
+ uri = popup_info->uri + strlen ("mailto:");
+
+ gtk_clipboard_set_text (clipboard, uri, strlen (uri));
+ modest_platform_information_banner (NULL, NULL, _CS_COPIED);
return; /* we're done */
}
-
+
/* now, the real uri-actions... */
for (node = popup_info->actions; node != NULL; node = g_slist_next (node)) {
HildonURIAction *action = (HildonURIAction *) node->data;
if (strcmp (action_name, hildon_uri_action_get_name (action))==0) {
if (!checked_hildon_uri_open (popup_info->uri, action)) {
ModestWindow *parent =
- modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE);
+ modest_window_mgr_get_current_top (modest_runtime_get_window_mgr());
hildon_banner_show_information (parent ? GTK_WIDGET(parent): NULL, NULL,
_("mcen_ib_unsupported_link"));
}
}
}
-gboolean
+gboolean
modest_platform_show_uri_popup (const gchar *uri)
{
- GSList *actions_list;
+ GSList *actions_list, *node;
+ GtkWidget *menu;
+ ModestPlatformPopupInfo *popup_info;
+ GtkWidget *menu_item;
if (uri == NULL)
return FALSE;
-
- actions_list = hildon_uri_get_actions_by_uri (uri, -1, NULL);
- if (actions_list) {
-
- GtkWidget *menu = gtk_menu_new ();
- ModestPlatformPopupInfo *popup_info = g_new0 (ModestPlatformPopupInfo, 1);
- /* don't add actions for file: uri's -- they might confuse the user,
- * and/or might have security implications
- * we still allow to copy the url though
- */
- if (!g_str_has_prefix (uri, "file:")) {
-
- GSList *node;
- popup_info->actions = actions_list;
- popup_info->uri = g_strdup (uri);
-
- for (node = actions_list; node != NULL; node = g_slist_next (node)) {
- GtkWidget *menu_item;
- const gchar *action_name;
- const gchar *translation_domain;
- HildonURIAction *action = (HildonURIAction *) node->data;
- 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));
- 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);
-
- if (hildon_uri_is_default_action (action, NULL)) {
- gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item);
- } else {
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
- }
- gtk_widget_show (menu_item);
- }
- }
+ /* Create menu */
+ menu = gtk_menu_new ();
+ popup_info = g_new0 (ModestPlatformPopupInfo, 1);
+ popup_info->uri = g_strdup (uri);
+ /* don't add actions for file: uri's -- they might confuse the user,
+ * and/or might have security implications
+ * we still allow to copy the url though
+ */
+ if (g_str_has_prefix (uri, "file:"))
+ goto add_copy_link;
- /* and what to do when the link is deleted */
- g_signal_connect (G_OBJECT (menu), "delete-event", G_CALLBACK (delete_uri_popup), popup_info);
- gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 1, gtk_get_current_event_time ());
+ actions_list = hildon_uri_get_actions_by_uri (uri, -1, NULL);
+ if (!actions_list)
+ goto add_copy_link;
- } else {
- hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link"));
+ popup_info->actions = actions_list;
+ for (node = actions_list; node != NULL; node = g_slist_next (node)) {
+ const gchar *action_name;
+ const gchar *translation_domain;
+ HildonURIAction *action = (HildonURIAction *) node->data;
+ 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);
+
+ if (hildon_uri_is_default_action (action, NULL)) {
+ gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item);
+ } else {
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+ }
+ gtk_widget_show (menu_item);
}
+ add_copy_link:
+ /* Add the "Copy link" menu option */
+ menu_item = gtk_menu_item_new_with_label (_UR("uri_link_copy_link_location"));
+ hildon_gtk_widget_set_theme_size (menu_item, MODEST_EDITABLE_SIZE);
+ g_object_set_data (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION, (gpointer) URI_ACTION_COPY);
+ g_signal_connect (G_OBJECT (menu_item), "activate", (GCallback) activate_uri_popup_item, popup_info);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+ gtk_widget_show (menu_item);
+
+ /* and what to do when the link is deleted */
+ g_signal_connect (G_OBJECT (menu), "delete-event", G_CALLBACK (delete_uri_popup), popup_info);
+ gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 1, gtk_get_current_event_time ());
+
return TRUE;
}
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);
}
/* Show WID-INF036 */
if (chars_length >= 20) {
hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (data)), NULL,
- _CS("ckdg_ib_maximum_characters_reached"));
+ _CS_MAXIMUM_CHARACTERS_REACHED);
} else {
if (modest_text_utils_is_forbidden_char (*text, FOLDER_NAME_FORBIDDEN_CHARS)) {
/* Show an error */
tmp = g_strndup (folder_name_forbidden_chars,
FOLDER_NAME_FORBIDDEN_CHARS_LENGTH);
- msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp);
+ msg = g_strdup_printf (_CS_ILLEGAL_CHARACTERS_ENTERED, tmp);
hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (data)),
NULL, msg);
g_free (msg);
} else {
if (length >= 20) {
hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (data)), NULL,
- _CS("ckdg_ib_maximum_characters_reached"));
+ _CS_MAXIMUM_CHARACTERS_REACHED);
}
/* Write the text in the entry if it's valid */
g_signal_handlers_block_by_func (editable,
if (g_utf8_strlen (chars,-1) >= 20) {
hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (user_data)), NULL,
- _CS("ckdg_ib_maximum_characters_reached"));
+ _CS_MAXIMUM_CHARACTERS_REACHED);
}
gtk_widget_set_sensitive (ok_button, modest_text_utils_validate_folder_name(chars));
if (exists) {
/* Show an error */
hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (dialog)),
- NULL, _CS("ckdg_ib_folder_already_exists"));
+ NULL, _CS_FOLDER_ALREADY_EXISTS);
/* Select the text */
- gtk_entry_select_region (GTK_ENTRY (entry), 0, -1);
+ gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
gtk_widget_grab_focus (entry);
/* Do not close the dialog */
g_signal_stop_emission_by_name (dialog, "response");
}
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};
- GtkWidget *pannable;
+ GtkWidget *scrollable;
const gchar *visible_id = NULL;
- userdata.dialog = hildon_dialog_new ();
- pannable = hildon_pannable_area_new ();
+ userdata.dialog = gtk_dialog_new ();
+ scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
folder_view = modest_platform_create_folder_view (NULL);
- gtk_window_set_title (GTK_WINDOW (userdata.dialog), _FM("ckdg_ti_change_folder"));
+ gtk_window_set_title (GTK_WINDOW (userdata.dialog), _FM_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);
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (userdata.dialog)->vbox), pannable);
- gtk_container_add (GTK_CONTAINER (pannable), folder_view);
- gtk_widget_set_size_request (pannable, -1, 320);
+ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (userdata.dialog)->vbox), scrollable);
+ gtk_container_add (GTK_CONTAINER (scrollable), folder_view);
+ gtk_widget_set_size_request (scrollable, -1, 320);
gtk_widget_show (folder_view);
- gtk_widget_show (pannable);
+ gtk_widget_show (scrollable);
gtk_widget_show (userdata.dialog);
g_signal_connect (G_OBJECT (folder_view), "folder-activated",
G_CALLBACK (folder_chooser_activated),
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) {
get_next_folder_name (const gchar *suggested_name,
TnyFolderStore *suggested_folder)
{
- const gchar *default_name = _FM("ckdg_va_new_folder_name_stub");
+ const gchar *default_name = _FM_NEW_FOLDER_NAME_STUB;
unsigned int i;
gchar *real_suggested_name;
real_suggested_name = g_strdup (default_name);
else
real_suggested_name = g_strdup_printf ("%s(%d)",
- _FM("ckdg_va_new_folder_name_stub"),
+ _FM_NEW_FOLDER_NAME_STUB,
i);
exists = modest_tny_folder_has_subfolder_with_name (suggested_folder,
real_suggested_name,
folder_picker_clicked (GtkButton *button,
FolderPickerHelper *helper)
{
- TnyFolderStore *store;
+ TnyFolderStore *store, *current;
+
+ current = g_object_get_data (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER);
- store = folder_chooser_dialog_run (helper->folder_view);
+ store = folder_chooser_dialog_run (helper->folder_view, current, button);
if (store) {
const gchar *current_name;
gboolean exists = FALSE;
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);
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;
GtkSizeGroup *sizegroup;
ModestFolderView *folder_view;
ModestWindow *folder_window;
- ModestHildon2WindowMgr *window_mgr;
+ ModestWindowMgr *window_mgr;
FolderPickerHelper *helper = NULL;
GtkWidget *top_vbox, *top_align;
- window_mgr = (ModestHildon2WindowMgr *) modest_runtime_get_window_mgr ();
- folder_window = modest_hildon2_window_mgr_get_folder_window (window_mgr);
+ window_mgr = modest_runtime_get_window_mgr ();
+ folder_window = modest_window_mgr_get_folder_window (window_mgr);
g_return_val_if_fail (MODEST_IS_FOLDER_WINDOW (folder_window), GTK_RESPONSE_NONE);
folder_view = modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (folder_window));
dialog = gtk_dialog_new_with_buttons (dialog_title,
parent_window,
GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT,
- _FM("ckdg_bd_new_folder_dialog_ok"),
+ _FM_NEW_FOLDER_DIALOG_OK,
GTK_RESPONSE_ACCEPT,
NULL);
if (show_name) {
label_entry = gtk_label_new (label_text);
- entry = hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
+ entry = modest_toolkit_factory_create_entry (modest_runtime_get_toolkit_factory ());
gtk_entry_set_max_length (GTK_ENTRY (entry), 20);
gtk_misc_set_alignment (GTK_MISC (label_entry), 0.0, 0.5);
if (suggested_name)
gtk_entry_set_text (GTK_ENTRY (entry), suggested_name);
else
- gtk_entry_set_text (GTK_ENTRY (entry), _FM("ckdg_va_new_folder_name_stub"));
+ gtk_entry_set_text (GTK_ENTRY (entry), _FM_NEW_FOLDER_NAME_STUB);
gtk_entry_set_width_chars (GTK_ENTRY (entry),
MAX (g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (entry)), -1),
- g_utf8_strlen (_FM("ckdg_va_new_folder_name_stub"), -1)));
- gtk_entry_select_region (GTK_ENTRY (entry), 0, -1);
+ g_utf8_strlen (_FM_NEW_FOLDER_NAME_STUB, -1)));
+ gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
}
if (show_parent) {
- label_location = gtk_label_new (_FM("ckdg_fi_new_folder_location"));
+ label_location = gtk_label_new (_FM_NEW_FOLDER_LOCATION);
gtk_misc_set_alignment (GTK_MISC (label_location), 0.0, 0.5);
gtk_size_group_add_widget (sizegroup, label_location);
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 */
result = modest_platform_run_folder_common_dialog (parent_window,
suggested_folder,
_HL("ckdg_ti_new_folder"),
- _FM("ckdg_fi_new_folder_name"),
+ _FM_NEW_FOLDER_NAME,
real_suggested_name,
TRUE,
TRUE,
}
gint
-modest_platform_run_rename_folder_dialog (GtkWindow *parent_window,
+modest_platform_run_rename_folder_dialog (ModestWindow *parent_window,
TnyFolderStore *parent_folder,
const gchar *suggested_name,
gchar **folder_name)
{
g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent_folder), GTK_RESPONSE_REJECT);
- return modest_platform_run_folder_common_dialog (parent_window,
+ return modest_platform_run_folder_common_dialog ((GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) parent_window),
parent_folder,
_HL("ckdg_ti_rename_folder"),
_HL("ckdg_fi_rename_name"),
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_warning ("%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);
* (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_debug ("Error setting alarm event. \n");
-
+ g_warning ("Error setting alarm event. \n");
+
return FALSE;
}
-#endif /* MODEST_HAVE_LIBALARM */
+#endif /* MODEST_HAVE_LIBALARM */
return TRUE;
}
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,
+modest_platform_on_new_headers_received (GList *URI_list,
gboolean show_visual)
{
- g_return_if_fail (TNY_IS_LIST (header_list));
-
- if (tny_list_get_length (header_list) < 1)
+ /* Check if the user wants to show notifications or not */
+ if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_NOTIFICATIONS, NULL))
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 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 */
- 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");
- }
+ 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*/
}
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;
}
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);
+}
- 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);
{
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: */
++(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. */
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;
}
/***************/
typedef struct {
- GtkWindow *parent_window;
+ ModestWindow *parent_window;
ModestConnectedPerformer callback;
TnyAccount *account;
gpointer user_data;
}
void
-modest_platform_connect_and_perform (GtkWindow *parent_window,
+modest_platform_connect_and_perform (ModestWindow *parent_window,
gboolean force,
TnyAccount *account,
ModestConnectedPerformer callback,
info->account = NULL;
if (parent_window)
- info->parent_window = (GtkWindow *) g_object_ref (parent_window);
+ info->parent_window = (ModestWindow *) g_object_ref (parent_window);
else
info->parent_window = NULL;
info->user_data = user_data;
info->account = TNY_ACCOUNT (g_object_ref (account));
if (parent_window)
- info->parent_window = (GtkWindow *) g_object_ref (parent_window);
+ info->parent_window = (ModestWindow *) g_object_ref (parent_window);
else
info->parent_window = NULL;
}
void
-modest_platform_connect_if_remote_and_perform (GtkWindow *parent_window,
+modest_platform_connect_if_remote_and_perform (ModestWindow *parent_window,
gboolean force,
TnyFolderStore *folder_store,
ModestConnectedPerformer callback,
static void
src_account_connect_performer (gboolean canceled,
GError *err,
- GtkWindow *parent_window,
+ ModestWindow *parent_window,
TnyAccount *src_account,
gpointer user_data)
{
}
-void
-modest_platform_double_connect_and_perform (GtkWindow *parent_window,
+void
+modest_platform_double_connect_and_perform (ModestWindow *parent_window,
gboolean force,
TnyFolderStore *folder_store,
DoubleConnectionInfo *connect_info)
{
- modest_platform_connect_if_remote_and_perform(parent_window,
+ modest_platform_connect_if_remote_and_perform(parent_window,
force,
folder_store,
src_account_connect_performer,
GtkWidget *dialog;
/* Create dialog */
- dialog = modest_hildon2_details_dialog_new_with_folder (parent_window, folder);
+ dialog = modest_toolkit_factory_create_details_dialog_with_folder (modest_runtime_get_toolkit_factory (),
+ parent_window, folder);
/* Run dialog */
modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
GtkWidget *dialog;
/* Create dialog */
- dialog = modest_hildon2_details_dialog_new_with_header (parent_window, header, !async_get_size);
+ dialog = modest_toolkit_factory_create_details_dialog_with_header (modest_runtime_get_toolkit_factory (),
+ parent_window, header, !async_get_size);
if (async_get_size && msg && TNY_IS_MSG (msg)) {
HeaderDetailsGetSizeInfo *info;
}
/* 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);
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)
+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;
g_free (mail_volume);
g_free (active_profile);
#else
- mail_tone = MAIL_TONE;
+ mail_tone = g_strdup (MAIL_TONE);
mail_volume_int = 100;
#endif
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);
#define MOVE_TO_DIALOG_BACK_BUTTON "back-button"
#define MOVE_TO_DIALOG_ACTION_BUTTON "action-button"
#define MOVE_TO_DIALOG_SHOWING_FOLDERS "showing-folders"
-#define MOVE_TO_DIALOG_PANNABLE "pannable"
+#define MOVE_TO_DIALOG_SCROLLABLE "scrollable"
#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);
}
{
GtkWidget *back_button;
GtkWidget *folder_view;
- GtkWidget *pannable;
+ GtkWidget *scrollable;
GtkWidget *action_button;
back_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON));
action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
- pannable = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE));
+ scrollable = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SCROLLABLE));
gtk_widget_set_sensitive (back_button, FALSE);
gtk_widget_set_sensitive (action_button, FALSE);
MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS);
modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view),
MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS);
- hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (pannable), 0, 0);
+ modest_scrollable_jump_to (MODEST_SCROLLABLE (scrollable), 0, 0);
}
static void
GtkWidget *folder_view;
TnyAccount *account;
const gchar *account_id;
- GtkWidget *pannable;
+ GtkWidget *scrollable;
GtkWidget *action_button;
back_button =
GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
folder_view =
GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
- pannable =
- GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE));
+ scrollable =
+ GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SCROLLABLE));
gtk_widget_set_sensitive (back_button, TRUE);
gtk_widget_set_sensitive (action_button, TRUE);
modest_folder_view_set_style (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS);
modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS);
- hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (pannable), 0, 0);
+ modest_scrollable_jump_to (MODEST_SCROLLABLE (scrollable), 0, 0);
}
static void
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
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);
}
}
GTK_WINDOW (parent_window),
GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR |
GTK_DIALOG_DESTROY_WITH_PARENT,
- _HL("wdgt_bd_new"), MODEST_GTK_RESPONSE_NEW_FOLDER,
+ _FM_CHANGE_FOLDER_NEW_FOLDER,
+ MODEST_GTK_RESPONSE_NEW_FOLDER,
NULL);
align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
buttons_hbox = gtk_hbox_new (FALSE, MODEST_MARGIN_HALF);
back_button = gtk_button_new ();
- back_pixbuf = modest_platform_get_icon (_FM("filemanager_folder_up"), MODEST_ICON_SIZE_BIG);
+ back_pixbuf = modest_platform_get_icon (_FM_FOLDER_UP, MODEST_ICON_SIZE_BIG);
if (back_pixbuf) {
gtk_button_set_image (GTK_BUTTON (back_button), gtk_image_new_from_pixbuf (back_pixbuf));
g_object_unref (back_pixbuf);
gtk_widget_set_sensitive (GTK_WIDGET (action_button), FALSE);
gtk_box_pack_start (GTK_BOX (top_vbox), buttons_hbox, FALSE, FALSE, 0);
- /* Create pannable and add it to the dialog */
- folder_view_container = hildon_pannable_area_new ();
+ /* Create scrollable and add it to the dialog */
+ folder_view_container = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
gtk_container_add (GTK_CONTAINER (folder_view_container), *folder_view);
gtk_box_pack_start (GTK_BOX (top_vbox), folder_view_container, TRUE, TRUE, 0);
g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW, *folder_view);
g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON, back_button);
g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON, action_button);
- g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE, folder_view_container);
+ g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SCROLLABLE, folder_view_container);
/* Simulate the behaviour of a HildonPickerDialog by emitting
a response when a folder is selected */