changeset 2463:e32be86095aa trunk

[svn] - re-add support for gtkrc files
author nenolod
date Thu, 01 Feb 2007 10:29:27 -0800
parents 473168ce2cf5
children baf223ec5417
files ChangeLog src/audacious/main.c src/audacious/main.h
diffstat 3 files changed, 14 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Feb 01 10:21:09 2007 -0800
+++ b/ChangeLog	Thu Feb 01 10:29:27 2007 -0800
@@ -1,3 +1,11 @@
+2007-02-01 18:21:09 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [3934]
+  - update audacious manpage for 1.3
+  
+  trunk/man/audacious.1.in |   17 +++++++----------
+  1 file changed, 7 insertions(+), 10 deletions(-)
+
+
 2007-02-01 17:22:56 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [3932]
   - remove buggy playlist transparency patch
--- a/src/audacious/main.c	Thu Feb 01 10:21:09 2007 -0800
+++ b/src/audacious/main.c	Thu Feb 01 10:29:27 2007 -0800
@@ -526,6 +526,9 @@
     bmp_paths[BMP_PATH_LOG_FILE] =
         g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "log", NULL);
 
+    bmp_paths[BMP_PATH_GTKRC_FILE] =
+	g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "gtkrc", NULL);
+
     g_free(xdg_config_home);
     g_free(xdg_data_home);
     g_free(xdg_cache_home);
@@ -1023,6 +1026,8 @@
     cond_scan = g_cond_new();
     mutex_scan = g_mutex_new();
 
+    gtk_rc_add_default_file(bmp_paths[BMP_PATH_GTKRC_FILE]);
+
     gtk_init_check_ok = gtk_init_check(&argc, &argv);
 
     memset(&options, '\0', sizeof(BmpCmdLineOpt));
--- a/src/audacious/main.h	Thu Feb 01 10:21:09 2007 -0800
+++ b/src/audacious/main.h	Thu Feb 01 10:29:27 2007 -0800
@@ -143,6 +143,7 @@
     BMP_PATH_ACCEL_FILE,
     BMP_PATH_CONFIG_FILE,
     BMP_PATH_PLAYLIST_FILE,
+    BMP_PATH_GTKRC_FILE,
     BMP_PATH_COUNT
 };