Remove gtk1 support

Conflicts:
	autogen.sh

Makefile.am

@@ -10,9 +10,6 @@ DESKTOP_FILES = $(DESKTOP_IN_FILES:.desktop.in=.desktop)
 desktopdir= $(datadir)/applications
 desktop_DATA = $(DESKTOP_FILES)
 
-gtkrcdir = $(pkgdatadir)/default
-gtkrc_DATA = gtkrc
-
 EXTRA_DIST =			\
 	BUGS			\
 	autogen.sh		\
@@ -20,7 +17,6 @@ EXTRA_DIST =			\
 	$(man_MANS)		\
 	xqf.spec		\
 	$(DESKTOP_IN_FILES)	\
-	$(gtkrc_DATA)		\
 	intltool-merge.in	\
 	intltool-update.in	\
 	intltool-extract.in

autogen.sh

@@ -32,11 +32,6 @@ if ! test -e AUTHORS; then
 	ln -s AUTHORS.md AUTHORS
 fi
 
-if ! gtk-config --version >/dev/null 2>&1; then
-	mkdir m4
-	ln -s ../xqf-acinclude-nogtk1.m4 m4/gtk.m4
-fi
-
 # extract flag icons
 rm pixmaps/flags/*.png
 tar -C pixmaps -xzf pixmaps/flags.tar.gz

configure.ac

@@ -35,10 +35,6 @@ if test "x$with_rpm_release" != "x" ; then
 fi
 AC_SUBST(RELEASE)
 
-dnl GTK2 support
-OLD_GTK_SUPPORT="-DGTK_ENABLE_BROKEN=1"
-AC_SUBST(OLD_GTK_SUPPORT)
-
 pkg_modules="gtk+-2.0 >= 2.0.0 gdk-pixbuf-xlib-2.0 x11"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)

gtkrc

@@ -1,30 +0,0 @@
-# this is a modified version of the gtk2 default color scheme so xqf doesn't
-# look that ugly in gtk1
-
-style "default"
-{
-  fg[NORMAL] = "#000000000000"
-  fg[ACTIVE] = "#000000000000"
-  fg[PRELIGHT] = "#000000000000"
-  fg[SELECTED] = "#FFFFFFFFFFFF"
-  fg[INSENSITIVE] = "#753075307530"
-  bg[NORMAL] = "#DCDCDADAD5D5"
-  bg[ACTIVE] = "#BABAB5B5ABAB"
-  bg[PRELIGHT] = "#EEEEEBEBE7E7"
-  bg[SELECTED] = "#4B4B69698383"
-  bg[INSENSITIVE] = "#DCDCDADAD5D5"
-  text[NORMAL] = "#000000000000"
-  text[ACTIVE] = "#000000000000"
-  text[PRELIGHT] = "#000000000000"
-  text[SELECTED] = "#FFFFFFFFFFFF"
-  text[INSENSITIVE] = "#753075307530"
-  base[NORMAL] = "#FFFFFFFFFFFF"
-  base[ACTIVE] = "#FFFFFFFFFFFF"
-  base[PRELIGHT] = "#FFFFFFFFFFFF"
-  base[SELECTED] = "#4B4B69698383"
-  base[INSENSITIVE] = "#EEEEEBEBE7E7"
-}
-
-class "*" style "default"
-
-# vim: syntax=gtkrc

src/Makefile.am

@@ -11,7 +11,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/intl \
 	$(COMPRESSION) \
 	$(GDK_PIXBUF_CFLAGS) \
 	$(PACKAGE_CFLAGS) \
-	$(OLD_GTK_SUPPORT)
+	-DGTK_ENABLE_BROKEN
 
 qstatcfgdir = $(pkgdatadir)
 qstatcfg_DATA = qstat.cfg
@@ -57,7 +57,7 @@ xqf_rcon_SOURCES = \
     rcon.c rcon.h \
     debug.c debug.h \
     utils.c utils.h
-xqf_rcon_CFLAGS = -DRCON_STANDALONE $(GLIB_CFLAGS) $(OLD_GTK_SUPPORT)
+xqf_rcon_CFLAGS = -DRCON_STANDALONE $(GLIB_CFLAGS) -DGTK_ENABLE_BROKEN
 
 xqf_SOURCES =  \
 addmaster.c \

xqf-acinclude-nogtk1.m4

@@ -1,3 +0,0 @@
-AC_DEFUN([AM_PATH_GLIB], [AC_MSG_ERROR([GTK1 support not available])])dnl
-AC_DEFUN([AM_PATH_GTK], [AC_MSG_ERROR([GTK1 support not available])])dnl
-AC_DEFUN([AM_PATH_GDK_PIXBUF], [AC_MSG_ERROR([GTK1 support not available])])dnl