X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-platform.c;h=f34538cd73b26b7a20af7ee655fa04521ae3b503;hb=a9c347489d676ecf1cb0a4ba30059432aeccee80;hp=9127de660b1fd3a6f9ef649f08a7ca43bedb7502;hpb=a4e8821c4dd117ede537ab7d5a5fb9992dd62df5;p=modest diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c index 9127de6..f34538c 100644 --- a/src/maemo/modest-platform.c +++ b/src/maemo/modest-platform.c @@ -55,6 +55,11 @@ #include #include #include +#include + +#ifdef MODEST_HAVE_MCE +#include +#endif /*MODEST_HAVE_MCE*/ #ifdef MODEST_HAVE_ABOOK #include @@ -67,6 +72,8 @@ #define HILDON_OSSO_URI_ACTION "uri-action" #define URI_ACTION_COPY "copy:" +#define MODEST_NEW_MAIL_SOUND_FILE "/usr/share/sounds/ui-new_email.wav" +#define MODEST_NEW_MAIL_LIGHTING_PATTERN "PatternCommunicationEmail" static void on_modest_conf_update_interval_changed (ModestConf* self, @@ -335,7 +342,7 @@ modest_platform_activate_file (const gchar *path, const gchar *mime_type) DBusConnection *con; gchar *uri_path = NULL; - uri_path = g_strconcat ("file://", path, NULL); + uri_path = gnome_vfs_get_uri_from_local_path (path); con = osso_get_dbus_connection (modest_maemo_utils_get_osso_context()); if (mime_type) @@ -390,6 +397,7 @@ activate_uri_popup_item (GtkMenuItem *menu_item, action_name += strlen ("mailto:"); gtk_clipboard_set_text (clipboard, action_name, strlen (action_name)); + modest_platform_information_banner (NULL, NULL, _CS("ecoc_ib_edwin_copied")); return; /* we're done */ } @@ -477,7 +485,7 @@ modest_platform_show_uri_popup (const gchar *uri) GdkPixbuf* -modest_platform_get_icon (const gchar *name) +modest_platform_get_icon (const gchar *name, guint icon_size) { GError *err = NULL; GdkPixbuf* pixbuf = NULL; @@ -491,20 +499,8 @@ modest_platform_get_icon (const gchar *name) if (!name || strlen(name) == 0) return NULL; -#if 0 /* do we still need this? */ - if (g_str_has_suffix (name, ".png")) { /*FIXME: hack*/ - pixbuf = gdk_pixbuf_new_from_file (name, &err); - if (!pixbuf) { - g_printerr ("modest: error loading icon '%s': %s\n", - name, err->message); - g_error_free (err); - return NULL; - } - return pixbuf; - } -#endif /* */ current_theme = gtk_icon_theme_get_default (); - pixbuf = gtk_icon_theme_load_icon (current_theme, name, 26, + pixbuf = gtk_icon_theme_load_icon (current_theme, name, icon_size, GTK_ICON_LOOKUP_NO_SVG, &err); if (!pixbuf) { @@ -643,7 +639,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window, MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT); sort_key = checked_hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_sender_recipient"), - SORT_ID_NUM - 1); + SORT_ID_NUM); if (outgoing) { sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN; sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT; @@ -653,7 +649,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window, } sort_key = checked_hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_date"), - SORT_ID_NUM - 1); + SORT_ID_NUM); if (outgoing) { sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN; sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE; @@ -664,7 +660,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window, default_key = sort_key; sort_key = checked_hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_subject"), - SORT_ID_NUM -1); + SORT_ID_NUM); sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN; if (outgoing) sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT; @@ -672,18 +668,18 @@ launch_sort_headers_dialog (GtkWindow *parent_window, sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN; sort_key = checked_hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_attachment"), - SORT_ID_NUM - 1); + SORT_ID_NUM); sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN; sort_ids[sort_key] = TNY_HEADER_FLAG_ATTACHMENTS; attachments_sort_id = sort_key; sort_key = checked_hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_size"), - SORT_ID_NUM - 1); + SORT_ID_NUM); sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN; sort_ids[sort_key] = 0; sort_key = checked_hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_priority"), - SORT_ID_NUM - 1); + SORT_ID_NUM); sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN; sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY_MASK; priority_sort_id = sort_key; @@ -1341,8 +1337,59 @@ modest_platform_set_update_interval (guint minutes) } void -modest_platform_on_new_headers_received (TnyList *header_list) +modest_platform_on_new_headers_received (TnyList *header_list, + gboolean show_visual) { + gboolean play_sound; + + g_return_if_fail (TNY_IS_LIST(header_list)); + + if (tny_list_get_length(header_list) == 0) { + g_warning ("%s: header list is empty", __FUNCTION__); + return; + } + + /* Check whether or not we should play a sound */ + play_sound = modest_conf_get_bool (modest_runtime_get_conf (), + MODEST_CONF_PLAY_SOUND_MSG_ARRIVE, + NULL); + + if (!show_visual) { + gboolean screen_on = TRUE, app_in_foreground; + ModestWindow *main_window; + + /* Get the screen status */ + main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE); + if (main_window) + screen_on = modest_main_window_screen_is_on (MODEST_MAIN_WINDOW (main_window)); + + /* Get the window status */ + app_in_foreground = hildon_program_get_is_topmost (hildon_program_get_instance ()); + + /* If the screen is on and the app is in the + foreground we don't show anything */ + if (!(screen_on && app_in_foreground)) { + /* Play a sound */ + if (play_sound) + hildon_play_system_sound (MODEST_NEW_MAIL_SOUND_FILE); + + /* Activate LED. This must be deactivated by + modest_platform_remove_new_mail_notifications */ +#ifdef MODEST_HAVE_MCE + osso_rpc_run_system (modest_maemo_utils_get_osso_context (), + MCE_SERVICE, + MCE_REQUEST_PATH, + MCE_REQUEST_IF, + MCE_ACTIVATE_LED_PATTERN, + NULL, + DBUS_TYPE_STRING, MODEST_NEW_MAIL_LIGHTING_PATTERN, + DBUS_TYPE_INVALID); +#endif + } + /* We do a return here to avoid indentation with an else */ + return; + } + #ifdef MODEST_HAVE_HILDON_NOTIFY HildonNotification *notification; TnyIterator *iter; @@ -1391,11 +1438,9 @@ modest_platform_on_new_headers_received (TnyList *header_list) pattern. Show and play just one */ if (G_UNLIKELY (first_notification)) { first_notification = FALSE; - if (modest_conf_get_bool (modest_runtime_get_conf (), - MODEST_CONF_PLAY_SOUND_MSG_ARRIVE, - NULL)) { + if (play_sound) { notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification), - "sound-file", "/usr/share/sounds/ui-new_email.wav"); + "sound-file", MODEST_NEW_MAIL_SOUND_FILE); } /* Set the led pattern */ @@ -1403,7 +1448,7 @@ modest_platform_on_new_headers_received (TnyList *header_list) "dialog-type", 4); notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification), "led-pattern", - "PatternCommunicationEmail"); + MODEST_NEW_MAIL_LIGHTING_PATTERN); } /* Notify. We need to do this in an idle because this function @@ -1437,8 +1482,22 @@ modest_platform_on_new_headers_received (TnyList *header_list) } void -modest_platform_remove_new_mail_notifications (void) +modest_platform_remove_new_mail_notifications (gboolean only_visuals) { + if (only_visuals) { +#ifdef MODEST_HAVE_MCE + osso_rpc_run_system (modest_maemo_utils_get_osso_context (), + MCE_SERVICE, + MCE_REQUEST_PATH, + MCE_REQUEST_IF, + MCE_DEACTIVATE_LED_PATTERN, + NULL, + DBUS_TYPE_STRING, MODEST_NEW_MAIL_LIGHTING_PATTERN, + DBUS_TYPE_INVALID); +#endif + return; + } + #ifdef MODEST_HAVE_HILDON_NOTIFY GSList *notif_list = NULL; @@ -1541,7 +1600,6 @@ modest_platform_create_folder_view (TnyFolderStoreQuery *query) 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), @@ -1550,12 +1608,39 @@ modest_platform_create_folder_view (TnyFolderStoreQuery *query) return widget; } +void +banner_finish (gpointer data, GObject *object) +{ + ModestWindowMgr *mgr = (ModestWindowMgr *) data; + modest_window_mgr_unregister_banner (mgr); + g_object_unref (mgr); +} + void modest_platform_information_banner (GtkWidget *parent, const gchar *icon_name, const gchar *text) { - hildon_banner_show_information (parent, icon_name, text); + GtkWidget *banner; + ModestWindowMgr *mgr; + + mgr = modest_runtime_get_window_mgr (); + banner = hildon_banner_show_information (parent, icon_name, text); + + modest_window_mgr_register_banner (mgr); + g_object_ref (mgr); + g_object_weak_ref ((GObject *) banner, banner_finish, mgr); +} + +void +modest_platform_information_banner_with_timeout (GtkWidget *parent, + const gchar *icon_name, + const gchar *text, + gint timeout) +{ + GtkWidget *banner; + banner = hildon_banner_show_information (parent, icon_name, text); + hildon_banner_set_timeout(HILDON_BANNER(banner), timeout); } GtkWidget * @@ -1889,6 +1974,7 @@ on_conic_device_went_online (TnyMaemoConicDevice *device, const gchar* iap_id, g void modest_platform_connect_and_perform (GtkWindow *parent_window, + gboolean force, TnyAccount *account, ModestConnectedPerformer callback, gpointer user_data) @@ -1897,15 +1983,10 @@ modest_platform_connect_and_perform (GtkWindow *parent_window, TnyDevice *device; TnyConnectionStatus conn_status; OnWentOnlineInfo *info; - gboolean user_requested; device = modest_runtime_get_device(); device_online = tny_device_is_online (device); - /* Whether the connection is user requested or automatically - requested, for example via D-Bus */ - user_requested = (parent_window) ? TRUE : FALSE; - /* If there is no account check only the device status */ if (!account) { @@ -1932,7 +2013,7 @@ modest_platform_connect_and_perform (GtkWindow *parent_window, info->callback = callback; tny_maemo_conic_device_connect_async (TNY_MAEMO_CONIC_DEVICE (device), NULL, - user_requested, on_conic_device_went_online, + force, on_conic_device_went_online, info); /* We'll cleanup in on_conic_device_went_online */ @@ -1985,7 +2066,7 @@ modest_platform_connect_and_perform (GtkWindow *parent_window, * and the account */ tny_maemo_conic_device_connect_async (TNY_MAEMO_CONIC_DEVICE (device), NULL, - user_requested, on_conic_device_went_online, + force, on_conic_device_went_online, info); } else { @@ -2004,9 +2085,10 @@ modest_platform_connect_and_perform (GtkWindow *parent_window, void modest_platform_connect_if_remote_and_perform (GtkWindow *parent_window, - TnyFolderStore *folder_store, - ModestConnectedPerformer callback, - gpointer user_data) + gboolean force, + TnyFolderStore *folder_store, + ModestConnectedPerformer callback, + gpointer user_data) { TnyAccount *account = NULL; @@ -2045,7 +2127,7 @@ modest_platform_connect_if_remote_and_perform (GtkWindow *parent_window, } } - modest_platform_connect_and_perform (parent_window, account, callback, user_data); + modest_platform_connect_and_perform (parent_window, force, account, callback, user_data); return; }