* Fixes NB#60725 which affects systest, now an information note is shown instead...

[modest] / src / maemo / modest-platform.c

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index 914b112..685d6fc 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -49,6 +49,7 @@
 #include <gtk/gtkicontheme.h>
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkmain.h>
+#include <modest-text-utils.h>
 #include <string.h>
 
 
@@ -350,20 +351,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  {
@@ -565,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,
-                                                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 */
@@ -616,11 +611,9 @@ entry_changed (GtkEditable *editable,
                gtk_widget_set_sensitive (ok_button, FALSE);
 
                g_list_free (buttons);
-       } else if (strlen (chars) == 21) {
+       } else 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"));            
        /* Free */
        g_free (chars);
 }
@@ -749,6 +742,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);      
 }
@@ -820,6 +816,9 @@ modest_platform_run_folder_name_dialog (GtkWindow *parent_window,
 
        gtk_widget_destroy (dialog);
 
+       while (gtk_events_pending ())
+               gtk_main_iteration ();
+
        return result;
 }
 
@@ -869,6 +868,32 @@ modest_platform_run_confirmation_dialog (GtkWindow *parent_window,
 
        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;
 }