X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-platform.c;h=7a15417a88fbfff91d268310c3bfa2b5e4dec94d;hp=e47bf1ffcab8aa26a23e0d7a0f014b823394d3d6;hb=d3152f5a6ea0f939f9535fd8024538d95f14b588;hpb=57fb485a6a6b019a9eb4ea4f8bc465dd4fdbfc47 diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c index e47bf1f..7a15417 100644 --- a/src/hildon2/modest-platform.c +++ b/src/hildon2/modest-platform.c @@ -79,6 +79,7 @@ #include #include #include +#include #ifdef MODEST_HAVE_MCE #include @@ -107,9 +108,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 gboolean ca_con_opened = FALSE; static void modest_platform_play_email_tone (void); @@ -474,9 +477,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 +491,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 +692,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 +714,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 +924,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 +950,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 +1000,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; @@ -1462,43 +1486,53 @@ gboolean 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_debug ("%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); @@ -1512,24 +1546,24 @@ modest_platform_set_update_interval (guint minutes) * (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_warning ("Error setting alarm event. \n"); - + return FALSE; } -#endif /* MODEST_HAVE_LIBALARM */ +#endif /* MODEST_HAVE_LIBALARM */ return TRUE; } @@ -1568,17 +1602,6 @@ void modest_platform_on_new_headers_received (GList *URI_list, gboolean show_visual) { - gboolean screen_on, app_in_foreground; - - /* Get the window status */ - 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) - return; - if (g_list_length (URI_list) == 0) return; @@ -1618,6 +1641,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), @@ -1645,8 +1672,6 @@ modest_platform_on_new_headers_received (GList *URI_list, g_object_unref (account); } - /* Play sound */ - modest_platform_play_email_tone (); if (notify_notification_show (NOTIFY_NOTIFICATION (notification), NULL)) { GSList *notifications_list = NULL; @@ -1781,11 +1806,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; } @@ -1905,17 +1925,14 @@ on_timeout_check_account_is_online(CheckAccountIdleData* data) { 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: */ @@ -1926,15 +1943,15 @@ on_timeout_check_account_is_online(CheckAccountIdleData* data) ++(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. */ @@ -2044,14 +2061,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); @@ -2588,6 +2608,19 @@ modest_platform_get_osso_context (void) 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) { @@ -2595,6 +2628,7 @@ modest_platform_play_email_tone (void) gint mail_volume_int; int ret; ca_proplist *pl = NULL; + gfloat db_volume; #ifdef MODEST_USE_PROFILE gchar *active_profile; @@ -2607,7 +2641,7 @@ modest_platform_play_email_tone (void) g_free (mail_volume); g_free (active_profile); #else - mail_tone = MAIL_TONE; + mail_tone = g_strdup (MAIL_TONE); mail_volume_int = 100; #endif @@ -2624,18 +2658,29 @@ modest_platform_play_email_tone (void) 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)); - 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)); @@ -2900,13 +2945,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