( 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
#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"
#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"
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;
* 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;
}