Merge branch 'slatez-applets'

Conflicts:
	Makefile.am
	configure.ac

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

diff --combined Makefile.am
index 20268959583e0d5f41e4505c7f18a16fcda588b9,8148380008b73dfb449615f59559c5deac859114..3ce04575e4aefe93251246b1732f6a483c47972f
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -1,17 -1,13 +1,9 @@@
  SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help
  
- if HAVE_MEGAPHONE
- SUBDIRS += megaphone
- endif
- 
  if HAVE_NST
  SUBDIRS += nautilus-sendto-plugin
  endif
  
- if HAVE_NOTHERE
- SUBDIRS += nothere
 -if HAVE_PYTHON
 -SUBDIRS += python
--endif
--
  if HAVE_TESTS
  SUBDIRS += tests
  endif

diff --combined configure.ac
index facdd7ce1a02b377f4e7891518af3edf6adadc82,502c550121f35d2e06c091a9dc8d7268d80c9fff..fbe8984431c1254b8e09b41c2e382bbfc1dbb8bb
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -355,33 -355,6 +355,6 @@@ AM_CONDITIONAL(HAVE_MOBLIN, test "x$hav
  AC_SUBST(MOBLIN_CFLAGS)
  AC_SUBST(MOBLIN_LIBS)
  
- # -----------------------------------------------------------
- # Megaphone
- # -----------------------------------------------------------
- AC_ARG_ENABLE(megaphone,
-               AS_HELP_STRING([--enable-megaphone=@<:@no/yes/auto@:>@],
-                              [build megaphone applet]), ,
-                              enable_megaphone=auto)
- 
- if test "x$enable_megaphone" != "xno"; then
-    PKG_CHECK_MODULES(MEGAPHONE, 
-    [
-       libpanelapplet-2.0 >= $LIBPANELAPPLET_REQUIRED
-       glib-2.0 >= $GLIB_REQUIRED
-       gtk+-2.0 >= $GTK_REQUIRED
-       gconf-2.0 >= $GCONF_REQUIRED
-       telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
-    ], have_megaphone="yes", have_megaphone="no")
- else
-    have_megaphone=no
- fi
- 
- if test "x$enable_megaphone" = "xyes" -a "x$have_megaphone" != "xyes"; then
-    AC_MSG_ERROR([Couldn't find megaphone dependencies.])
- fi
- 
- AM_CONDITIONAL(HAVE_MEGAPHONE, test "x$have_megaphone" = "xyes")
- 
  # -----------------------------------------------------------
  # nautilus-sendto
  # -----------------------------------------------------------
@@@ -405,33 -378,6 +378,6 @@@ f
  
  AM_CONDITIONAL(HAVE_NST, test "x$have_nst" = "xyes")
  
- # -----------------------------------------------------------
- # Nothere
- # -----------------------------------------------------------
- AC_ARG_ENABLE(nothere,
-               AS_HELP_STRING([--enable-nothere=@<:@no/yes/auto@:>@],
-                              [build nothere applet]), ,
-                              enable_nothere=auto)
- 
- if test "x$enable_nothere" != "xno"; then
-    PKG_CHECK_MODULES(NOTHERE, 
-    [
-       libpanelapplet-2.0 >= $LIBPANELAPPLET_REQUIRED
-       glib-2.0 >= $GLIB_REQUIRED
-       gtk+-2.0 >= $GTK_REQUIRED
-       gconf-2.0 >= $GCONF_REQUIRED
-       telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
-    ], have_nothere="yes", have_nothere="no")
- else
-    have_nothere=no
- fi
- 
- if test "x$enable_nothere" = "xyes" -a "x$have_nothere" != "xyes"; then
-    AC_MSG_ERROR([Couldn't find nothere dependencies.])
- fi
- 
- AM_CONDITIONAL(HAVE_NOTHERE, test "x$have_nothere" = "xyes")
- 
  # -----------------------------------------------------------
  # Tests
  # -----------------------------------------------------------
@@@ -455,6 -401,41 +401,6 @@@ f
  
  AM_CONDITIONAL(HAVE_TESTS, test "x$have_check" = "xyes")
  
 -# -----------------------------------------------------------
 -# Python Bindings
 -# -----------------------------------------------------------
 -AC_ARG_ENABLE(python,
 -              AS_HELP_STRING([--enable-python=@<:@no/yes/auto@:>@],
 -                             [build python bindings to libempathy and libempathy-gtk]), ,
 -                             enable_python=auto)
 -
 -if test "x$enable_python" != "xno"; then
 -   PKG_CHECK_MODULES(PYTHON_BINDING,
 -   [
 -      pygtk-2.0,
 -      glib-2.0 >= $GLIB_REQUIRED
 -      gobject-2.0
 -      gconf-2.0 >= $GCONF_REQUIRED
 -      libxml-2.0
 -      gtk+-2.0 >= $GTK_REQUIRED
 -      gstreamer-0.10
 -      gstreamer-interfaces-0.10
 -      telepathy-farsight
 -   ], have_python="yes", have_python="no")
 -   if test "x$have_python" = "xyes" ; then
 -      AM_CHECK_PYTHON_HEADERS(,have_python="no")
 -      AC_CHECK_PROGS([PYGOBJECTCODEGEN], [pygobject-codegen-2.0 pygtk-codegen-2.0])
 -   fi
 -else
 -   have_python=no
 -fi
 -
 -if test "x$enable_python" = "xyes" -a "x$have_python" != "xyes"; then
 -   AC_MSG_ERROR([Couldn't find python.])
 -fi
 -
 -AM_CONDITIONAL(HAVE_PYTHON, test "x$have_python" = "xyes")
 -
  # -----------------------------------------------------------
  # Coding style checks
  # -----------------------------------------------------------
@@@ -480,19 -461,16 +426,13 @@@ AC_OUTPUT(
     libempathy-gtk/Makefile
     libempathy-gtk/libempathy-gtk.pc
     src/Makefile
-    megaphone/Makefile
-    megaphone/src/Makefile
-    megaphone/data/Makefile
     nautilus-sendto-plugin/Makefile
-    nothere/Makefile
-    nothere/src/Makefile
-    nothere/data/Makefile
     docs/Makefile
     docs/libempathy/Makefile
     docs/libempathy/version.xml
     docs/libempathy-gtk/Makefile
     docs/libempathy-gtk/version.xml
     help/Makefile
 -   python/Makefile
 -   python/pyempathy/Makefile
 -   python/pyempathygtk/Makefile
     tests/Makefile
     tests/xml/Makefile
     tools/Makefile
@@@ -523,7 -501,6 +463,5 @@@ Configure summary
  
      Extras:
        Documentation...............:  ${enable_gtk_doc}
-       Megaphone applet............:  ${have_megaphone}
-       Nothere applet..............:  ${have_nothere}
 -      Python bindings.............:  ${have_python}
        Nautilus-sendto plugin......:  ${have_nst}
  "