gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

2006-11-08 [paul] 2.6.0cvs14

Browse source 
* src/main.c
	* src/common/defs.h
		Migrate sylpheedrc to clawsrc, and fix the standard
		plugins path in the process
This commit is contained in:
Colin Leroy 2006-11-08 09:15:08 +00:00
parent e19edd5afe
commit 993d220e0e
5 changed files with 63 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-11-08 [paul] 2.6.0cvs14
* src/main.c
* src/common/defs.h
Migrate sylpheedrc to clawsrc, and fix the standard
plugins path in the process
2006-11-07 [colin] 2.6.0cvs13
* src/Makefile.am

1
PATCHSETS
View file

@ -2038,3 +2038,4 @@
( cvs diff -u -r 1.4.2.37 -r 1.4.2.38 src/gtk/about.c; ) > 2.6.0cvs11.patchset
( cvs diff -u -r 1.382.2.323 -r 1.382.2.324 src/compose.c; ) > 2.6.0cvs12.patchset
( cvs diff -u -r 1.155.2.46 -r 1.155.2.47 src/Makefile.am; ) > 2.6.0cvs13.patchset
( cvs diff -u -r 1.115.2.111 -r 1.115.2.112 src/main.c; cvs diff -u -r 1.9.2.28 -r 1.9.2.29 src/common/defs.h; ) > 2.6.0cvs14.patchset

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=6
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=13
EXTRA_VERSION=14
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

3
src/common/defs.h
View file

@ -52,7 +52,8 @@
#define MBOX_CACHE_DIR "mboxcache"
#define HEADER_CACHE_DIR "headercache"
#define MIME_TMP_DIR "mimetmp"
#define COMMON_RC "sylpheedrc"
#define COMMON_RC "clawsrc"
#define OLD_COMMON_RC "sylpheedrc"
#define ACCOUNT_RC "accountrc"
#define CUSTOM_HEADER_RC "customheaderrc"
#define DISPLAY_HEADER_RC "dispheaderrc"

55
src/main.c
View file

@ -287,6 +287,49 @@ static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cf
return (r == 0);
}
static void migrate_common_rc(const gchar *old_rc, const gchar *new_rc)
{
FILE *oldfp, *newfp;
gchar *plugin_path, *old_plugin_path, *new_plugin_path;
gchar buf[BUFFSIZE];
oldfp = g_fopen(old_rc, "r");
if (!oldfp)
return;
newfp = g_fopen(new_rc, "w");
if (!newfp) {
fclose(oldfp);
return;
}
plugin_path = g_strdup(get_plugin_dir());
new_plugin_path = g_strdup(plugin_path);
if (strstr(plugin_path, "/claws-mail/")) {
gchar *end = g_strdup(strstr(plugin_path, "/claws-mail/")+strlen("/claws-mail/"));
*(strstr(plugin_path, "/claws-mail/")) = '\0';
old_plugin_path = g_strconcat(plugin_path, "/sylpheed-claws/", end, NULL);
g_free(end);
} else {
old_plugin_path = g_strdup(new_plugin_path);
}
debug_print("replacing %s with %s\n", old_plugin_path, new_plugin_path);
while (fgets(buf, sizeof(buf), oldfp)) {
if (strncmp(buf, old_plugin_path, strlen(old_plugin_path))) {
fputs(buf, newfp);
} else {
debug_print("->replacing %s", buf);
debug_print(" with %s%s", new_plugin_path, buf+strlen(old_plugin_path));
fputs(new_plugin_path, newfp);
fputs(buf+strlen(old_plugin_path), newfp);
}
}
g_free(plugin_path);
g_free(new_plugin_path);
g_free(old_plugin_path);
fclose(oldfp);
fclose(newfp);
}
#ifdef HAVE_LIBSM
static void
sc_client_set_value (MainWindow *mainwin,
@ -478,9 +521,6 @@ int main(int argc, char *argv[])
parse_cmd_opt(argc, argv);
if (!cmd.exit)
plugin_load_all("Common");
#ifdef CRASH_DIALOG
if (cmd.crash) {
gtk_set_locale();
@ -570,6 +610,15 @@ int main(int argc, char *argv[])
if (r == FALSE && !is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0)
exit(1);
}
if (!is_file_exist(RC_DIR G_DIR_SEPARATOR_S COMMON_RC) &&
is_file_exist(RC_DIR G_DIR_SEPARATOR_S OLD_COMMON_RC)) {
/* post 2.6 name change */
migrate_common_rc(RC_DIR G_DIR_SEPARATOR_S OLD_COMMON_RC,
RC_DIR G_DIR_SEPARATOR_S COMMON_RC);
}
if (!cmd.exit)
plugin_load_all("Common");
userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "gtkrc-2.0", NULL);
gtk_rc_parse(userrc);