aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/main.c
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2005-07-19 20:44:45 +0000
committerUlf Lamping <ulf.lamping@web.de>2005-07-19 20:44:45 +0000
commit47d503303cb716421f56a713db8fff3e1a1a26a3 (patch)
treef601e89b3b9aee63c001454aba952e2e3cf14fd1 /gtk/main.c
parentefe2fb62ccaf415681b59f637d69e2d4dc72fef0 (diff)
from Graeme Hewson: "Fixes for ethereal config files"
svn path=/trunk/; revision=14956
Diffstat (limited to 'gtk/main.c')
-rw-r--r--gtk/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/main.c b/gtk/main.c
index edab8e4740..06befcf45e 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -142,8 +142,8 @@
/*
- * File under personal preferences directory in which GTK settings for
- * Ethereal are stored.
+ * Files under personal and global preferences directories in which
+ * GTK settings for Ethereal are stored.
*/
#define RC_FILE "gtkrc"
@@ -2333,8 +2333,8 @@ main(int argc, char *argv[])
}
/* read in rc file from global and personal configuration paths. */
- /* XXX - is this a good idea? */
- gtk_rc_parse(RC_FILE);
+ rc_file = get_datafile_path(RC_FILE);
+ gtk_rc_parse(rc_file);
rc_file = get_persconffile_path(RC_FILE, FALSE);
gtk_rc_parse(rc_file);