changeset 2611:dd7a24edc9f6 trunk

[svn] why are we still checking for GConf? checks and related OMK data removed
author kiyoshi
date Tue, 06 Mar 2007 18:54:10 -0800
parents 2c41c0ef0c36
children ba44276ecdc8
files ChangeLog configure.ac mk/rules.mk.in src/audacious/build_stamp.c
diffstat 4 files changed, 8 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Mar 05 17:30:33 2007 -0800
+++ b/ChangeLog	Tue Mar 06 18:54:10 2007 -0800
@@ -1,3 +1,10 @@
+2007-03-06 01:30:33 +0000  Giacomo Lozito <james@develia.org>
+  revision [4230]
+  - made progress bar in fileinfo popup work again; it's ok to do code cleaning/beautifying but please, do ensure and test that things work as they should
+  trunk/src/audacious/ui_fileinfopopup.c |   11 ++++++++---
+  1 file changed, 8 insertions(+), 3 deletions(-)
+
+
 2007-03-06 00:28:45 +0000  Michael Hanselmann <hansmi@forkbomb.ch>
   revision [4228]
   Prevent double free() by strdup'ing value.
--- a/configure.ac	Mon Mar 05 17:30:33 2007 -0800
+++ b/configure.ac	Tue Mar 06 18:54:10 2007 -0800
@@ -263,28 +263,6 @@
 
 dnl GConf support
 
-CONFIGDB_BACKEND="rcfile"
-
-AC_ARG_ENABLE(gconf,
-    [  --enable-gconf          enable GConf support (default=disabled)],
-    [enable_gconf=$enableval],
-    [enable_gconf="no"]
-)
-
-if test "$enable_gconf" = "yes"; then
-    PKG_CHECK_MODULES(GCONF, [gconf-2.0 >= 2.6.0],
-        [
-         AC_DEFINE(HAVE_GCONF, , [Define if building with GConf support])
-         ADD_PC_REQUIRES([gconf-2.0 >= 2.6.0])
-        ],
-        [AC_MSG_ERROR([Cannot find GConf])]
-    )
-fi
-
-if test "$enable_gconf" = "yes"; then
-	CONFIGDB_BACKEND="gconf"
-fi
-
 PKG_CHECK_MODULES(LIBMCS, [libmcs >= 0.1],
    [
       AC_DEFINE(HAVE_MCS, , [Define if building with libmcs support])
--- a/mk/rules.mk.in	Mon Mar 05 17:30:33 2007 -0800
+++ b/mk/rules.mk.in	Tue Mar 06 18:54:10 2007 -0800
@@ -125,8 +125,6 @@
 EXEEXT ?= @EXEEXT@
 FLUIDSYNTH_CFLAGS ?= @FLUIDSYNTH_CFLAGS@
 FLUIDSYNTH_LIBS ?= @FLUIDSYNTH_LIBS@
-GCONF_CFLAGS ?= @GCONF_CFLAGS@
-GCONF_LIBS ?= @GCONF_LIBS@
 GENCAT ?= @GENCAT@
 GENERAL_PLUGINS ?= @GENERAL_PLUGINS@
 GENERAL_PLUGIN_DIR ?= @GENERAL_PLUGIN_DIR@
@@ -151,8 +149,6 @@
 HAVE_ESD_TRUE ?= @HAVE_ESD_TRUE@
 HAVE_FLAC_FALSE ?= @HAVE_FLAC_FALSE@
 HAVE_FLAC_TRUE ?= @HAVE_FLAC_TRUE@
-HAVE_GCONF_FALSE ?= @HAVE_GCONF_FALSE@
-HAVE_GCONF_TRUE ?= @HAVE_GCONF_TRUE@
 HAVE_JACK_FALSE ?= @HAVE_JACK_FALSE@
 HAVE_JACK_TRUE ?= @HAVE_JACK_TRUE@
 HAVE_LIBSAMPLERATE_FALSE ?= @HAVE_LIBSAMPLERATE_FALSE@
--- a/src/audacious/build_stamp.c	Mon Mar 05 17:30:33 2007 -0800
+++ b/src/audacious/build_stamp.c	Tue Mar 06 18:54:10 2007 -0800
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070306-4228";
+const gchar *svn_stamp = "20070306-4230";