X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-platform.c;h=12181452e78c56ed70154945d60849166c7a3926;hb=266e59ba330fbca5c32475b5696ec2e28a99ede6;hp=de5d03faa01dbdc3184bf9d8b7214186ef5b5eba;hpb=b0793561e2974d4adc788ad340bb117bdf1cf9e0;p=modest diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c index de5d03f..1218145 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 @@ -96,7 +97,7 @@ #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 @@ -111,6 +112,7 @@ #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); @@ -698,7 +700,7 @@ folder_chooser_dialog_run (ModestFolderView *original, GtkWidget *pannable; const gchar *visible_id = NULL; - userdata.dialog = hildon_dialog_new (); + userdata.dialog = gtk_dialog_new (); pannable = hildon_pannable_area_new (); folder_view = modest_platform_create_folder_view (NULL); @@ -998,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; @@ -1484,7 +1486,8 @@ 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; @@ -1498,38 +1501,38 @@ modest_platform_set_update_interval (guint minutes) } } - cookie_t alarm_cookie = modest_conf_get_int (conf, MODEST_CONF_ALARM_ID, NULL); + /* 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; + /* 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); @@ -1543,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; } @@ -1599,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; @@ -1680,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; @@ -1935,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: */ @@ -1956,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. */ @@ -2621,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) { @@ -2628,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; @@ -2640,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 @@ -2657,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)); @@ -2940,6 +2952,7 @@ on_move_to_dialog_row_activated (GtkTreeView *tree_view, } else { move_to_dialog_set_selected_folder_store (dialog, selected); } + g_object_unref (selected); } static void