Drop support for Gtk2

5 files changed, 0 insertions, 112 deletions

diff --git a/.gitignore b/.gitignore
index 057675f..45f6656 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,7 +75,6 @@ data/xfce/xfce-personal.directory
 data/xfce/xfce-screensavers.directory
 data/xfce/xfce-settings.directory
 data/xfce/xfce-system.directory
-garcon-gtk/garcon-gtk2-1.pc
 garcon-gtk/garcon-gtk3-1.pc
 garcon/garcon-2.pc
 garcon/garcon-marshal.c
@@ -83,6 +82,5 @@ garcon/garcon-marshal.h
 garcon/stamp-garcon-marshal.h
 gtk-doc.m4
 tests/test-display-menu
-tests/test-display-menu-gtk2
 tests/test-display-menu-gtk3
 po/.intltool-merge-cache
diff --git a/configure.ac.in b/configure.ac.in
index 66f06ec..bcc1089 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -130,17 +130,6 @@ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0])
 XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.20.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0])
 
-dnl ***********************************************************
-dnl *** Optional support for a GTK+2 version of the library ***
-dnl ***********************************************************
-XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4UI],
-                           [libxfce4ui-1], [4.10.0], [libxfce4ui],
-                           [libxfce4ui support])
-XDT_CHECK_OPTIONAL_PACKAGE([GTK2],
-                           [gtk+-2.0], [2.24.0], [gtk2],
-                           [GTK+ 2 support])
-AM_CONDITIONAL([ENABLE_GTK2_LIBRARY], [test "x$GTK2_FOUND" = "xyes" -a "x$LIBXFCE4UI_FOUND" = "xyes"])
-
 dnl *************************
 dnl *** Check for gtk-doc ***
 dnl *************************
@@ -167,7 +156,6 @@ garcon/Makefile
 garcon/garcon-1.pc
 garcon/garcon-config.h
 garcon-gtk/Makefile
-garcon-gtk/garcon-gtk2-1.pc
 garcon-gtk/garcon-gtk3-1.pc
 po/Makefile.in
 tests/Makefile
@@ -180,9 +168,4 @@ echo
 echo "Build Configuration:"
 echo
 echo "* Debug Support:  $enable_debug"
-if test x"$GTK2_FOUND" = x"yes" -a x"$LIBXFCE4UI_FOUND" = x"yes"; then
-echo "* GTK2 support:  yes"
-else
-echo "* GTK2 support:  no"
-fi
 echo
diff --git a/garcon-gtk/Makefile.am b/garcon-gtk/Makefile.am
index 1096e51..88624f8 100644
--- a/garcon-gtk/Makefile.am
+++ b/garcon-gtk/Makefile.am
@@ -80,57 +80,6 @@ libgarcon_gtk3_1_la_DEPENDENCIES = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = garcon-gtk3-1.pc
 
-##
-## GTK+ 2 support library
-##
-if ENABLE_GTK2_LIBRARY
-
-lib_LTLIBRARIES += libgarcon-gtk2-1.la
-
-libgarcon_gtk2includedir = \
-	$(includedir)/garcon-gtk2-1/garcon-gtk
-
-libgarcon_gtk2include_HEADERS = \
-	$(libgarcon_gtk_headers)
-
-libgarcon_gtk2_1_la_SOURCES = \
-	$(libgarcon_gtk_sources) \
-	$(libgarcon_gtk_headers)
-
-libgarcon_gtk2_1_la_CFLAGS = \
-	$(GIO_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GTK2_CFLAGS) \
-	$(LIBXFCE4UTIL_CFLAGS) \
-	$(GOBJECT_CFLAGS) \
-	$(GTHREAD_CFLAGS) \
-	$(LIBXFCE4UI_CFLAGS) \
-	$(PLATFORM_CFLAGS)
-
-libgarcon_gtk2_1_la_LDFLAGS = \
-	-no-undefined \
-	-export-dynamic \
-	-version-info $(GARCON_VERINFO) \
-	-export-symbols-regex "^[^_].*" \
-	$(PLATFORM_LDFLAGS)
-
-libgarcon_gtk2_1_la_LIBADD = \
-	$(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la \
-	$(GIO_LIBS) \
-	$(GLIB_LIBS) \
-	$(GTK2_LIBS) \
-	$(LIBXFCE4UTIL_LIBS) \
-	$(GOBJECT_LIBS) \
-	$(GTHREAD_LIBS) \
-	$(LIBXFCE4UI_LIBS)
-
-libgarcon_gtk2_1_la_DEPENDENCIES = \
-	$(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la
-
-pkgconfig_DATA += garcon-gtk2-1.pc
-
-endif
-
 
 # Required for gtk-doc and make distcheck
 dist-hook: all
diff --git a/garcon-gtk/garcon-gtk2-1.pc.in b/garcon-gtk/garcon-gtk2-1.pc.in
deleted file mode 100644
index e20207c..0000000
--- a/garcon-gtk/garcon-gtk2-1.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-garcon_api_version=@GARCON_VERSION_API@
-
-Name: @PACKAGE_TARNAME@
-Description: Freedesktop.org compliant menu library
-Requires: garcon-1 gtk+-2.0 libxfce4ui-1
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lgarcon-gtk2-${garcon_api_version}
-Cflags: -I${includedir}/garcon-gtk2-${garcon_api_version}
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d5b1f86..b74e9b9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,10 +26,6 @@ noinst_PROGRAMS =							\
 	test-menu-spec							\
 	test-display-menu-gtk3
 
-if ENABLE_GTK2_LIBRARY
-noinst_PROGRAMS += test-display-menu-gtk2
-endif
-
 # test-menu-parser
 test_menu_parser_SOURCES =						\
 	test-menu-parser.c
@@ -70,31 +66,6 @@ test_menu_spec_LDADD =							\
 	$(GOBJECT_LIBS)							\
 	$(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la
 
-# test-display-menu-gtk2
-if ENABLE_GTK2_LIBRARY
-test_display_menu_gtk2_SOURCES =				\
-	test-display-menu.c
-
-test_display_menu_gtk2_CFLAGS =					\
-	$(LIBXFCE4UTIL_CFLAGS)						\
-	$(GIO_CFLAGS)							\
-	$(GLIB_CFLAGS)							\
-	$(GOBJECT_CFLAGS)						\
-	$(GTK2_CFLAGS)
-
-test_display_menu_gtk2_DEPENDENCIES =				\
-	$(top_builddir)/garcon/libgarcon-1.la
-
-test_display_menu_gtk2_LDADD =					\
-	$(LIBXFCE4UTIL_LIBS)						\
-	$(GIO_LIBS)							\
-	$(GLIB_LIBS)							\
-	$(GOBJECT_LIBS)							\
-	$(GTK2_LIBS)							\
-	$(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la	\
-	$(top_builddir)/garcon-gtk/libgarcon-gtk2-1.la
-endif
-
 # test-display-menu-gtk3
 test_display_menu_gtk3_SOURCES =				\
 	test-display-menu.c