[Gaim-commits] CVS: gaim/src gaimrc.c,1.82,1.83

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv28793

Modified Files:
	gaimrc.c 
Log Message:
fixes


Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- gaimrc.c	2001/09/28 01:25:02	1.82
+++ gaimrc.c	2001/09/28 08:51:46	1.83
@@ -256,6 +256,12 @@
 			default_away = g_slist_nth_data(away_messages, atoi(p->value[1]));
 		}
 	}
+	if (!away_messages) {
+		a = g_new0(struct away_message, 1);
+		g_snprintf(a->name, sizeof(a->name), "boring default");
+		g_snprintf(a->message, sizeof(a->message), "%s", BORING_DEFAULT_AWAY_MSG);
+		away_messages = g_slist_append(away_messages, a);
+	}
 }
 
 static void gaimrc_write_away(FILE *f)
@@ -956,15 +962,7 @@
 static void set_defaults()
 {
 	int i;
-
-	if (aim_users) {
-		g_list_free(aim_users);
-		aim_users = NULL;
-	}
-	if (away_messages) {
-		g_slist_free(away_messages);
-		away_messages = NULL;
-	}
+	struct away_message *a;
 
 	misc_options =
 		OPT_MISC_BUDDY_TICKER |
@@ -1013,13 +1011,18 @@
 	    OPT_SOUND_RECV |
 	    OPT_SOUND_SEND |
 	    OPT_SOUND_SILENT_SIGNON;
+
 	report_idle = IDLE_SCREENSAVER;
 	web_browser = BROWSER_NETSCAPE;
-	auto_away = 10;
-	default_away = NULL;
-
 	g_snprintf(web_command, sizeof(web_command), "xterm -e lynx %%s");
 
+	auto_away = 10;
+	a = g_new0(struct away_message, 1);
+	g_snprintf(a->name, sizeof(a->name), "boring default");
+	g_snprintf(a->message, sizeof(a->message), "%s", BORING_DEFAULT_AWAY_MSG);
+	away_messages = g_slist_append(away_messages, a);
+	default_away = a;
+
 	blist_pos.width = 0;
 	blist_pos.height = 0;
 	blist_pos.x = 0;
@@ -1096,6 +1099,10 @@
 	} else if (opt_rcfile_arg) {
 		g_snprintf(buf, sizeof(buf), _("Could not open config file %s."), opt_rcfile_arg);
 		do_error_dialog(buf, _("Preferences Error"));
+		set_defaults();
+	} else {
+		set_defaults();
+		save_prefs();
 	}
 }