X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-platform.c;h=685d6fcb7e72cd94a9a7fc9fbb9d3bab0717a030;hp=1d7d5ac7ab4227fe2bfa18864161a7edaf64e389;hb=da3893676be4c4de5478595c937875aacd6ba2cd;hpb=dc6f85efbd256ef1e02449f075dd94b462dee791 diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c index 1d7d5ac..685d6fc 100644 --- a/src/maemo/modest-platform.c +++ b/src/maemo/modest-platform.c @@ -38,20 +38,27 @@ #include #include #include +#include #include #include #include /* For alarm_event_add(), etc. */ #include #include +#include +#include #include #include #include +#include #include + #define HILDON_OSSO_URI_ACTION "uri-action" #define URI_ACTION_COPY "copy:" static osso_context_t *osso_context = NULL; + +static void folder_name_insensitive_press (GtkWidget *widget, ModestWindow *window); static void on_modest_conf_update_interval_changed (ModestConf* self, const gchar *key, @@ -65,10 +72,11 @@ on_modest_conf_update_interval_changed (ModestConf* self, const gchar *key, } gboolean -modest_platform_init (void) +modest_platform_init (int argc, char *argv[]) { osso_hw_state_t hw_state = { 0 }; DBusConnection *con; + osso_context = osso_initialize(PACKAGE,PACKAGE_VERSION, FALSE, NULL); @@ -78,29 +86,34 @@ modest_platform_init (void) } if ((con = osso_get_dbus_connection (osso_context)) == NULL) { - g_printerr ("Could not get dbus connection\n"); + g_printerr ("modest: could not get dbus connection\n"); 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 + * than osso-rpc supports. + */ if (!dbus_connection_add_filter (con, modest_dbus_req_filter, NULL, NULL)) { - g_printerr ("Could not add dbus filter\n"); + g_printerr ("modest: Could not add D-Bus filter\n"); return FALSE; } - /* Register our D-Bus callbacks, via the osso API: */ + /* Register our simple D-Bus callbacks, via the osso API: */ osso_return_t result = osso_rpc_set_cb_f(osso_context, MODEST_DBUS_SERVICE, MODEST_DBUS_OBJECT, MODEST_DBUS_IFACE, modest_dbus_req_handler, NULL /* user_data */); if (result != OSSO_OK) { - g_print("Error setting D-BUS callback (%d)\n", result); - return OSSO_ERROR; + g_printerr ("modest: Error setting D-BUS callback (%d)\n", result); + return FALSE; } /* Add handler for Exit D-BUS messages. @@ -122,7 +135,8 @@ modest_platform_init (void) result = osso_application_set_autosave_cb (osso_context, modest_on_osso_application_autosave, NULL /* user_data */); if (result != OSSO_OK) { - g_warning ("osso_application_set_autosave_cb() failed."); + g_printerr ("modest: osso_application_set_autosave_cb() failed.\n"); + return FALSE; } @@ -137,7 +151,13 @@ modest_platform_init (void) /* Get the initial update interval from gconf: */ on_modest_conf_update_interval_changed(conf, MODEST_CONF_UPDATE_INTERVAL, MODEST_CONF_EVENT_KEY_CHANGED, NULL); - + + /* initialize the addressbook */ + if (!osso_abook_init (&argc, &argv, osso_context)) { + g_printerr ("modest: failed to initialized addressbook\n"); + return FALSE; + } + return TRUE; } @@ -197,13 +217,18 @@ modest_platform_get_file_icon_name (const gchar* name, const gchar* mime_type, mime_str = g_string_new (mime_type); g_string_ascii_down (mime_str); } -#ifdef MODEST_HILDON_VERSION_0 + +#ifdef MODEST_HAVE_OSSO_MIME icons = osso_mime_get_icon_names (mime_str->str, NULL); #else icons = hildon_mime_get_icon_names (mime_str->str, NULL); -#endif /*MODEST_HILDON_VERSION_0*/ +#endif /*MODEST_HAVE_OSSO_MIME*/ for (cursor = icons; cursor; ++cursor) { - if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), *cursor)) { + if (!g_ascii_strcasecmp (*cursor, "gnome-mime-message") || + !g_ascii_strcasecmp (*cursor, "gnome-mime-message-rfc822")) { + icon_name = g_strdup ("qgn_list_messagin"); + break; + } else if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), *cursor)) { icon_name = g_strdup (*cursor); break; } @@ -221,8 +246,7 @@ modest_platform_get_file_icon_name (const gchar* name, const gchar* mime_type, -#ifdef MODEST_HILDON_VERSION_0 - +#ifdef MODEST_HAVE_OSSO_MIME gboolean modest_platform_activate_uri (const gchar *uri) { @@ -252,14 +276,18 @@ modest_platform_activate_uri (const gchar *uri) break; } } + + /* if we could open it with email, try something else */ + if (!result) + result = osso_uri_open (uri, NULL, NULL); + if (!result) hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link")); return result; } -#else /* !MODEST_HILDON_VERSION_0*/ - +#else /* !MODEST_HAVE_OSSO_MIME*/ gboolean modest_platform_activate_uri (const gchar *uri) @@ -273,7 +301,6 @@ modest_platform_activate_uri (const gchar *uri) if (!uri) return FALSE; - /* the default action should be email */ scheme = hildon_uri_get_scheme_from_uri (uri, NULL); actions = hildon_uri_get_actions (scheme, NULL); @@ -290,14 +317,19 @@ modest_platform_activate_uri (const gchar *uri) break; } } - + + /* if we could open it with email, try something else */ + if (!result) + result = hildon_uri_open (uri, NULL, NULL); + if (!result) hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link")); + return result; } -#endif /* MODEST_HILDON_VERSION_0*/ +#endif /* MODEST_HAVE_OSSO_MIME*/ gboolean modest_platform_activate_file (const gchar *path, const gchar *mime_type) @@ -317,22 +349,16 @@ modest_platform_activate_file (const gchar *path, const gchar *mime_type) uri_path = g_strconcat ("file://", path, NULL); con = osso_get_dbus_connection (osso_context); -#ifdef MODEST_HILDON_VERSION_0 +#ifdef MODEST_HAVE_OSSO_MIME result = osso_mime_open_file_with_mime_type (con, uri_path, mime_str->str); - g_string_free (mime_str, TRUE); - - if (result != 1) - hildon_banner_show_information (NULL, NULL, _("mcen_ni_noregistered_viewer")); - return result != 1; #else result = hildon_mime_open_file_with_mime_type (con, uri_path, mime_str->str); +#endif /*MODEST_HAVE_OSSO_MIME*/ g_string_free (mime_str, TRUE); if (result != 1) - hildon_banner_show_information (NULL, NULL, _("mcen_ni_noregistered_viewer")); + modest_platform_run_information_dialog (NULL, _("mcen_ni_noregistered_viewer")); return result != 1; -#endif - } typedef struct { @@ -348,11 +374,11 @@ delete_uri_popup (GtkWidget *menu, ModestPlatformPopupInfo *popup_info = (ModestPlatformPopupInfo *) userdata; g_free (popup_info->uri); -#ifdef MODEST_HILDON_VERSION_0 +#ifdef MODEST_HAVE_OSSO_MIME osso_uri_free_actions (popup_info->actions); #else hildon_uri_free_actions (popup_info->actions); -#endif +#endif /*MODEST_HAVE_OSSO_MIME*/ return FALSE; } @@ -385,7 +411,7 @@ activate_uri_popup_item (GtkMenuItem *menu_item, /* now, the real uri-actions... */ for (node = popup_info->actions; node != NULL; node = g_slist_next (node)) { -#ifdef MODEST_HILDON_VERSION_0 +#ifdef MODEST_HAVE_OSSO_MIME OssoURIAction *action = (OssoURIAction *) node->data; if (strcmp (action_name, osso_uri_action_get_name (action))==0) { osso_uri_open (popup_info->uri, action, NULL); @@ -397,7 +423,7 @@ activate_uri_popup_item (GtkMenuItem *menu_item, hildon_uri_open (popup_info->uri, action, NULL); break; } -#endif +#endif /*MODEST_HAVE_OSSO_MIME*/ } } @@ -410,13 +436,13 @@ modest_platform_show_uri_popup (const gchar *uri) if (uri == NULL) return FALSE; -#ifdef MODEST_HILDON_VERSION_0 +#ifdef MODEST_HAVE_OSSO_MIME scheme = osso_uri_get_scheme_from_uri (uri, NULL); actions_list = osso_uri_get_actions (scheme, NULL); #else scheme = hildon_uri_get_scheme_from_uri (uri, NULL); actions_list = hildon_uri_get_actions (scheme, NULL); -#endif +#endif /* MODEST_HAVE_OSSO_MIME */ if (actions_list != NULL) { GSList *node; GtkWidget *menu = gtk_menu_new (); @@ -429,7 +455,7 @@ modest_platform_show_uri_popup (const gchar *uri) GtkWidget *menu_item; const gchar *action_name; const gchar *translation_domain; -#ifdef MODEST_HILDON_VERSION_0 +#ifdef MODEST_HAVE_OSSO_MIME OssoURIAction *action = (OssoURIAction *) node->data; action_name = osso_uri_action_get_name (action); translation_domain = osso_uri_action_get_translation_domain (action); @@ -458,7 +484,7 @@ modest_platform_show_uri_popup (const gchar *uri) } else { gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); } -#endif +#endif /*MODEST_HAVE_OSSO_MIME*/ gtk_widget_show (menu_item); } @@ -534,12 +560,12 @@ entry_insert_text (GtkEditable *editable, gint chars_length; chars = gtk_editable_get_chars (editable, 0, -1); - chars_length = strlen (chars); + chars_length = g_utf8_strlen (chars, -1); /* Show WID-INF036 */ - if (chars_length == 20) { + if (chars_length >= 20) { hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (data)), NULL, - _("mcen_ib_maxchar_reached")); + _CS("ckdg_ib_maximum_characters_reached")); } else { if (chars_length == 0) { /* A blank space is not valid as first character */ @@ -573,9 +599,10 @@ entry_changed (GtkEditable *editable, gchar *chars; chars = gtk_editable_get_chars (editable, 0, -1); + g_return_if_fail (chars != NULL); - /* Dimm OK button */ - if (strlen (chars) == 0) { + /* Dimm OK button. Do not allow also the "/" */ + if (strlen (chars) == 0 || strchr (chars, '/')) { GtkWidget *ok_button; GList *buttons; @@ -584,7 +611,10 @@ entry_changed (GtkEditable *editable, gtk_widget_set_sensitive (ok_button, FALSE); g_list_free (buttons); - } + } else if (g_utf8_strlen (chars,-1) >= 21) + hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (user_data)), NULL, + _CS("ckdg_ib_maximum_characters_reached")); + /* Free */ g_free (chars); } @@ -603,6 +633,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window, GtkSortType current_sort_type; gint attachments_sort_id; gint priority_sort_id; + GtkTreeSortable *sortable; /* Get header window */ if (MODEST_IS_MAIN_WINDOW (parent_window)) { @@ -612,7 +643,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window, if (!header_view) return; /* Add sorting keys */ - cols = modest_header_view_get_columns (header_view); + cols = modest_header_view_get_columns (header_view); if (cols == NULL) return; int sort_model_ids[6]; int sort_ids[6]; @@ -661,8 +692,9 @@ launch_sort_headers_dialog (GtkWindow *parent_window, sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY; 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))))); /* Launch dialogs */ - if (!gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view))), + if (!gtk_tree_sortable_get_sort_column_id (sortable, ¤t_sort_colid, ¤t_sort_type)) { hildon_sort_dialog_set_sort_key (dialog, default_key); hildon_sort_dialog_set_sort_order (dialog, GTK_SORT_DESCENDING); @@ -686,6 +718,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window, hildon_sort_dialog_set_sort_key (dialog, current_sort_keyid); } } + result = gtk_dialog_run (GTK_DIALOG (dialog)); if (result == GTK_RESPONSE_OK) { sort_key = hildon_sort_dialog_get_sort_key (dialog); @@ -703,26 +736,33 @@ launch_sort_headers_dialog (GtkWindow *parent_window, } modest_header_view_sort_by_column_id (header_view, sort_model_ids[sort_key], sort_type); - gtk_tree_sortable_sort_column_changed (GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)))); + gtk_tree_sortable_sort_column_changed (sortable); } + + modest_widget_memory_save (modest_runtime_get_conf (), + G_OBJECT (header_view), MODEST_CONF_HEADER_VIEW_KEY); + while (gtk_events_pending ()) + gtk_main_iteration (); + /* free */ g_list_free(cols); } - - -gint -modest_platform_run_new_folder_dialog (GtkWindow *parent_window, - TnyFolderStore *parent_folder, - gchar *suggested_name, - gchar **folder_name) +static gint +modest_platform_run_folder_name_dialog (GtkWindow *parent_window, + const gchar *dialog_title, + const gchar *label_text, + const gchar *suggested_name, + gchar **folder_name) { + GtkWidget *accept_btn = NULL; GtkWidget *dialog, *entry, *label, *hbox; + GList *buttons = NULL; gint result; /* Ask the user for the folder name */ - dialog = gtk_dialog_new_with_buttons (_("mcen_ti_new_folder"), + dialog = gtk_dialog_new_with_buttons (dialog_title, parent_window, GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, @@ -731,8 +771,13 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, GTK_RESPONSE_REJECT, NULL); + /* Add accept button (with unsensitive handler) */ + buttons = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area)); + accept_btn = GTK_WIDGET (buttons->next->data); + g_signal_connect (G_OBJECT (accept_btn), "insensitive-press", G_CALLBACK (folder_name_insensitive_press), parent_window); + /* Create label and entry */ - label = gtk_label_new (_("mcen_fi_new_folder_name")); + label = gtk_label_new (label_text); /* TODO: check that the suggested name does not exist */ /* We set 21 as maximum because we want to show WID-INF036 when the user inputs more that 20 */ @@ -764,15 +809,51 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, 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))); gtk_widget_destroy (dialog); + while (gtk_events_pending ()) + gtk_main_iteration (); + return result; } +static void +folder_name_insensitive_press (GtkWidget *widget, ModestWindow *window) +{ + hildon_banner_show_information (NULL, NULL, _("(empty)")); +} + +gint +modest_platform_run_new_folder_dialog (GtkWindow *parent_window, + TnyFolderStore *parent_folder, + gchar *suggested_name, + gchar **folder_name) +{ + return modest_platform_run_folder_name_dialog (parent_window, + _("mcen_ti_new_folder"), + _("mcen_fi_new_folder_name"), + suggested_name, + folder_name); +} + +gint +modest_platform_run_rename_folder_dialog (GtkWindow *parent_window, + TnyFolderStore *parent_folder, + const gchar *suggested_name, + gchar **folder_name) +{ + return modest_platform_run_folder_name_dialog (parent_window, + _("New folder name"), + _("Enter new folder name:"), + suggested_name, + folder_name); +} + gint modest_platform_run_confirmation_dialog (GtkWindow *parent_window, const gchar *message) @@ -781,11 +862,38 @@ modest_platform_run_confirmation_dialog (GtkWindow *parent_window, gint response; dialog = hildon_note_new_confirmation (parent_window, message); + gtk_window_set_modal (GTK_WINDOW(dialog), TRUE); response = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (GTK_WIDGET (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); + + response = gtk_dialog_run (GTK_DIALOG (dialog)); + + gtk_widget_destroy (GTK_WIDGET (dialog)); + + while (gtk_events_pending ()) + gtk_main_iteration (); + return response; } @@ -797,20 +905,156 @@ modest_platform_run_information_dialog (GtkWindow *parent_window, dialog = hildon_note_new_information (parent_window, message); - gtk_dialog_run (GTK_DIALOG (dialog)); + g_signal_connect_swapped (dialog, + "response", + G_CALLBACK (gtk_widget_destroy), + dialog); - gtk_widget_destroy (GTK_WIDGET (dialog)); + gtk_widget_show_all (dialog); } -gboolean modest_platform_connect_and_wait (GtkWindow *parent_window) + + +typedef struct { + GMainLoop* loop; +} UtilIdleData; + +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)) { + gdk_threads_enter(); + tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device), NULL); + gdk_threads_leave(); + } + + /* 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 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) +{ + 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; +} + + +gboolean modest_platform_connect_and_wait (GtkWindow *parent_window) +{ + 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__); return TRUE; + } else + { + printf ("DEBUG: %s: tny_device_is_online() returned FALSE\n", __FUNCTION__); + } /* This blocks on the result: */ - return tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device), NULL); + UtilIdleData *data = g_slice_new0 (UtilIdleData); + + 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); + } + + /* 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); */ + + g_slice_free (UtilIdleData, data); + + return tny_device_is_online (device); +} + +gboolean modest_platform_connect_and_wait_if_network_account (GtkWindow *parent_window, TnyAccount *account) +{ + if (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_STORE) { + if (!TNY_IS_CAMEL_POP_STORE_ACCOUNT (account) && + !TNY_IS_CAMEL_IMAP_STORE_ACCOUNT (account)) { + /* This must be a maildir account, which does not require a connection: */ + return TRUE; + } + } + + return modest_platform_connect_and_wait (parent_window); +} + +gboolean modest_platform_connect_and_wait_if_network_folderstore (GtkWindow *parent_window, TnyFolderStore *folder_store) +{ + if (!folder_store) + return TRUE; /* Maybe it is something local. */ + + gboolean result = TRUE; + if (TNY_IS_FOLDER (folder_store)) { + /* Get the folder's parent account: */ + TnyAccount *account = tny_folder_get_account(TNY_FOLDER (folder_store)); + result = modest_platform_connect_and_wait_if_network_account (NULL, account); + g_object_unref (account); + } else if (TNY_IS_ACCOUNT (folder_store)) { + /* Use the folder store as an account: */ + result = modest_platform_connect_and_wait_if_network_account (NULL, TNY_ACCOUNT (folder_store)); + } + + return result; } void @@ -869,26 +1113,28 @@ gboolean modest_platform_set_update_interval (guint minutes) st_time->tm_min += minutes; /* Set the time in alarm_event_t structure: */ - alarm_event_t event; - memset (&event, 0, sizeof (alarm_event_t)); - event.alarm_time = mktime (st_time); + alarm_event_t *event = g_new0(alarm_event_t, 1); + event->alarm_time = mktime (st_time); /* Specify what should happen when the alarm happens: * It should call this D-Bus method: */ /* Note: I am surpised that alarmd can't just use the modest.service file * for this. murrayc. */ - event.dbus_path = g_strdup(PREFIX "/bin/modest"); + event->dbus_path = g_strdup(PREFIX "/bin/modest"); - event.dbus_interface = g_strdup (MODEST_DBUS_IFACE); - event.dbus_service = g_strdup (MODEST_DBUS_SERVICE); - event.dbus_name = g_strdup (MODEST_DBUS_METHOD_SEND_RECEIVE); + event->dbus_interface = g_strdup (MODEST_DBUS_IFACE); + event->dbus_service = g_strdup (MODEST_DBUS_SERVICE); + event->dbus_name = g_strdup (MODEST_DBUS_METHOD_SEND_RECEIVE); /* Otherwise, a dialog will be shown if exect_name or dbus_path is NULL, even though we have specified no dialog text: */ - event.flags = ALARM_EVENT_NO_DIALOG; + event->flags = ALARM_EVENT_NO_DIALOG; - alarm_cookie = alarm_event_add (&event); + alarm_cookie = alarm_event_add (event); + + /* now, free it */ + alarm_event_free (event); /* Store the alarm ID in GConf, so we can remove it later: * This is apparently valid between application instances. */ @@ -928,27 +1174,29 @@ modest_platform_get_global_settings_dialog () void modest_platform_on_new_msg (void) { -/* HildonNotification *not; */ - -/* /\* Create a new notification. FIXME put the right values, need */ -/* some more specs *\/ */ -/* not = hildon_notification_new ("TODO: (new email) Summary", */ -/* "TODO: (new email) Description", */ -/* "qgn_contact_group_chat_invitation", */ -/* "system.note.dialog"); */ - -/* /\* Play sound SR-SND-18. TODO: play the right file *\/ */ -/* hildon_notification_set_sound (not, "/usr/share/sounds/ui-new_email.wav"); */ - -/* /\* Set the led pattern *\/ */ -/* notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (not), "led-pattern", 3); */ - -/* /\* Notify. We need to do this in an idle because this function */ -/* could be called from a thread *\/ */ -/* if (!notify_notification_show (NOTIFY_NOTIFICATION (not), NULL)) */ -/* g_error ("Failed to send notification"); */ +#ifdef MODEST_HAVE_HILDON_NOTIFY + HildonNotification *not; + + /* Create a new notification. FIXME put the right values, need + some more specs */ + not = hildon_notification_new ("TODO: (new email) Summary", + "TODO: (new email) Description", + "qgn_contact_group_chat_invitation", + "system.note.dialog"); + + /* Play sound SR-SND-18. TODO: play the right file */ + /* TODO: Where is this declared? hildon_notification_set_sound (not, "/usr/share/sounds/ui-new_email.wav"); */ + + /* Set the led pattern */ + notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (not), "led-pattern", 3); + + /* Notify. We need to do this in an idle because this function + could be called from a thread */ + if (!notify_notification_show (NOTIFY_NOTIFICATION (not), NULL)) + g_error ("Failed to send notification"); -/* g_object_unref (not); */ + g_object_unref (not); +#endif /*MODEST_HAVE_HILDON_NOTIFY*/ } @@ -962,7 +1210,7 @@ modest_platform_show_help (GtkWindow *parent_window, g_return_if_fail (osso_context); /* Show help */ -#ifdef MODEST_HILDON_VERSION_0 +#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); @@ -1018,3 +1266,25 @@ modest_platform_create_folder_view (TnyFolderStoreQuery *query) return widget; } + +void +modest_platform_information_banner (GtkWidget *parent, + const gchar *icon_name, + const gchar *text) +{ + hildon_banner_show_information (parent, icon_name, text); +} + +GtkWidget * +modest_platform_animation_banner (GtkWidget *parent, + const gchar *animation_name, + const gchar *text) +{ + GtkWidget *inf_note = NULL; + + g_return_val_if_fail (text != NULL, NULL); + + inf_note = hildon_banner_show_animation (parent, animation_name, text); + + return inf_note; +}