X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-platform.c;h=614aa13e156831da54767d25a6db98009bcece7f;hp=13ef2de4704c89aae17c1fe5763ef3d752e15324;hb=454354bdd5a2370614e99d0a95b5d016b4467f17;hpb=2af1d2488e82830ce80092db8b01b26a38cf6812 diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c index 13ef2de..614aa13 100644 --- a/src/maemo/modest-platform.c +++ b/src/maemo/modest-platform.c @@ -36,10 +36,8 @@ #include "maemo/modest-maemo-global-settings-dialog.h" #include "modest-widget-memory.h" #include -#include #include #include -#include #include #include #include /* For alarm_event_add(), etc. */ @@ -56,11 +54,15 @@ #include #include +#ifdef MODEST_HAVE_ABOOK +#include +#endif /*MODEST_HAVE_ABOOK*/ + #define HILDON_OSSO_URI_ACTION "uri-action" #define URI_ACTION_COPY "copy:" -static osso_context_t *osso_context = NULL; +static osso_context_t *osso_context = NULL; /* urgh global */ static void on_modest_conf_update_interval_changed (ModestConf* self, @@ -69,6 +71,8 @@ on_modest_conf_update_interval_changed (ModestConf* self, ModestConfNotificationId id, gpointer user_data) { + g_return_if_fail (key); + if (strcmp (key, MODEST_CONF_UPDATE_INTERVAL) == 0) { const guint update_interval_minutes = modest_conf_get_int (self, MODEST_CONF_UPDATE_INTERVAL, NULL); @@ -76,12 +80,41 @@ on_modest_conf_update_interval_changed (ModestConf* self, } } + + +static gboolean +check_required_files (void) +{ + FILE *mcc_file = modest_maemo_open_mcc_mapping_file (); + if (!mcc_file) { + g_printerr ("modest: check for mcc file failed\n"); + return FALSE; + } else + fclose (mcc_file); + + if (access (MODEST_PROVIDERS_DATA_PATH, R_OK) != 0) { + g_printerr ("modest: cannot find providers data\n"); + return FALSE; + } + + return TRUE; +} + + + gboolean modest_platform_init (int argc, char *argv[]) { osso_hw_state_t hw_state = { 0 }; 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); @@ -95,7 +128,7 @@ modest_platform_init (int argc, char *argv[]) return FALSE; } - + /* Add a D-Bus handler to be used when the main osso-rpc * D-Bus handler has not handled something. * We use this for D-Bus methods that need to use more complex types @@ -158,17 +191,27 @@ modest_platform_init (int argc, char *argv[]) "key_changed", G_CALLBACK (on_modest_conf_update_interval_changed), NULL); - - /* Get the initial update interval from gconf: */ - on_modest_conf_update_interval_changed(conf, MODEST_CONF_UPDATE_INTERVAL, - MODEST_CONF_EVENT_KEY_CHANGED, 0, NULL); + /* only force the setting of the default interval, if there are actually + * any accounts */ + acc_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr(), TRUE); + if (acc_names) { + /* Get the initial update interval from gconf: */ + on_modest_conf_update_interval_changed(conf, MODEST_CONF_UPDATE_INTERVAL, + MODEST_CONF_EVENT_KEY_CHANGED, 0, NULL); + modest_account_mgr_free_account_names (acc_names); + } + + +#ifdef MODEST_HAVE_ABOOK /* initialize the addressbook */ if (!osso_abook_init (&argc, &argv, osso_context)) { g_printerr ("modest: failed to initialized addressbook\n"); return FALSE; } - +#endif /*MODEST_HAVE_ABOOK*/ + + return TRUE; } @@ -221,14 +264,12 @@ modest_platform_activate_uri (const gchar *uri) HildonURIAction *action; gboolean result = FALSE; GSList *actions, *iter = NULL; - const gchar *scheme; g_return_val_if_fail (uri, FALSE); if (!uri) return FALSE; - - scheme = hildon_uri_get_scheme_from_uri (uri, NULL); - actions = hildon_uri_get_actions (scheme, NULL); + + actions = hildon_uri_get_actions_by_uri (uri, -1, NULL); for (iter = actions; iter; iter = g_slist_next (iter)) { action = (HildonURIAction*) iter->data; @@ -245,7 +286,7 @@ modest_platform_activate_uri (const gchar *uri) } } - /* if we could open it with email, try something else */ + /* if we could not open it with email, try something else */ if (!result) result = hildon_uri_open (uri, NULL, NULL); @@ -333,14 +374,12 @@ activate_uri_popup_item (GtkMenuItem *menu_item, gboolean modest_platform_show_uri_popup (const gchar *uri) { - gchar *scheme; GSList *actions_list; if (uri == NULL) return FALSE; - - scheme = hildon_uri_get_scheme_from_uri (uri, NULL); - actions_list = hildon_uri_get_actions (scheme, NULL); + + actions_list = hildon_uri_get_actions_by_uri (uri, -1, NULL); if (actions_list != NULL) { GSList *node; GtkWidget *menu = gtk_menu_new (); @@ -386,8 +425,7 @@ modest_platform_show_uri_popup (const gchar *uri) } else { hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link")); } - - g_free (scheme); + return TRUE; } @@ -576,7 +614,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window, sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_priority")); sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN; - sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY; + sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY_MASK; priority_sort_id = sort_key; sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view))))); @@ -590,7 +628,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window, if (current_sort_colid == TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN) { gpointer flags_sort_type_pointer; flags_sort_type_pointer = g_object_get_data (G_OBJECT (cols->data), MODEST_HEADER_VIEW_FLAG_SORT); - if (GPOINTER_TO_INT (flags_sort_type_pointer) == TNY_HEADER_FLAG_PRIORITY) + if (GPOINTER_TO_INT (flags_sort_type_pointer) == TNY_HEADER_FLAG_PRIORITY_MASK) hildon_sort_dialog_set_sort_key (dialog, priority_sort_id); else hildon_sort_dialog_set_sort_key (dialog, attachments_sort_id); @@ -673,6 +711,7 @@ on_response (GtkDialog *dialog, } + static gint modest_platform_run_folder_name_dialog (GtkWindow *parent_window, TnyFolderStore *parent, @@ -738,11 +777,8 @@ modest_platform_run_folder_name_dialog (GtkWindow *parent_window, hbox, FALSE, FALSE, 0); gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox)); - gtk_window_set_transient_for (GTK_WINDOW (dialog), parent_window); - - - + result = gtk_dialog_run (GTK_DIALOG(dialog)); if (result == GTK_RESPONSE_ACCEPT) *folder_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry))); @@ -825,42 +861,52 @@ modest_platform_run_rename_folder_dialog (GtkWindow *parent_window, folder_name); } + + +static void +on_destroy_dialog (GtkDialog *dialog) +{ + gtk_widget_destroy (GTK_WIDGET(dialog)); + if (gtk_events_pending ()) + gtk_main_iteration (); +} + gint modest_platform_run_confirmation_dialog (GtkWindow *parent_window, const gchar *message) { GtkWidget *dialog; gint response; - + dialog = hildon_note_new_confirmation (parent_window, message); - gtk_window_set_modal (GTK_WINDOW(dialog), TRUE); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + GTK_WINDOW (dialog)); response = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (GTK_WIDGET (dialog)); - + on_destroy_dialog (GTK_DIALOG(dialog)); + while (gtk_events_pending ()) gtk_main_iteration (); return response; } - + gint modest_platform_run_yes_no_dialog (GtkWindow *parent_window, const gchar *message) { GtkWidget *dialog; gint response; - + dialog = hildon_note_new_confirmation_add_buttons (parent_window, message, _("mcen_bd_yes"), GTK_RESPONSE_YES, _("mcen_bd_no"), GTK_RESPONSE_NO, NULL); - gtk_window_set_modal (GTK_WINDOW(dialog), TRUE); - + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog)); response = gtk_dialog_run (GTK_DIALOG (dialog)); - - gtk_widget_destroy (GTK_WIDGET (dialog)); + + on_destroy_dialog (GTK_DIALOG(dialog)); while (gtk_events_pending ()) gtk_main_iteration (); @@ -868,166 +914,153 @@ modest_platform_run_yes_no_dialog (GtkWindow *parent_window, return response; } + + void modest_platform_run_information_dialog (GtkWindow *parent_window, const gchar *message) { - GtkWidget *dialog; - - dialog = hildon_note_new_information (parent_window, message); - - g_signal_connect_swapped (dialog, + GtkWidget *note; + + note = hildon_note_new_information (parent_window, message); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + GTK_WINDOW (note)); + + g_signal_connect_swapped (note, "response", - G_CALLBACK (gtk_widget_destroy), - dialog); + G_CALLBACK (on_destroy_dialog), + note); - gtk_widget_show_all (dialog); + gtk_widget_show_all (note); } -typedef struct -{ - GMainLoop* loop; -} UtilIdleData; +typedef struct _ConnectAndWaitData { + GMutex *mutex; + GMainLoop *wait_loop; + gboolean has_callback; + gulong handler; +} ConnectAndWaitData; -static gboolean -on_idle_connect_and_wait(gpointer user_data) -{ - printf ("DEBUG: %s:\n", __FUNCTION__); - TnyDevice *device = modest_runtime_get_device(); - if (!tny_device_is_online (device)) { - - /* This is a GDK lock because we are an idle callback and - * tny_maemo_conic_device_connect can contain Gtk+ code */ - gdk_threads_enter(); /* CHECKED */ - tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device), NULL); - gdk_threads_leave(); /* CHECKED */ - } - - /* Allow the function that requested this idle callback to continue: */ - UtilIdleData *data = (UtilIdleData*)user_data; - if (data->loop) - g_main_loop_quit (data->loop); - - return FALSE; /* Don't call this again. */ +static void +quit_wait_loop (TnyAccount *account, + ConnectAndWaitData *data) +{ + /* Set the has_callback to TRUE (means that the callback was + executed and wake up every code waiting for cond to be + TRUE */ + g_mutex_lock (data->mutex); + data->has_callback = TRUE; + if (data->wait_loop) + g_main_loop_quit (data->wait_loop); + g_mutex_unlock (data->mutex); } -static gboolean connect_request_in_progress = FALSE; - -/* This callback is used when connect_and_wait() is already queued as an idle callback. - * This can happen because the gtk_dialog_run() for the connection dialog - * (at least in the fake scratchbox version) allows idle handlers to keep running. - */ -static gboolean -on_idle_wait_for_previous_connect_to_finish(gpointer user_data) +static void +on_connection_status_changed (TnyAccount *account, + TnyConnectionStatus status, + gpointer user_data) { - gboolean result = FALSE; - TnyDevice *device = modest_runtime_get_device(); - if (tny_device_is_online (device)) - result = FALSE; /* Stop trying. */ - else { - /* Keep trying until connect_request_in_progress is FALSE. */ - if (connect_request_in_progress) - result = TRUE; /* Keep trying */ - else { - printf ("DEBUG: %s: other idle has finished.\n", __FUNCTION__); - - result = FALSE; /* Stop trying, now that a result should be available. */ - } - } - - if (result == FALSE) { - /* Allow the function that requested this idle callback to continue: */ - UtilIdleData *data = (UtilIdleData*)user_data; - if (data->loop) - g_main_loop_quit (data->loop); - } - - return result; + TnyConnectionStatus conn_status; + ConnectAndWaitData *data; + + /* Ignore if reconnecting or disconnected */ + conn_status = tny_account_get_connection_status (account); + if (conn_status == TNY_CONNECTION_STATUS_RECONNECTING || + conn_status == TNY_CONNECTION_STATUS_DISCONNECTED) + return; + + /* Remove the handler */ + data = (ConnectAndWaitData *) user_data; + g_signal_handler_disconnect (account, data->handler); + + /* Quit from wait loop */ + quit_wait_loop (account, (ConnectAndWaitData *) user_data); } -static void -set_account_to_online (TnyAccount *account) +static void +on_tny_camel_account_set_online_cb (TnyCamelAccount *account, + gboolean canceled, + GError *err, + gpointer user_data) { - /* TODO: This is necessary to prevent a cancel of the password dialog - * from making a restart necessary to be asked the password again, - * but it causes a hang: - */ - #if 0 - if (account && TNY_IS_CAMEL_STORE_ACCOUNT (account)) { - /* Make sure that store accounts are online too, - * because tinymail sets accounts to offline if - * a password dialog is ever cancelled. - * We don't do this for transport accounts because - * a) They fundamentally need network access, so they can't really be offline. - * b) That might cause a transport connection to happen too early. - */ - - /* The last argument is user_data, the NULL before that is the callback */ - tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (account), TRUE, NULL, NULL); - } - #endif + /* Quit from wait loop */ + quit_wait_loop (TNY_ACCOUNT (account), (ConnectAndWaitData *) user_data); } gboolean -modest_platform_connect_and_wait (GtkWindow *parent_window, TnyAccount *account) +modest_platform_connect_and_wait (GtkWindow *parent_window, + TnyAccount *account) { - if (connect_request_in_progress) - return FALSE; - - printf ("DEBUG: %s:\n", __FUNCTION__); - TnyDevice *device = modest_runtime_get_device(); - - if (tny_device_is_online (device)) { - printf ("DEBUG: %s: Already online.\n", __FUNCTION__); - set_account_to_online (account); - return TRUE; - } else - { - printf ("DEBUG: %s: tny_device_is_online() returned FALSE\n", __FUNCTION__); - } - - /* This blocks on the result: */ - UtilIdleData *data = g_slice_new0 (UtilIdleData); + ConnectAndWaitData *data = NULL; + gboolean device_online; + TnyDevice *device; + TnyConnectionStatus conn_status; - GMainContext *context = NULL; /* g_main_context_new (); */ - data->loop = g_main_loop_new (context, FALSE /* not running */); - - /* Cause the function to be run in an idle-handler, which is always - * in the main thread: - */ - if (!connect_request_in_progress) { - printf ("DEBUG: %s: First request\n", __FUNCTION__); - connect_request_in_progress = TRUE; - g_idle_add (&on_idle_connect_and_wait, data); - } - else { - printf ("DEBUG: %s: nth request\n", __FUNCTION__); - g_idle_add_full (G_PRIORITY_LOW, &on_idle_wait_for_previous_connect_to_finish, data, NULL); - } + device = modest_runtime_get_device(); + device_online = tny_device_is_online (device); - /* This main loop will run until the idle handler has stopped it: */ - printf ("DEBUG: %s: before g_main_loop_run()\n", __FUNCTION__); - GDK_THREADS_LEAVE(); - g_main_loop_run (data->loop); - GDK_THREADS_ENTER(); - printf ("DEBUG: %s: after g_main_loop_run()\n", __FUNCTION__); - connect_request_in_progress = FALSE; - printf ("DEBUG: %s: Finished\n", __FUNCTION__); - g_main_loop_unref (data->loop); - /* g_main_context_unref (context); */ + /* If there is no account check only the device status */ + if (!account) { + if (device_online) + return TRUE; + else + return tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device), NULL); + } - g_slice_free (UtilIdleData, data); + /* Return if the account is already connected */ + conn_status = tny_account_get_connection_status (account); + if (device_online && conn_status == TNY_CONNECTION_STATUS_CONNECTED) + return TRUE; - const gboolean result = tny_device_is_online (device); + /* Create the helper */ + data = g_slice_new0 (ConnectAndWaitData); + data->mutex = g_mutex_new (); + data->has_callback = FALSE; + + /* Connect the device */ + if (!device_online) { + /* Track account connection status changes */ + data->handler = g_signal_connect (account, "connection-status-changed", + G_CALLBACK (on_connection_status_changed), + data); + /* Try to connect the device */ + device_online = tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device), NULL); + + /* If the device connection failed then exit */ + if (!device_online && data->handler) + goto frees; + } else { + /* Force a reconnection of the account */ + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (account), TRUE, + on_tny_camel_account_set_online_cb, data); + } - if (result) { - set_account_to_online (account); + /* Wait until the callback is executed */ + g_mutex_lock (data->mutex); + if (!data->has_callback) { + data->wait_loop = g_main_loop_new (NULL, FALSE); + gdk_threads_leave (); + g_mutex_unlock (data->mutex); + g_main_loop_run (data->wait_loop); + g_mutex_lock (data->mutex); + gdk_threads_enter (); + } + g_mutex_unlock (data->mutex); + + frees: + if (data) { + if (g_signal_handler_is_connected (account, data->handler)) + g_signal_handler_disconnect (account, data->handler); + g_mutex_free (data->mutex); + g_main_loop_unref (data->wait_loop); + g_slice_free (ConnectAndWaitData, data); } - return result; + conn_status = tny_account_get_connection_status (account); + return (conn_status == TNY_CONNECTION_STATUS_CONNECTED) ? TRUE: FALSE; } gboolean @@ -1107,7 +1140,8 @@ modest_platform_run_sort_dialog (GtkWindow *parent_window, /* Build dialog */ dialog = hildon_sort_dialog_new (parent_window); - gtk_window_set_modal (GTK_WINDOW(dialog), TRUE); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + GTK_WINDOW (dialog)); /* Fill sort keys */ switch (type) { @@ -1118,7 +1152,7 @@ modest_platform_run_sort_dialog (GtkWindow *parent_window, } /* Free */ - gtk_widget_destroy (GTK_WIDGET (dialog)); + on_destroy_dialog (GTK_DIALOG(dialog)); } @@ -1207,71 +1241,149 @@ modest_platform_set_update_interval (guint minutes) return TRUE; } -GtkWidget * -modest_platform_get_global_settings_dialog () -{ - return modest_maemo_global_settings_dialog_new (); -} - void -modest_platform_on_new_header_received (TnyHeader *header) +modest_platform_on_new_headers_received (TnyList *header_list) { #ifdef MODEST_HAVE_HILDON_NOTIFY HildonNotification *notification; - gchar *url = NULL; - TnyFolder *folder = NULL; - const gchar *subject; - - subject = tny_header_get_subject (header); - if (!subject || strlen(subject) == 0) - subject = _("mail_va_no_subject"); + TnyIterator *iter; + GSList *notifications_list = NULL; + + /* Get previous notifications ids */ + notifications_list = modest_conf_get_list (modest_runtime_get_conf (), + MODEST_CONF_NOTIFICATION_IDS, + MODEST_CONF_VALUE_INT, NULL); + + iter = tny_list_create_iterator (header_list); + while (!tny_iterator_is_done (iter)) { + gchar *url = NULL, *display_address = NULL, *display_date = NULL, *summary = NULL; + TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); + TnyFolder *folder = tny_header_get_folder (header); + gboolean first_notification = TRUE; + gint notif_id; - notification = hildon_notification_new (tny_header_get_from (header), - subject, - "qgn_list_messagin", - NULL); - - folder = tny_header_get_folder (header); - url = g_strdup_printf ("%s/%s", - tny_folder_get_url_string (folder), - tny_header_get_uid (header)); - g_object_unref (folder); - - hildon_notification_add_dbus_action(notification, - "default", - "Cancel", - MODEST_DBUS_SERVICE, - MODEST_DBUS_OBJECT, - MODEST_DBUS_IFACE, - MODEST_DBUS_METHOD_OPEN_MESSAGE, - G_TYPE_STRING, url, - -1); - g_free (url); + display_date = modest_text_utils_get_display_date (tny_header_get_date_received (header)); + + display_address = g_strdup(tny_header_get_from (header)); + modest_text_utils_get_display_address (display_address); /* string is changed in-place */ + + summary = g_strdup_printf ("%s - %s", display_date, display_address); + notification = hildon_notification_new (summary, + tny_header_get_subject (header), + "qgn_list_messagin", + "email.arrive"); + + /* Create the message URL */ + url = g_strdup_printf ("%s/%s", tny_folder_get_url_string (folder), + tny_header_get_uid (header)); + + hildon_notification_add_dbus_action(notification, + "default", + "Cancel", + MODEST_DBUS_SERVICE, + MODEST_DBUS_OBJECT, + MODEST_DBUS_IFACE, + MODEST_DBUS_METHOD_OPEN_MESSAGE, + G_TYPE_STRING, url, + -1); + + /* Play sound if the user wants. Show the LED + 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)) { + notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification), + "sound-file", "/usr/share/sounds/ui-new_email.wav"); + } + + /* Set the led pattern */ + notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification), + "dialog-type", 4); + notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification), + "led-pattern", + "PatternCommunicationEmail"); + } + + /* Notify. We need to do this in an idle because this function + could be called from a thread */ + notify_notification_show (NOTIFY_NOTIFICATION (notification), NULL); + + /* Save id in the list */ + g_object_get(G_OBJECT(notification), "id", ¬if_id, NULL); + notifications_list = g_slist_prepend (notifications_list, GINT_TO_POINTER(notif_id)); + /* We don't listen for the "closed" signal, because we + don't care about if the notification was removed or + not to store the list in gconf */ - /* Play sound if the user wants */ - if (modest_conf_get_bool (modest_runtime_get_conf (), - MODEST_CONF_PLAY_SOUND_MSG_ARRIVE, - NULL)) { - hildon_notification_set_sound (HILDON_NOTIFICATION(notification), - "/usr/share/sounds/ui-new_email.wav"); + /* Free & carry on */ + g_free (display_date); + g_free (display_address); + g_free (summary); + g_free (url); + g_object_unref (folder); + g_object_unref (header); + tny_iterator_next (iter); } + g_object_unref (iter); + + /* Save the ids */ + modest_conf_set_list (modest_runtime_get_conf (), MODEST_CONF_NOTIFICATION_IDS, + notifications_list, MODEST_CONF_VALUE_INT, NULL); + + g_slist_free (notifications_list); - /* Set the led pattern */ - notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION(notification), - "dialog-type", 4); - notify_notification_set_hint_string(NOTIFY_NOTIFICATION(notification), - "led-pattern", - "PatternCommunicationEmail"); - - /* Notify. We need to do this in an idle because this function - could be called from a thread */ - if (!notify_notification_show (NOTIFY_NOTIFICATION(notification), NULL)) - g_error ("Failed to send notification"); - - g_object_unref (notification); #endif /*MODEST_HAVE_HILDON_NOTIFY*/ } +void +modest_platform_remove_new_mail_notifications (void) +{ +#ifdef MODEST_HAVE_HILDON_NOTIFY + GSList *notif_list = NULL; + + /* Get previous notifications ids */ + notif_list = modest_conf_get_list (modest_runtime_get_conf (), + MODEST_CONF_NOTIFICATION_IDS, + MODEST_CONF_VALUE_INT, NULL); + + while (notif_list) { + gint notif_id; + NotifyNotification *notif; + + /* Nasty HACK to remove the notifications, set the id + of the existing ones and then close them */ + notif_id = GPOINTER_TO_INT(notif_list->data); + notif = notify_notification_new("dummy", NULL, NULL, NULL); + g_object_set(G_OBJECT(notif), "id", notif_id, NULL); + + /* Close the notification, note that some ids could be + already invalid, but we don't care because it does + not fail */ + notify_notification_close(notif, NULL); + g_object_unref(notif); + + /* Delete the link, it's like going to the next */ + notif_list = g_slist_delete_link (notif_list, notif_list); + } + + /* Save the ids */ + modest_conf_set_list (modest_runtime_get_conf (), MODEST_CONF_NOTIFICATION_IDS, + notif_list, MODEST_CONF_VALUE_INT, NULL); + + g_slist_free (notif_list); + +#endif /* MODEST_HAVE_HILDON_NOTIFY */ +} + + + +GtkWidget * +modest_platform_get_global_settings_dialog () +{ + return modest_maemo_global_settings_dialog_new (); +} void modest_platform_show_help (GtkWindow *parent_window, @@ -1282,12 +1394,7 @@ modest_platform_show_help (GtkWindow *parent_window, g_return_if_fail (help_id); g_return_if_fail (osso_context); - /* Show help */ -#ifdef MODEST_HAVE_OSSO_HELP - result = ossohelp_show (osso_context, help_id, OSSO_HELP_SHOW_DIALOG); -#else - result = hildon_help_show (osso_context, help_id, OSSO_HELP_SHOW_DIALOG); -#endif + result = hildon_help_show (osso_context, help_id, HILDON_HELP_SHOW_DIALOG); if (result != OSSO_OK) { gchar *error_msg; @@ -1299,6 +1406,22 @@ modest_platform_show_help (GtkWindow *parent_window, } } +void +modest_platform_set_dialog_help (GtkDialog *parent_window, + const gchar *help_id) +{ + gboolean result; + g_return_if_fail (help_id); + g_return_if_fail (osso_context); + g_return_if_fail (GTK_IS_DIALOG (parent_window)); + + result = hildon_help_dialog_help_enable (parent_window, help_id, osso_context); + + if (!result) + g_warning ("Help topic %s not found", help_id); + +} + void modest_platform_show_search_messages (GtkWindow *parent_window) { @@ -1474,7 +1597,7 @@ modest_platform_check_and_wait_for_account_is_online(TnyAccount *account) GMainContext *context = NULL; /* g_main_context_new (); */ data->loop = g_main_loop_new (context, FALSE /* not running */); - g_timeout_add (1000, &on_timeout_check_account_is_online, data); + g_timeout_add (1000, on_timeout_check_account_is_online, data); /* This main loop will run until the idle handler has stopped it: */ g_main_loop_run (data->loop); @@ -1509,7 +1632,7 @@ on_cert_dialog_response (GtkDialog *dialog, gint response_id, const gchar* cert gboolean -modest_platform_run_certificate_conformation_dialog (const gchar* server_name, +modest_platform_run_certificate_confirmation_dialog (const gchar* server_name, const gchar *certificate) { GtkWidget *note; @@ -1531,12 +1654,15 @@ modest_platform_run_certificate_conformation_dialog (const gchar* server_name, g_signal_connect (G_OBJECT(note), "response", G_CALLBACK(on_cert_dialog_response), (gpointer) certificate); + + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + GTK_WINDOW (note)); response = gtk_dialog_run(GTK_DIALOG(note)); - gtk_widget_destroy(GTK_WIDGET(note)); + on_destroy_dialog (GTK_DIALOG(note)); g_free (question); - return response; + return response == GTK_RESPONSE_OK; } @@ -1556,11 +1682,13 @@ modest_platform_run_alert_dialog (const gchar* prompt, * so we know what buttons to show. */ GtkWidget *dialog = GTK_WIDGET (hildon_note_new_confirmation (GTK_WINDOW (main_window), prompt)); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + GTK_WINDOW (dialog)); + const int response = gtk_dialog_run (GTK_DIALOG (dialog)); retval = (response == GTK_RESPONSE_YES) || (response == GTK_RESPONSE_OK); - gtk_widget_destroy (dialog); - + on_destroy_dialog (GTK_DIALOG(dialog)); } else { /* Just show the error text and use the default response: */ modest_platform_run_information_dialog (GTK_WINDOW (main_window),