X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-platform.c;h=ea4b9e872b27ab2bd3e6e55001d9262394bf85eb;hb=1582b0d179634d2e877641f8bd7e18ce1698ef52;hp=3161437e042b832ce9aa78a82e0e1972ec3d93ff;hpb=588b6c9779f0de4b0b63c685aa2b74efd1fb09df;p=modest diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c index 3161437..ea4b9e8 100644 --- a/src/hildon2/modest-platform.c +++ b/src/hildon2/modest-platform.c @@ -107,8 +107,11 @@ #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); @@ -163,23 +166,16 @@ gboolean 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"); @@ -479,9 +475,9 @@ modest_platform_show_uri_popup (const gchar *uri) * and/or might have security implications * we still allow to copy the url though */ - if (!g_str_has_prefix (uri, "file:")) { - - GSList *node; + if (!g_str_has_prefix (uri, "file:")) { + + GSList *node; popup_info->actions = actions_list; popup_info->uri = g_strdup (uri); @@ -493,6 +489,7 @@ modest_platform_show_uri_popup (const gchar *uri) 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); @@ -692,12 +689,14 @@ folder_chooser_activated (ModestFolderView *folder_view, } static TnyFolderStore * -folder_chooser_dialog_run (ModestFolderView *original, TnyFolderStore *current) +folder_chooser_dialog_run (ModestFolderView *original, + 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 (); @@ -705,30 +704,36 @@ folder_chooser_dialog_run (ModestFolderView *original, TnyFolderStore *current) 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)) { - 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))); + 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); } - } - - if (visible_id == NULL) { - visible_id = g_strdup ( - modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(original))); + } 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); - g_free (visible_id); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (userdata.dialog)->vbox), pannable); gtk_container_add (GTK_CONTAINER (pannable), folder_view); @@ -917,7 +922,7 @@ folder_picker_clicked (GtkButton *button, 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; @@ -943,15 +948,37 @@ static GtkWidget * 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); @@ -971,7 +998,7 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, 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; @@ -1134,14 +1161,16 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, 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 */ @@ -1459,7 +1488,16 @@ modest_platform_set_update_interval (guint minutes) 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, @@ -1611,6 +1649,10 @@ modest_platform_on_new_headers_received (GList *URI_list, -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), @@ -1774,11 +1816,6 @@ modest_platform_create_folder_view_full (TnyFolderStoreQuery *query, gboolean do 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; } @@ -2037,14 +2074,17 @@ modest_platform_run_certificate_confirmation_dialog (const gchar* server_name, 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); @@ -2587,7 +2627,6 @@ 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 @@ -2615,14 +2654,15 @@ modest_platform_play_email_tone (void) 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; } @@ -2634,7 +2674,6 @@ modest_platform_play_email_tone (void) 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); @@ -2894,13 +2933,14 @@ on_move_to_dialog_row_activated (GtkTreeView *tree_view, 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 @@ -2943,7 +2983,14 @@ on_move_to_dialog_action_clicked (GtkButton *selection, 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); } }