Mercurial > pidgin
changeset 917:f3c23b3c1ed7
[gaim-migrate @ 927]
Better support for upgrading between config file version.
committer: Tailor Script <tailor@pidgin.im>
| author | Rob Flynn <gaim@robflynn.com> |
|---|---|
| date | Fri, 15 Sep 2000 22:29:23 +0000 |
| parents | e208822ed014 |
| children | 5871e1eec10c |
| files | src/aim.c src/gaim.h src/gaimrc.c |
| diffstat | 3 files changed, 48 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/src/aim.c Fri Sep 15 20:19:27 2000 +0000 +++ b/src/aim.c Fri Sep 15 22:29:23 2000 +0000 @@ -540,7 +540,7 @@ if (argc > 1 && !strcmp(argv[1], "--version")) { gtk_init(&argc, &argv); - set_defaults(); /* needed for open_url_nw */ + set_defaults(FALSE); /* needed for open_url_nw */ load_prefs(); show_about(0, (void *)1); gtk_main(); @@ -555,7 +555,7 @@ gtk_init(&argc, &argv); #endif /* USE_GNOME */ - set_defaults(); + set_defaults(FALSE); load_prefs(); if (general_options & OPT_GEN_DEBUG)
--- a/src/gaim.h Fri Sep 15 20:19:27 2000 +0000 +++ b/src/gaim.h Fri Sep 15 22:29:23 2000 +0000 @@ -414,7 +414,7 @@ #define TYPE_SIGNOFF 4 #define TYPE_KEEPALIVE 5 -#define REVISION "gaim:$Revision: 925 $" +#define REVISION "gaim:$Revision: 927 $" #define FLAPON "FLAPON\r\n\r\n" #define ROAST "Tic/Toc" @@ -796,7 +796,7 @@ /* Functions in gaimrc.c */ -extern void set_defaults(); +extern void set_defaults(int); extern void load_prefs(); extern void save_prefs();
--- a/src/gaimrc.c Fri Sep 15 20:19:27 2000 +0000 +++ b/src/gaimrc.c Fri Sep 15 22:29:23 2000 +0000 @@ -659,18 +659,22 @@ } -void set_defaults() +void set_defaults(int saveinfo) { - if (aim_users) - { - g_list_free(aim_users); - aim_users = NULL; - } - if (away_messages) - { - g_list_free(away_messages); - away_messages = NULL; - } + if (!saveinfo) + { + if (aim_users) + { + g_list_free(aim_users); + aim_users = NULL; + } + if (away_messages) + { + g_list_free(away_messages); + away_messages = NULL; + } + } + general_options = OPT_GEN_SEND_LINKS | OPT_GEN_ENTER_SENDS | @@ -696,26 +700,29 @@ OPT_DISP_CHAT_BUTTON_XPM | OPT_DISP_CHAT_BUTTON_TEXT; - font_options = 0; - sound_options = OPT_SOUND_LOGIN | OPT_SOUND_LOGOUT | OPT_SOUND_RECV | OPT_SOUND_SEND | OPT_SOUND_SILENT_SIGNON; - report_idle = IDLE_GAIM; - web_browser = BROWSER_NETSCAPE; - proxy_type = PROXY_NONE; + if (!saveinfo) + { + font_options = 0; + sound_options = OPT_SOUND_LOGIN | OPT_SOUND_LOGOUT | OPT_SOUND_RECV | OPT_SOUND_SEND | OPT_SOUND_SILENT_SIGNON; + report_idle = IDLE_GAIM; + web_browser = BROWSER_NETSCAPE; + proxy_type = PROXY_NONE; - aim_port = TOC_PORT; - login_port = AUTH_PORT; - g_snprintf(aim_host, sizeof(aim_host), "%s", TOC_HOST); - g_snprintf(login_host, sizeof(login_host), "%s", AUTH_HOST); - proxy_host[0] = 0; - proxy_port = 0; - g_snprintf(web_command, sizeof(web_command), "xterm -e lynx %%s"); - blist_pos.width = 0; - blist_pos.height = 0; - blist_pos.x = 0; - blist_pos.y = 0; - blist_pos.xoff = 0; - blist_pos.yoff = 0; - g_snprintf(latest_ver, BUF_LONG, "%s", VERSION); + aim_port = TOC_PORT; + login_port = AUTH_PORT; + g_snprintf(aim_host, sizeof(aim_host), "%s", TOC_HOST); + g_snprintf(login_host, sizeof(login_host), "%s", AUTH_HOST); + proxy_host[0] = 0; + proxy_port = 0; + g_snprintf(web_command, sizeof(web_command), "xterm -e lynx %%s"); + blist_pos.width = 0; + blist_pos.height = 0; + blist_pos.x = 0; + blist_pos.y = 0; + blist_pos.xoff = 0; + blist_pos.yoff = 0; + g_snprintf(latest_ver, BUF_LONG, "%s", VERSION); + } } @@ -732,11 +739,12 @@ sscanf(buf, "# .gaimrc v%d", &ver); if ( (ver <= 1) || (buf[0] != '#')) { fclose(f); - set_defaults(); + set_defaults(FALSE); save_prefs(); load_prefs(); return; } + while(!feof(f)) { switch(gaimrc_parse_tag(f)) { case -1: @@ -770,6 +778,10 @@ fclose(f); } } + + if ( (ver == 2) || (buf[0] != '#')) { + set_defaults(TRUE); + } } @@ -781,7 +793,7 @@ if (getenv("HOME")) { g_snprintf(buf, sizeof(buf), "%s/.gaimrc", getenv("HOME")); if ((f = fopen(buf,"w"))) { - fprintf(f, "# .gaimrc v%d\n", 2); + fprintf(f, "# .gaimrc v%d\n", 3); gaimrc_write_users(f); gaimrc_write_options(f); gaimrc_write_away(f);