nautilus-sendto r432 - in trunk: . gaim_plugin src/plugins/gaim

[hadess svn gnome org]

Author: hadess
Date: Wed Apr  8 12:46:23 2009
New Revision: 432
URL: http://svn.gnome.org/viewvc/nautilus-sendto?rev=432&view=rev

Log:
2009-04-08  Bastien Nocera  <hadess hadess net>

	* Makefile.am:
	* configure.in:
	* gaim_plugin/.cvsignore:
	* gaim_plugin/Makefile.am:
	* gaim_plugin/nautilus-sendto-plugin.c:
	* src/plugins/gaim/Makefile.am:
	* src/plugins/gaim/gaim.c: 2 years after the rename, removing
	the GAIM plugin(s), nobody should be using them anymore



Removed:
   trunk/gaim_plugin/
   trunk/src/plugins/gaim/
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Apr  8 12:46:23 2009
@@ -1,7 +1,3 @@
-if HAVE_GAIM
-GAIM_PLUGIN_DIR=gaim_plugin
-endif
-
 if HAVE_PIDGIN
 PIDGIN_PLUGIN_DIR=pidgin_plugin
 endif
@@ -12,7 +8,7 @@
 
 SUBDIRS = src $(GAIM_PLUGIN_DIR) $(PIDGIN_PLUGIN_DIR) $(EVOLUTION_PLUGIN_DIR) po
 
-DIST_SUBDIRS = gaim_plugin pidgin_plugin evolution src po
+DIST_SUBDIRS = pidgin_plugin evolution src po
 
 man_MANS = nautilus-sendto.1
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Apr  8 12:46:23 2009
@@ -86,7 +86,7 @@
 AC_SUBST_FILE(EVO_PLUGIN_RULE)
 
 # The full list of plugins
-allowed_plugins="bluetooth empathy evolution gaim gajim nautilus-burn pidgin removable-devices upnp"
+allowed_plugins="bluetooth empathy evolution gajim nautilus-burn pidgin removable-devices upnp"
 
 plugin_error_or_ignore()
 {
@@ -166,24 +166,6 @@
 				CPPFLAGS="$saved_CPPFLAGS"
 			fi
 		;;
-		gaim)
-			PKG_CHECK_MODULES(GAIM, gaim >= $GAIM_REQUIRED,
-					  [
-					   GAIM_LIBDIR=`pkg-config --variable=libdir gaim`
-					   GAIM_DATADIR=`pkg-config --variable=datadir gaim`
-					   AC_SUBST(GAIM_LIBDIR)
-					   AC_SUBST(GAIM_DATADIR)
-					   enable_gaim=yes
-					   ],
-					   [
-					    enable_gaim=no
-					    ]
-					   )
-			if test "${enable_gaim}" != "yes" ; then
-				plugin_error_or_ignore "you need gaim to build the gaim plugin"
-				add_plugin="0"
-			fi
-		;;
 		gajim)
 			AC_ARG_WITH(gajim,
 				    [AS_HELP_STRING(--with-gajim,[Path to Gajim install prefix])],
@@ -276,8 +258,7 @@
 AC_SUBST([ALL_PLUGINS])
 AC_SUBST([PLUGINS])
 
-dnl For the gaim and pidgin plugins
-AM_CONDITIONAL(HAVE_GAIM, test "x$enable_gaim" = "xyes")
+dnl For the pidgin plugin
 AM_CONDITIONAL(HAVE_PIDGIN, test "x$enable_pidgin" = "xyes")
 
 dnl For the GIO based plugins
@@ -308,14 +289,12 @@
 src/plugins/bluetooth/Makefile
 src/plugins/empathy/Makefile
 src/plugins/evolution/Makefile
-src/plugins/gaim/Makefile
 src/plugins/gajim/Makefile
 src/plugins/nautilus-burn/Makefile
 src/plugins/pidgin/Makefile
 src/plugins/removable-devices/Makefile
 src/plugins/upnp/Makefile
 evolution/Makefile
-gaim_plugin/Makefile
 pidgin_plugin/Makefile
 po/Makefile.in
 ])