X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-platform.c;h=09ff30e9f5c875d41c3d6d007ac7483c3513e54f;hb=f65289e467bc8ce1c1c4d8c13fafff637ae13034;hp=c0690cf0903ed4bd8674dec0d472a69b4d165763;hpb=83cfbd96aa351d1ffc91d409cacb26ad1ec7df2d;p=modest

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index c0690cf..09ff30e 100644
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -29,6 +29,7 @@
 
 #include <config.h>
 #include <glib/gi18n.h>
+
 #include <modest-platform.h>
 #include <modest-runtime.h>
 #include <modest-main-window.h>
@@ -57,7 +58,7 @@
 #include <modest-account-settings-dialog.h>
 #include <modest-easysetup-wizard-dialog.h>
 #include "modest-hildon2-sort-dialog.h"
-#include <hildon/hildon-sound.h>
+#include <hildon/hildon.h>
 #include <osso-mem.h>
 #include "hildon2/modest-hildon2-details-dialog.h"
 #include "hildon2/modest-hildon2-window-mgr.h"
@@ -564,18 +565,14 @@ entry_insert_text (GtkEditable *editable,
 			g_free (msg);
 			g_free (tmp);
 		} else {
-			gint insert_length;
-
-			insert_length = g_utf8_strlen (text, -1);
-
-			if (insert_length + chars_length >= 20) {
+			if (length >= 20) {
 				hildon_banner_show_information  (gtk_widget_get_parent (GTK_WIDGET (data)), NULL,
 								 _CS("ckdg_ib_maximum_characters_reached"));
 			}
 			/* 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, MIN (chars_length + insert_length, 20), position);
+			gtk_editable_insert_text (editable, text, length, position);
 			g_signal_handlers_unblock_by_func (editable,
 							   (gpointer) entry_insert_text, data);
 		}
@@ -2464,7 +2461,7 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window,
 					      GTK_WINDOW (parent_window),
 					      GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR |
 					      GTK_DIALOG_DESTROY_WITH_PARENT,
-					      _("mcen_bd_new"), MODEST_GTK_RESPONSE_NEW_FOLDER,
+					      _HL("wdgt_bd_new"), MODEST_GTK_RESPONSE_NEW_FOLDER,
 	                                      NULL);
 
 	/* Create folder view */