#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);
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");
static TnyFolderStore *
folder_chooser_dialog_run (ModestFolderView *original,
- TnyFolderStore *current)
+ TnyFolderStore *current,
+ GtkButton *picker)
{
GtkWidget *folder_view;
FolderChooserData userdata = {NULL, NULL};
GtkWidget *pannable;
- gchar *visible_id = NULL;
+ const gchar *visible_id = NULL;
userdata.dialog = hildon_dialog_new ();
pannable = hildon_pannable_area_new ();
MODEST_FOLDER_VIEW (folder_view));
if (TNY_IS_ACCOUNT (current)) {
- /* If the current account is the local folders account
- then it's because we're creating a new folder from
- folders view (we force the local account to be the
- default location for new folders */
- if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (current)))
- visible_id =
- g_strdup (modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (original)));
+ /* 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 = g_strdup (tny_account_get_id (TNY_ACCOUNT (current)));
+ visible_id = tny_account_get_id (TNY_ACCOUNT (current));
} else if (TNY_IS_FOLDER (current)) {
TnyAccount *account;
- account = tny_folder_get_account (TNY_FOLDER (current));
+ account = modest_tny_folder_get_account ((TnyFolder *) current);
if (account) {
- visible_id = g_strdup (tny_account_get_id (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 = g_strdup (
- modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(original)));
+ 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);
- g_free (visible_id);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (userdata.dialog)->vbox), pannable);
gtk_container_add (GTK_CONTAINER (pannable), folder_view);
current = g_object_get_data (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER);
- store = folder_chooser_dialog_run (helper->folder_view, current);
+ store = folder_chooser_dialog_run (helper->folder_view, current, button);
if (store) {
const gchar *current_name;
gboolean exists = FALSE;
hildon_button_set_alignment (HILDON_BUTTON (button), 0.0, 0.5, 1.0, 1.0);
- if (suggested)
+ if (suggested) {
+ const gchar *acc_id = NULL;
+
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)
+ 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 *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);
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);
}
}
projects / modest / blobdiff