X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-platform.c;h=e857ca90150d304965fda56871b2ac6e1118078c;hp=7a451b5f67da89cf48b8a0e3f34489e520dbde67;hb=c0b1c1933798d66e0b0c4937b148bac4e546cafd;hpb=a51b8c5d142db46e4d6828c054eb491bf7e1bd04 diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c index 7a451b5..e857ca9 100644 --- a/src/hildon2/modest-platform.c +++ b/src/hildon2/modest-platform.c @@ -107,6 +107,7 @@ #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; @@ -474,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); @@ -488,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); @@ -688,12 +690,13 @@ folder_chooser_activated (ModestFolderView *folder_view, 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 (); @@ -709,31 +712,28 @@ folder_chooser_dialog_run (ModestFolderView *original, 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_strdup (modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (original))); + visible_id = g_object_get_data ((GObject *) picker, FOLDER_PICKER_ORIGINAL_ACCOUNT); else - visible_id = g_strdup (tny_account_get_id (TNY_ACCOUNT (current))); - } else if (TNY_IS_FOLDER (current) && !TNY_IS_MERGE_FOLDER (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) { if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (account)) || modest_tny_account_is_memory_card_account (TNY_ACCOUNT (account))) { - visible_id = - g_strdup (modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (original))); + visible_id = g_object_get_data ((GObject *) picker, FOLDER_PICKER_ORIGINAL_ACCOUNT); } else { - visible_id = g_strdup (tny_account_get_id (account)); + 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); @@ -922,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; @@ -948,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); @@ -976,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; @@ -1466,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, @@ -1574,10 +1605,12 @@ modest_platform_on_new_headers_received (GList *URI_list, 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) + /* If the screen is on and the app is in the foreground we + don't show anything, just play a chime */ + if (screen_on && app_in_foreground) { + modest_platform_play_email_tone (); return; + } if (g_list_length (URI_list) == 0) return; @@ -1618,6 +1651,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), @@ -1781,11 +1818,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; } @@ -2044,14 +2076,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); @@ -2900,13 +2935,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 @@ -2949,7 +2985,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); } }