projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Fixes NB#82696, auto update is working again
[modest]
/
src
/
maemo
/
modest-platform.c
diff --git
a/src/maemo/modest-platform.c
b/src/maemo/modest-platform.c
index
4b86833
..
4324559
100644
(file)
--- a/
src/maemo/modest-platform.c
+++ b/
src/maemo/modest-platform.c
@@
-54,7
+54,7
@@
#include <string.h>
#include <libgnomevfs/gnome-vfs-mime-utils.h>
#include <modest-account-settings-dialog.h>
#include <string.h>
#include <libgnomevfs/gnome-vfs-mime-utils.h>
#include <modest-account-settings-dialog.h>
-#include <maemo/easysetup/modest-easysetup-wizard.h>
+#include <easysetup/modest-easysetup-wizard-dialog.h>
#include <hildon/hildon-sound.h>
#ifdef MODEST_HAVE_MCE
#include <hildon/hildon-sound.h>
#ifdef MODEST_HAVE_MCE
@@
-838,7
+838,8
@@
modest_platform_run_folder_name_dialog (GtkWindow *parent_window,
else
gtk_entry_set_text (GTK_ENTRY (entry), _("mcen_ia_default_folder_name"));
gtk_entry_set_width_chars (GTK_ENTRY (entry),
else
gtk_entry_set_text (GTK_ENTRY (entry), _("mcen_ia_default_folder_name"));
gtk_entry_set_width_chars (GTK_ENTRY (entry),
- g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (entry)), -1));
+ MAX (g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (entry)), -1),
+ g_utf8_strlen (_("mcen_ia_default_folder_name"), -1)));
gtk_entry_select_region (GTK_ENTRY (entry), 0, -1);
/* Connect to the response method to avoid closing the dialog
gtk_entry_select_region (GTK_ENTRY (entry), 0, -1);
/* Connect to the response method to avoid closing the dialog
@@
-861,15
+862,19
@@
modest_platform_run_folder_name_dialog (GtkWindow *parent_window,
/* Create the hbox */
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, 0);
/* Create the hbox */
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
/* Add hbox to dialog */
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox),
hbox, FALSE, FALSE, 0);
/* Add hbox to dialog */
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox),
hbox, FALSE, FALSE, 0);
-
+
gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
gtk_window_set_transient_for (GTK_WINDOW (dialog), parent_window);
gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
gtk_window_set_transient_for (GTK_WINDOW (dialog), parent_window);
-
+
+ /* Some locales like pt_BR need this to get the full window
+ title shown */
+ gtk_widget_set_size_request (GTK_WIDGET (dialog), 300, -1);
+
result = gtk_dialog_run (GTK_DIALOG(dialog));
if (result == GTK_RESPONSE_ACCEPT)
*folder_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
result = gtk_dialog_run (GTK_DIALOG(dialog));
if (result == GTK_RESPONSE_ACCEPT)
*folder_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
@@
-2235,8
+2240,7
@@
modest_platform_get_current_connection (void)
} else {
retval = MODEST_CONNECTED_VIA_ANY;
}
} else {
retval = MODEST_CONNECTED_VIA_ANY;
}
- }
-
+ }
g_object_unref (iap);
}
#else
g_object_unref (iap);
}
#else