aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/main.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2011-08-17 15:29:15 +0000
committerAnders Broman <anders.broman@ericsson.com>2011-08-17 15:29:15 +0000
commit60a42bf9029f477de805c1c756e14b1465db9635 (patch)
tree95db7b645a78f3b1b1f2825f724ba72cb42d0ed9 /gtk/main.c
parentf2dcae17aed58647a23e267df13225a4fb57f9b7 (diff)
More GTK 3.0 changes:
- In main skipp RC for now - main_proto_draw incomplete fix.(#if 0) svn path=/trunk/; revision=38581
Diffstat (limited to 'gtk/main.c')
-rw-r--r--gtk/main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/gtk/main.c b/gtk/main.c
index 1a7f49847c..6db4336239 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -2838,10 +2838,14 @@ main(int argc, char *argv[])
/* read in rc file from global and personal configuration paths. */
rc_file = get_datafile_path(RC_FILE);
+#if GTK_CHECK_VERSION(3,0,0)
+ /* XXX resolve later */
+#else
gtk_rc_parse(rc_file);
g_free(rc_file);
rc_file = get_persconffile_path(RC_FILE, FALSE, FALSE);
gtk_rc_parse(rc_file);
+#endif
g_free(rc_file);
font_init();