projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes the new folder dialog in Diablo
[modest]
/
src
/
maemo
/
modest-platform.c
diff --git
a/src/maemo/modest-platform.c
b/src/maemo/modest-platform.c
index
119667e
..
5472fbe
100644
(file)
--- a/
src/maemo/modest-platform.c
+++ b/
src/maemo/modest-platform.c
@@
-29,6
+29,7
@@
#include <config.h>
#include <glib/gi18n.h>
#include <config.h>
#include <glib/gi18n.h>
+#include <modest-defs.h>
#include <modest-platform.h>
#include <modest-runtime.h>
#include <modest-main-window.h>
#include <modest-platform.h>
#include <modest-runtime.h>
#include <modest-main-window.h>
@@
-43,6
+44,8
@@
#include <tny-maemo-conic-device.h>
#include <tny-simple-list.h>
#include <tny-folder.h>
#include <tny-maemo-conic-device.h>
#include <tny-simple-list.h>
#include <tny-folder.h>
+#include <tny-error.h>
+#include <tny-merge-folder.h>
#include <tny-camel-imap-store-account.h>
#include <tny-camel-pop-store-account.h>
#include <gtk/gtkicontheme.h>
#include <tny-camel-imap-store-account.h>
#include <tny-camel-pop-store-account.h>
#include <gtk/gtkicontheme.h>
@@
-789,7
+792,7
@@
modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
g_free(real_suggested_name);
if (parent_folder != NULL) {
g_free(real_suggested_name);
if (parent_folder != NULL) {
- parent_folder = suggested_parent?g_object_ref (suggested_parent): NULL;
+ *parent_folder = suggested_parent?g_object_ref (suggested_parent): NULL;
}
return result;
}
return result;
@@
-2112,7
+2115,7
@@
modest_platform_check_memory_low (ModestWindow *win,
if (win && lowmem && visuals)
modest_platform_run_information_dialog (
GTK_WINDOW(win),
if (win && lowmem && visuals)
modest_platform_run_information_dialog (
GTK_WINDOW(win),
- dgettext("ke-recv","memr_ib_operation_disabled"),
+ _KR("memr_ib_operation_disabled"),
TRUE);
if (lowmem)
TRUE);
if (lowmem)