diff src/gaimrc.c @ 8596:56360561af5e

[gaim-migrate @ 9347] " This patch creates a new command line argument ('-c' or '--config') that allows the location of tha gaim prefs files to be located somewhere other than in ~/.gaim The patch also removes the -f argument as it is no longer relevant since .gaimrc is all but gone. The one "weirdness" is that for the session managment support, the --config argument will allways appear to be specified and will contain either the custom value (if specified) or the canonical version of ~/.gaim (if no custom -c is specified). If this should be done differently, let me know." --Daniel Atallah committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 06 Apr 2004 14:29:51 +0000
parents 9773e3f3ec7a
children 543b19a96ac5
line wrap: on
line diff
--- a/src/gaimrc.c	Tue Apr 06 05:41:12 2004 +0000
+++ b/src/gaimrc.c	Tue Apr 06 14:29:51 2004 +0000
@@ -1483,9 +1483,7 @@
 		return;
 	}
 
-	if (opt_rcfile_arg)
-		g_snprintf(buf, sizeof(buf), "%s", opt_rcfile_arg);
-	else if (gaim_home_dir())
+	if (gaim_home_dir())
 		g_snprintf(buf, sizeof(buf), "%s" G_DIR_SEPARATOR_S ".gaimrc", gaim_home_dir());
 	else {
 		set_defaults();
@@ -1545,10 +1543,6 @@
 					   "Saving preferences on request\n");
 			request_save_prefs = 0;
 		}
-	} else if (opt_rcfile_arg) {
-		g_snprintf(buf, sizeof(buf), _("Could not open config file %s."), opt_rcfile_arg);
-		gaim_notify_error(NULL, NULL, buf, NULL);
-		set_defaults();
 	} else {
 		set_defaults();
 	}