X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-platform.c;h=cf31c38b896554a1a3a70a73d90dc0fc85dd95fe;hp=8b998041bd751c963f726fa23652b6a6c81ccae9;hb=fcbc6a6dfa1a10921d2ca889256a21b192adbe98;hpb=6b4b58c4bf64ce4318329ac2ad33367a680e128d;ds=sidebyside diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c index 8b99804..cf31c38 100644 --- a/src/maemo/modest-platform.c +++ b/src/maemo/modest-platform.c @@ -43,10 +43,14 @@ #include #include /* For alarm_event_add(), etc. */ #include +#include #include +#include +#include #include #include #include +#include #include @@ -54,10 +58,13 @@ #define URI_ACTION_COPY "copy:" static osso_context_t *osso_context = NULL; - + static void -on_modest_conf_update_interval_changed (ModestConf* self, const gchar *key, - ModestConfEvent event, gpointer user_data) +on_modest_conf_update_interval_changed (ModestConf* self, + const gchar *key, + ModestConfEvent event, + ModestConfNotificationId id, + gpointer user_data) { if (strcmp (key, MODEST_CONF_UPDATE_INTERVAL) == 0) { const guint update_interval_minutes = @@ -136,7 +143,13 @@ modest_platform_init (int argc, char *argv[]) /* Make sure that the update interval is changed whenever its gconf key - * is changed: */ + * is changed */ + /* CAUTION: we're not using here the + modest_conf_listen_to_namespace because we know that there + are other parts of Modest listening for this namespace, so + we'll receive the notifications anyway. We basically do not + use it because there is no easy way to do the + modest_conf_forget_namespace */ ModestConf *conf = modest_runtime_get_conf (); g_signal_connect (G_OBJECT(conf), "key_changed", @@ -145,7 +158,7 @@ modest_platform_init (int argc, char *argv[]) /* Get the initial update interval from gconf: */ on_modest_conf_update_interval_changed(conf, MODEST_CONF_UPDATE_INTERVAL, - MODEST_CONF_EVENT_KEY_CHANGED, NULL); + MODEST_CONF_EVENT_KEY_CHANGED, 0, NULL); /* initialize the addressbook */ if (!osso_abook_init (&argc, &argv, osso_context)) { @@ -197,14 +210,11 @@ guess_mime_type_from_name (const gchar* name) gchar* modest_platform_get_file_icon_name (const gchar* name, const gchar* mime_type, - gchar **effective_mime_type) + gchar **effective_mime_type) { GString *mime_str = NULL; gchar *icon_name = NULL; gchar **icons, **cursor; - - - g_return_val_if_fail (name || mime_type, NULL); if (!mime_type || !g_ascii_strcasecmp (mime_type, "application/octet-stream")) mime_str = g_string_new (guess_mime_type_from_name(name)); @@ -212,13 +222,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_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_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; } @@ -266,6 +281,11 @@ 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")); @@ -286,7 +306,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); @@ -303,9 +322,14 @@ 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; } @@ -332,20 +356,14 @@ modest_platform_activate_file (const gchar *path, const gchar *mime_type) con = osso_get_dbus_connection (osso_context); #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 /*MODEST_HAVE_OSSO_MIME*/ - } typedef struct { @@ -506,7 +524,14 @@ modest_platform_get_icon (const gchar *name) GtkIconTheme *current_theme = NULL; g_return_val_if_fail (name, NULL); + + /* strlen == 0 is not really an error; it just + * means the icon is not available + */ + 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) { @@ -517,7 +542,7 @@ modest_platform_get_icon (const gchar *name) } return pixbuf; } - +#endif /* */ current_theme = gtk_icon_theme_get_default (); pixbuf = gtk_icon_theme_load_icon (current_theme, name, 26, GTK_ICON_LOOKUP_NO_SVG, @@ -547,33 +572,32 @@ 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, - dgettext("hildon-common-strings", "ckdg_ib_maximum_characters_reached")); + _CS("ckdg_ib_maximum_characters_reached")); } else { - if (chars_length == 0) { - /* A blank space is not valid as first character */ - if (strcmp (text, " ")) { - GtkWidget *ok_button; - GList *buttons; - - /* Show OK button */ - buttons = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (data)->action_area)); - ok_button = GTK_WIDGET (buttons->next->data); - gtk_widget_set_sensitive (ok_button, TRUE); - g_list_free (buttons); - } + if (modest_text_utils_is_forbidden_char (*text, FOLDER_NAME_FORBIDDEN_CHARS)) { + /* Show an error */ + gchar *tmp, *msg; + + tmp = g_strndup (folder_name_forbidden_chars, + FOLDER_NAME_FORBIDDEN_CHARS_LENGTH); + msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp); + hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (data)), + NULL, msg); + g_free (msg); + g_free (tmp); + } else { + /* Write the text in the entry if it's valid */ + g_signal_handlers_block_by_func (editable, + (gpointer) entry_insert_text, data); + gtk_editable_insert_text (editable, text, length, position); + g_signal_handlers_unblock_by_func (editable, + (gpointer) entry_insert_text, data); } - - /* Write the text in the entry */ - g_signal_handlers_block_by_func (editable, - (gpointer) entry_insert_text, data); - gtk_editable_insert_text (editable, text, length, position); - g_signal_handlers_unblock_by_func (editable, - (gpointer) entry_insert_text, data); } /* Do not allow further processing */ g_signal_stop_emission_by_name (editable, "insert_text"); @@ -584,26 +608,24 @@ entry_changed (GtkEditable *editable, gpointer user_data) { gchar *chars; + GtkWidget *ok_button; + GList *buttons; + buttons = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (user_data)->action_area)); + ok_button = GTK_WIDGET (buttons->next->data); + chars = gtk_editable_get_chars (editable, 0, -1); g_return_if_fail (chars != NULL); - /* Dimm OK button */ - if (strlen (chars) == 0) { - GtkWidget *ok_button; - GList *buttons; - - buttons = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (user_data)->action_area)); - ok_button = GTK_WIDGET (buttons->next->data); - gtk_widget_set_sensitive (ok_button, FALSE); - - g_list_free (buttons); - } else if (strlen (chars) == 21) { + + if (g_utf8_strlen (chars,-1) >= 21) hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (user_data)), NULL, - dgettext("hildon-common-strings", "ckdg_ib_maximum_characters_reached")); - } - + _CS("ckdg_ib_maximum_characters_reached")); + else + gtk_widget_set_sensitive (ok_button, modest_text_utils_validate_folder_name(chars)); + /* Free */ + g_list_free (buttons); g_free (chars); } @@ -707,6 +729,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); @@ -730,6 +753,9 @@ launch_sort_headers_dialog (GtkWindow *parent_window, 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); } @@ -741,7 +767,9 @@ modest_platform_run_folder_name_dialog (GtkWindow *parent_window, 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 */ @@ -754,6 +782,9 @@ modest_platform_run_folder_name_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); /* Create label and entry */ label = gtk_label_new (label_text); /* TODO: check that the suggested name does not exist */ @@ -787,12 +818,16 @@ modest_platform_run_folder_name_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; } @@ -802,11 +837,62 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, 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); + gchar *real_suggested_name = NULL; + gint result; + + if(suggested_name == NULL) + { + const gchar *default_name = _("mcen_ia_default_folder_name"); + unsigned int i; + gchar num_str[3]; + + for(i = 0; i < 100; ++ i) + { + TnyList *list = tny_simple_list_new (); + TnyFolderStoreQuery *query = tny_folder_store_query_new (); + guint length; + + sprintf(num_str, "%.2u", i); + + if (i == 0) + real_suggested_name = g_strdup (default_name); + else + real_suggested_name = g_strdup_printf (_("mcen_ia_default_folder_name_s"), + num_str); + + tny_folder_store_query_add_item (query, real_suggested_name, + TNY_FOLDER_STORE_QUERY_OPTION_MATCH_ON_NAME); + + tny_folder_store_get_folders (parent_folder, list, query, NULL); + + length = tny_list_get_length (list); + g_object_unref (query); + g_object_unref (list); + + if (length == 0) + break; + + g_free (real_suggested_name); + } + + /* Didn't find a free number */ + if (i == 100) + real_suggested_name = g_strdup (default_name); + } + else + { + real_suggested_name = suggested_name; + } + + result = modest_platform_run_folder_name_dialog (parent_window, + _("mcen_ti_new_folder"), + _("mcen_fi_new_folder_name"), + real_suggested_name, + folder_name); + if (suggested_name == NULL) + g_free(real_suggested_name); + + return result; } gint @@ -830,11 +916,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; } @@ -846,20 +959,194 @@ 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)) { + + /* 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 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; +} + +static void +set_account_to_online (TnyAccount *account) +{ + /* 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. + */ + GError *error = NULL; + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (account), TRUE, &error); + if (error) { + g_warning ("%s: tny_camel_account_set_online() returned a GError:\n %s\n", + __FUNCTION__, error->message); + g_error_free (error); + } + } + #endif +} + +gboolean 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: */ - 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); + + gboolean result = tny_device_is_online (device); + + if (result) + set_account_to_online (account); + + return result; +} + +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, account); +} + +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)); + if (account != NULL) { + 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 @@ -909,35 +1196,34 @@ gboolean modest_platform_set_update_interval (guint minutes) /* Register alarm: */ - /* Get current time: */ - time_t time_now; - time (&time_now); - struct tm *st_time = localtime (&time_now); - - /* Add minutes to tm_min field: */ - st_time->tm_min += minutes; + /* Set the interval in alarm_event_t structure: */ + alarm_event_t *event = g_new0(alarm_event_t, 1); + event->alarm_time = minutes * 60; /* seconds */ - /* 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); + /* Set recurrence every few minutes: */ + event->recurrence = minutes; + event->recurrence_count = -1; /* Means infinite */ /* 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(MODEST_DBUS_OBJECT); + 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); + + /* Use ALARM_EVENT_NO_DIALOG: Otherwise, a dialog will be shown if + * exec_name or dbus_path is NULL, even though we have specified no dialog text. + * Also use ALARM_EVENT_ACTIVATION so that modest is started (without UI) to get emails + * This is why we want to use the Alarm API instead of just g_timeout_add(). + * (The old maemo email-client did this, though it isn't specified in the UI spec.) + */ + event->flags = ALARM_EVENT_NO_DIALOG | ALARM_EVENT_ACTIVATION; - 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); + alarm_cookie = alarm_event_add (event); - /* 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; - - 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. */ @@ -946,20 +1232,22 @@ gboolean modest_platform_set_update_interval (guint minutes) if (!alarm_cookie) { /* Error */ const alarm_error_t alarm_error = alarmd_get_error (); - printf ("Error setting alarm event. Error code: '%d'\n", alarm_error); + g_debug ("Error setting alarm event. Error code: '%d'\n", alarm_error); /* Give people some clue: */ /* The alarm API should have a function for this: */ if (alarm_error == ALARMD_ERROR_DBUS) { - printf (" ALARMD_ERROR_DBUS: An error with D-Bus occurred, probably coudn't get a D-Bus connection.\n"); + g_debug (" ALARMD_ERROR_DBUS: An error with D-Bus occurred, probably coudn't get a D-Bus connection.\n"); } else if (alarm_error == ALARMD_ERROR_CONNECTION) { - printf (" ALARMD_ERROR_CONNECTION: Could not contact alarmd via D-Bus.\n"); + g_debug (" ALARMD_ERROR_CONNECTION: Could not contact alarmd via D-Bus.\n"); } else if (alarm_error == ALARMD_ERROR_INTERNAL) { - printf (" ALARMD_ERROR_INTERNAL: Some alarmd or libalarm internal error, possibly a version mismatch.\n"); + g_debug (" ALARMD_ERROR_INTERNAL: Some alarmd or libalarm internal error, possibly a version mismatch.\n"); } else if (alarm_error == ALARMD_ERROR_MEMORY) { - printf (" ALARMD_ERROR_MEMORY: A memory allocation failed.\n"); + g_debug (" ALARMD_ERROR_MEMORY: A memory allocation failed.\n"); } else if (alarm_error == ALARMD_ERROR_ARGUMENT) { - printf (" ALARMD_ERROR_ARGUMENT: An argument given by caller was invalid.\n"); + g_debug (" ALARMD_ERROR_ARGUMENT: An argument given by caller was invalid.\n"); + } else if (alarm_error == ALARMD_ERROR_NOT_RUNNING) { + g_debug (" ALARMD_ERROR_NOT_RUNNING: alarmd is not running.\n"); } return FALSE; @@ -1058,10 +1346,11 @@ modest_platform_create_folder_view (TnyFolderStoreQuery *query) { GtkWidget *widget = modest_folder_view_new (query); - /* Show all accounts by default */ + /* Show one account by default */ 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), @@ -1071,9 +1360,23 @@ modest_platform_create_folder_view (TnyFolderStoreQuery *query) } void -modest_platform_information_banner (GtkWidget *widget, +modest_platform_information_banner (GtkWidget *parent, const gchar *icon_name, const gchar *text) { - hildon_banner_show_information (widget, icon_name, 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; }