Mercurial > pidgin.yaz
diff src/session.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 | 084ed9f7ac19 |
children | cfb11d9a46fd |
line wrap: on
line diff
--- a/src/session.c Tue Apr 06 05:41:12 2004 +0000 +++ b/src/session.c Tue Apr 06 14:29:51 2004 +0000 @@ -26,8 +26,6 @@ #include "debug.h" #include "eventloop.h" -extern char *opt_rcfile_arg; - #ifdef USE_SM #include <X11/ICE/ICElib.h> @@ -145,7 +143,7 @@ gchar **ret; if (client_id) i += 2; - if (opt_rcfile_arg) i += 2; + i += 2; /* we will specify gaim's user dir */ ret = g_new(gchar *, i); ret[j++] = g_strdup(myself); @@ -155,10 +153,8 @@ ret[j++] = g_strdup(client_id); } - if (opt_rcfile_arg) { - ret[j++] = g_strdup("--file"); - ret[j++] = g_strdup(opt_rcfile_arg); - } + ret[j++] = g_strdup("--config"); + ret[j++] = g_strdup(gaim_user_dir()); ret[j++] = NULL;