2007-06-14 [paul] 2.9.2cvs59

	* src/main.c
	* src/common/defs.h
		migrate sylpheed config

diff --git a/ChangeLog b/ChangeLog
index 9135675e0545162571275b6e660cc5f7702d0ae3..8fe14d1fa96a258afd9f0d9f5dce1215ed9b0561 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-14 [paul]      2.9.2cvs59
+
+       * src/main.c
+       * src/common/defs.h
+               migrate sylpheed config
+
 2007-06-14 [wwp]       2.9.2cvs58
 
        * src/gtk/pluginwindow.c

diff --git a/PATCHSETS b/PATCHSETS
index ae469a309db0445bf173d23a4ed261c18e51a4f3..e9491c783cde650108fd553d431a270def88373d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2634,3 +2634,4 @@
 ( cvs diff -u -r 1.30.2.21 -r 1.30.2.22 tools/README;  ) > 2.9.2cvs56.patchset
 ( cvs diff -u -r 1.53.2.26 -r 1.53.2.27 po/POTFILES.in;  cvs diff -u -r 1.155.2.64 -r 1.155.2.65 src/Makefile.am;  cvs diff -u -r 1.207.2.163 -r 1.207.2.164 src/folderview.c;  cvs diff -u -r 1.204.2.136 -r 1.204.2.137 src/prefs_common.c;  cvs diff -u -r 1.103.2.83 -r 1.103.2.84 src/prefs_common.h;  cvs diff -u -r 1.1.2.41 -r 1.1.2.42 src/prefs_summaries.c;  diff -u /dev/null src/prefs_summary_open.c;  diff -u /dev/null src/prefs_summary_open.h;  cvs diff -u -r 1.395.2.303 -r 1.395.2.304 src/summaryview.c;  ) > 2.9.2cvs57.patchset
 ( cvs diff -u -r 1.5.2.47 -r 1.5.2.48 src/gtk/pluginwindow.c;  ) > 2.9.2cvs58.patchset
+( cvs diff -u -r 1.115.2.154 -r 1.115.2.155 src/main.c;  cvs diff -u -r 1.9.2.37 -r 1.9.2.38 src/common/defs.h;  ) > 2.9.2cvs59.patchset

diff --git a/configure.ac b/configure.ac
index fdbd1480ff8edbfe764779e2f0412fdfe078b18a..79111f72446c3859591249aa2398953a961a92f8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=58
+EXTRA_VERSION=59
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/defs.h b/src/common/defs.h
index 1f966d362c7feb74e449fda1579c8ede43b32450..0096435ae094e358a94baca1d9b10341115c9238 100644 (file)
--- a/src/common/defs.h
+++ b/src/common/defs.h
@@ -47,6 +47,7 @@
 #define OLD_GTK2_RC_DIR                ".sylpheed-claws"
 #define OLDER_GTK2_RC_DIR      ".sylpheed-gtk2"
 #define OLD_GTK1_RC_DIR                ".sylpheed"
+#define SYLPHEED_RC_DIR                ".sylpheed-2.0"
 #define NEWS_CACHE_DIR         "newscache"
 #define IMAP_CACHE_DIR         "imapcache"
 #define MBOX_CACHE_DIR         "mboxcache"
@@ -82,6 +83,7 @@
 #define PLUGINS_URI            "http://www.claws-mail.org/plugins.php"
 #define BUGZILLA_URI           "http://www.thewildbeast.co.uk/claws-mail/bugzilla/enter_bug.cgi"
 #define THEMES_URI             "http://www.claws-mail.org/themes.php"
+#define TOOLS_URI              "http://www.claws-mail.org/tools.php"
 #define MAILING_LIST_URI       "http://www.claws-mail.org/MLs.php"
 #define USERS_ML_ADDR          "claws-mail-users@dotsrc.org"
 #define GPL_URI                        "http://www.gnu.org/licenses/gpl.html"

diff --git a/src/main.c b/src/main.c
index 90d42478cb930c04af7002eed0ab8dfcacd0508b..f56bedbc8ca75c88cb93b8d003d327f211f58f4b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -326,8 +326,15 @@ static void chk_update_val(GtkWidget *widget, gpointer data)
 
 static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cfg_dir, const gchar *oldversion)
 {
-       gchar *message = g_strdup_printf(_("Configuration for %s (or previous) found.\n"
+       gchar *message = g_strdup_printf(_("Configuration for %s found.\n"
                         "Do you want to migrate this configuration?"), oldversion);
+       gchar *message2 = g_strdup_printf(_("\n\nYour Sylpheed filtering rules can be converted by a\n"
+                            "script available at %s."), TOOLS_URI);
+
+       if (!strcmp(oldversion, "Sylpheed"))
+               message = g_strconcat(message, message2, NULL);
+       g_free(message2);
+
        gint r = 0;
        GtkWidget *window = NULL;
        GtkWidget *keep_backup_chk;
@@ -742,13 +749,16 @@ int main(int argc, char *argv[])
                 * and migration succeeded, and FALSE otherwise.
                 */
                if (is_dir_exist(OLD_GTK2_RC_DIR)) {
-                       r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR, "Sylpheed-Claws 2.6.0");
+                       r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR, _("Sylpheed-Claws 2.6.0 (or older)"));
                        asked_for_migration = TRUE;
                } else if (is_dir_exist(OLDER_GTK2_RC_DIR)) {
-                       r = migrate_old_config(OLDER_GTK2_RC_DIR, RC_DIR, "Sylpheed-Claws 1.9.15");
+                       r = migrate_old_config(OLDER_GTK2_RC_DIR, RC_DIR, _("Sylpheed-Claws 1.9.15 (or older)"));
                        asked_for_migration = TRUE;
                } else if (is_dir_exist(OLD_GTK1_RC_DIR)) {
-                       r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR, "Sylpheed-Claws 1.0.5");
+                       r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR, _("Sylpheed-Claws 1.0.5 (or older)"));
+                       asked_for_migration = TRUE;
+               } else if (is_dir_exist(SYLPHEED_RC_DIR)) {
+                       r = migrate_old_config(SYLPHEED_RC_DIR, RC_DIR, "Sylpheed");
                        asked_for_migration = TRUE;
                }