[gnome-panel: 136/136] bonobo: Drop this, it will be moved to a new module if maintained

[Vincent Untz <vuntz src gnome org>]

commit 1f772850d0f38fe4847e0d7b9633d2dcbaa7bc96
Author: Vincent Untz <vuntz gnome org>
Date:   Tue Feb 1 01:00:26 2011 +0100

    bonobo: Drop this, it will be moved to a new module if maintained
    
    With the gtk3 branch merged in, it makes no sense to keep the bonobo
    support in the gnome-panel module itself.
    
    It's worth keeping the bonobo support in some way, I believe, but it
    should be in an external module. Note that some work is needed: we need
    a small server that would sit between gnome-panel and the bonobo applets
    to make sure that the gnome-panel process doesn't use gtk+ 2.x at all.

 Makefile.am                                        |    5 -
 bonobo/Makefile.am                                 |    3 -
 bonobo/idl/GNOME_Panel.idl                         |   51 -
 bonobo/idl/Makefile.am                             |    6 -
 .../GNOME_Panel_TestApplet.server.in               |   31 -
 bonobo/libpanel-applet/Makefile.am                 |  129 --
 bonobo/libpanel-applet/TODO                        |   14 -
 .../libpanelapplet-2.0-uninstalled.pc.in           |   11 -
 bonobo/libpanel-applet/libpanelapplet-2.0.pc.in    |   11 -
 bonobo/libpanel-applet/panel-applet-gconf.c        |  458 -----
 bonobo/libpanel-applet/panel-applet-gconf.h        |   86 -
 bonobo/libpanel-applet/panel-applet-marshal.list   |    5 -
 bonobo/libpanel-applet/panel-applet-private.h      |   36 -
 bonobo/libpanel-applet/panel-applet-shell.c        |  105 --
 bonobo/libpanel-applet/panel-applet-shell.h        |   62 -
 bonobo/libpanel-applet/panel-applet.c              | 1879 --------------------
 bonobo/libpanel-applet/panel-applet.h              |  254 ---
 bonobo/libpanel-applet/panel-test-applets-bonobo.c |  349 ----
 .../libpanel-applet/panel-test-applets-bonobo.ui   |  203 ---
 bonobo/libpanel-applet/test-bonobo-applet.c        |  204 ---
 bonobo/panel-module/GNOME_Panel_Popup.xml          |   20 -
 bonobo/panel-module/Makefile.am                    |   51 -
 bonobo/panel-module/panel-applet-frame-bonobo.c    |  748 --------
 bonobo/panel-module/panel-applet-frame-bonobo.h    |   61 -
 bonobo/panel-module/panel-applets-bonobo-module.c  |   48 -
 bonobo/panel-module/panel-applets-manager-bonobo.c |  250 ---
 bonobo/panel-module/panel-applets-manager-bonobo.h |   55 -
 configure.ac                                       |   62 -
 po/POTFILES.in                                     |    4 -
 29 files changed, 0 insertions(+), 5201 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 162681b..434e44b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,11 +8,6 @@ SUBDIRS =			\
 	man			\
 	po
 
-if HAVE_BONOBO
-# FIXMEchpe port this
-#SUBDIRS += bonobo
-endif
-
 ACLOCAL_AMFLAGS = -I m4
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection --disable-scrollkeeper
diff --git a/configure.ac b/configure.ac
index a93034a..a898c67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,6 @@ LIBGNOME_DESKTOP_REQUIRED=2.91.0
 GDK_PIXBUF_REQUIRED=2.7.1
 PANGO_REQUIRED=1.15.4
 GLIB_REQUIRED=2.25.12
-GTK2_REQUIRED=2.20.0
 GTK_REQUIRED=2.91.7
 LIBWNCK_REQUIRED=2.91.0
 GCONF_REQUIRED=2.6.1
@@ -255,61 +254,6 @@ dnl Applets dir
 AC_SUBST([appletsdir],"\$(datadir)/gnome-panel/\$(LIBPANEL_APPLET_API_VERSION)/applets")
 AC_SUBST([appletsdir_pkgconfig],"\${datadir}/gnome-panel/\${libpanel_applet_api_version}/applets")
 
-dnl
-dnl Temporary bonobo checks here
-dnl
-
-LIB_PANEL_APPLET_BONOBO_LT_VERSION=2:73:2
-AC_SUBST(LIB_PANEL_APPLET_BONOBO_LT_VERSION)
-
-LIBBONOBOUI_REQUIRED=2.1.1
-ORBIT_REQUIRED=2.4.0
-
-AC_ARG_ENABLE(bonobo,
-	      AS_HELP_STRING([--enable-bonobo],[Enable Bonobo compatibility modules (auto)]),
-	      enable_bonobo=$enableval,
-	      enable_bonobo=auto)
-
-BONOBO_CFLAGS=
-BONOBO_LIBS=
-LIBPANEL_APPLET_BONOBO_CFLAGS=
-LIBPANEL_APPLET_BONOBO_LIBS=
-ORBIT_IDL=
-BONOBO_IDLDIR=
-BONOBO_ACT_IDLDIR=
-
-if test "x$enable_bonobo" = "xno" ; then
-  HAVE_BONOBO=no
-else
-  HAVE_BONOBO=no
-  PKG_CHECK_MODULES(BONOBO, ORBit-2.0 >= $ORBIT_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED, HAVE_BONOBO=yes, HAVE_BONOBO=no)
-
-  if test "x$enable_bonobo" = "xyes" -a "x$HAVE_BONOBO" = "xno" ; then
-    AC_MSG_ERROR(Bonobo compatibility modules explicity enabled but not available)
-  fi
-
-  if test "x$HAVE_BONOBO" = "xyes"; then
-    PKG_CHECK_MODULES(PANEL_MODULE_BONOBO, ORBit-2.0 >= $ORBIT_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED)
-    PKG_CHECK_MODULES(LIBPANEL_APPLET_BONOBO, ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK2_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED)
-
-    dnl IDL directories
-    ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
-    BONOBO_IDLDIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
-    BONOBO_ACT_IDLDIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
-
-    AC_PATH_PROG(GIO_QUERYMODULES, gio-querymodules, no)
-  fi
-fi
-
-AM_CONDITIONAL(HAVE_BONOBO, test "x$HAVE_BONOBO" = "xyes")
-AC_SUBST(BONOBO_CFLAGS)
-AC_SUBST(BONOBO_LIBS)
-AC_SUBST(LIBPANEL_APPLET_BONOBO_CFLAGS)
-AC_SUBST(LIBPANEL_APPLET_BONOBO_LIBS)
-AC_SUBST(ORBIT_IDL)
-AC_SUBST(BONOBO_IDLDIR)
-AC_SUBST(BONOBO_ACT_IDLDIR)
-
 dnl  Language Support
 
 GETTEXT_PACKAGE=gnome-panel-3.0
@@ -381,12 +325,6 @@ help/Makefile
 help/clock/Makefile
 help/fish/Makefile
 man/Makefile
-bonobo/Makefile
-bonobo/idl/Makefile
-bonobo/libpanel-applet/libpanelapplet-2.0.pc
-bonobo/libpanel-applet/libpanelapplet-2.0-uninstalled.pc
-bonobo/libpanel-applet/Makefile
-bonobo/panel-module/Makefile
 ])
 
 AC_CONFIG_FILES(libpanel-applet/libpanelapplet-$LIBPANEL_APPLET_API_VERSION.pc:libpanel-applet/libpanelapplet.pc.in)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 749f10f..e65e01b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -27,10 +27,6 @@ applets/wncklet/wncklet.c
 applets/wncklet/workspace-switcher.c
 [type: gettext/glade]applets/wncklet/workspace-switcher.ui
 applets/wncklet/workspace-switcher.schemas.in
-bonobo/libpanel-applet/GNOME_Panel_TestApplet.server.in
-bonobo/libpanel-applet/panel-test-applets-bonobo.c
-[type: gettext/glade]bonobo/libpanel-applet/panel-test-applets-bonobo.ui
-bonobo/panel-module/GNOME_Panel_Popup.xml
 gnome-panel/libegg/eggdesktopfile.c
 gnome-panel/libegg/eggsmclient.c
 gnome-panel/libpanel-util/panel-error.c