[vinagre/no-separate-plugins: 5/11] Remove gobject-introspection support

[David King <davidk src gnome org>]

commit 200c343cbf7fddf1bc99b69c49cfa62d5b24d48c
Author: David King <amigadave amigadave com>
Date:   Fri Jun 10 20:57:04 2011 +0200

    Remove gobject-introspection support

 .gitignore             |    2 --
 Makefile.am            |   34 +---------------------------------
 configure.ac           |   10 ----------
 vinagre/vinagre-main.c |    8 --------
 4 files changed, 1 insertions(+), 53 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 771e1a1..4fd151b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,8 +8,6 @@ Makefile.in
 /ABOUT-NLS
 /ChangeLog
 /INSTALL
-/Vinagre-3.0.gir
-/Vinagre-3.0.typelib
 /aclocal.m4
 /autom4te.cache
 /build-aux/
diff --git a/Makefile.am b/Makefile.am
index 883af26..7f42690 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,6 @@ common_cppflags = \
 	-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
 	-DSSH_PROGRAM=\"$(SSH_PROGRAM)\" \
 	$(VINAGRE_CFLAGS) \
-	$(INTROSPECTION_CFLAGS) \
 	$(WARN_FLAGS) \
 	$(DISABLE_DEPRECATED_FLAGS)
 
@@ -39,7 +38,6 @@ vinagre_vinagre_LDADD = \
 	libvinagre.la \
 	$(VINAGRE_LIBS) \
 	$(GTKVNC_LIBS) \
-	$(INTROSPECTION_LIBS)
 	$(rdp_plugin) \
 	$(spice_plugin) \
 	$(ssh_plugin) \
@@ -79,10 +77,6 @@ vinagreh_HEADERS = \
 	vinagre/vinagre-protocol.h \
 	vinagre/vinagre-plugins-engine.h
 
-INTROSPECTION_GIR_INCLUDES = \
-	Gtk-3.0 \
-	libxml2-2.0
-
 # The main library
 noinst_LTLIBRARIES = libvinagre.la
 
@@ -135,32 +129,6 @@ handwritten_sources += \
 noinst_vinagreh_headers += \
 	vinagre/vinagre-tubes-manager.h \
 	vinagre/vinagre-tube-handler.h
-INTROSPECTION_GIR_INCLUDES += TelepathyGLib-0.12
-endif
-
-CLEANFILES =
-
-# Introspection
-if VINAGRE_HAVE_INTROSPECTION
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS = Vinagre-3.0.gir
-
-Vinagre-3.0.gir: libvinagre.la
-INTROSPECTION_SCANNER_ARGS = $(common_cppflags) $(VINAGRE_CFLAGS) -I$(top_srcdir) --warn-all
-Vinagre_3_0_gir_LIBS = libvinagre.la
-Vinagre_3_0_gir_FILES = $(vinagreh_HEADERS) $(filter-out pty_open.h, $(noinst_vinagreh_headers)) $(handwritten_sources)
-Vinagre_3_0_gir_INCLUDES = $(INTROSPECTION_GIR_INCLUDES)
-
-girdir = $(pkgdatadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(libdir)/vinagre- VINAGRE_ABI_VERSION@/girepository-1.0
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += \
-	$(gir_DATA) \
-	$(typelib_DATA)
-
 endif
 
 plugindir = $(VINAGRE_PLUGINS_LIBS_DIR)
@@ -405,7 +373,7 @@ dist_noinst_DATA = \
 	$(plugin_in_files) \
 	vinagre.doap
 
-CLEANFILES += \
+CLEANFILES = \
 	$(nodist_desktop_DATA) \
 	$(nodist_mime_DATA) \
 	$(gsettings_SCHEMAS) \
diff --git a/configure.ac b/configure.ac
index de8e26c..777e675 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,16 +221,6 @@ AS_IF([test "x$enable_ssh" = "xyes"],
   [ACTIVE_PLUGINS="$ACTIVE_PLUGINS,ssh"])
 AC_SUBST([ACTIVE_PLUGINS])
 
-# Introspection
-GOBJECT_INTROSPECTION_CHECK([0.9.3])
-
-AS_IF([test "x$found_introspection" = "xyes"],
-  [enable_introspection=yes
-    AC_DEFINE([VINAGRE_HAVE_INTROSPECTION], [], [Build with GObject Introspection support])],
-  [enable_introspection=no])
-
-AM_CONDITIONAL([VINAGRE_HAVE_INTROSPECTION], [test "x$enable_introspection" = "xyes"])
-
 GNOME_DOC_INIT
 
 GLIB_GSETTINGS
diff --git a/vinagre/vinagre-main.c b/vinagre/vinagre-main.c
index 742df27..a2affa0 100644
--- a/vinagre/vinagre-main.c
+++ b/vinagre/vinagre-main.c
@@ -22,10 +22,6 @@
 #include <config.h>
 #endif
 
-#ifdef VINAGRE_HAVE_INTROSPECTION
-#include <girepository.h>
-#endif
-
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <locale.h>
@@ -139,10 +135,6 @@ int main (int argc, char **argv) {
   g_option_context_set_translation_domain(context, GETTEXT_PACKAGE);
   g_option_context_add_group (context, gtk_get_option_group (TRUE));
 
-#ifdef VINAGRE_HAVE_INTROSPECTION
-  g_option_context_add_group (context, g_irepository_get_option_group ());
-#endif
-
   extensions = vinagre_plugins_engine_get_plugins_by_protocol (vinagre_plugins_engine_get_default ());
 
   g_hash_table_iter_init (&iter, extensions);