2007-07-11 Armin Burgmeier <armin@openismus.com>

* src/maemo/modest-account-settings-dialog.h: Include
	<gtk/gtknotebook.h> to fix the build (at least for me).

	* src/maemo/modest-platform.c (modest_platform_run_new_folder_dialog):
	Use "New FolderN" as default suggested name if "New folder" already
	exists, with N being the first free number, though never exceed "New
	folder99" in which case we just fall back to "New Folder" even though
	it already exists. This fixes projects.maemo.org bug NB#58663.

pmo-trunk-r2716

diff --git a/ChangeLog2 b/ChangeLog2
index a79c9ee..02acee2 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,3 +1,14 @@
+2007-07-11  Armin Burgmeier  <armin@openismus.com>
+
+       * src/maemo/modest-account-settings-dialog.h: Include
+       <gtk/gtknotebook.h> to fix the build (at least for me).
+
+       * src/maemo/modest-platform.c (modest_platform_run_new_folder_dialog):
+       Use "New FolderN" as default suggested name if "New folder" already
+       exists, with N being the first free number, though never exceed "New
+       folder99" in which case we just fall back to "New Folder" even though
+       it already exists. This fixes projects.maemo.org bug NB#58663.
+

 2007-07-11  Murray Cumming  <murrayc@murrayc.com>
 
        * src/maemo/modest-account-view-window.c: (on_new_button_clicked):
 2007-07-11  Murray Cumming  <murrayc@murrayc.com>
 
        * src/maemo/modest-account-view-window.c: (on_new_button_clicked):

diff --git a/src/maemo/modest-account-settings-dialog.h b/src/maemo/modest-account-settings-dialog.h
index 419d26f..89e06ea 100644 (file)
--- a/src/maemo/modest-account-settings-dialog.h
+++ b/src/maemo/modest-account-settings-dialog.h
@@ -6,7 +6,8 @@
 #ifndef _MODEST_ACCOUNT_SETTINGS_DIALOG
 #define _MODEST_ACCOUNT_SETTINGS_DIALOG
 
 #ifndef _MODEST_ACCOUNT_SETTINGS_DIALOG
 #define _MODEST_ACCOUNT_SETTINGS_DIALOG
 

-#include <gtk/gtkdialog.h> 
+#include <gtk/gtkdialog.h>
+#include <gtk/gtknotebook.h>

 #include "modest-account-mgr.h"
 #include "modest-hildon-includes.h"
 
 #include "modest-account-mgr.h"
 #include "modest-hildon-includes.h"
 

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index 5812b27..b53ee1b 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -43,6 +43,7 @@
 #include <libosso.h>
 #include <alarmd/alarm_event.h> /* For alarm_event_add(), etc. */
 #include <tny-maemo-conic-device.h>
 #include <libosso.h>
 #include <alarmd/alarm_event.h> /* For alarm_event_add(), etc. */
 #include <tny-maemo-conic-device.h>

+#include <tny-simple-list.h>

 #include <tny-folder.h>
 #include <tny-camel-imap-store-account.h>
 #include <tny-camel-pop-store-account.h>
 #include <tny-folder.h>
 #include <tny-camel-imap-store-account.h>
 #include <tny-camel-pop-store-account.h>

@@ -834,11 +835,62 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
                                       gchar *suggested_name,
                                       gchar **folder_name)
 {
                                       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
 }
 
 gint