[empathy: 3/3] Merge branch 'slatez-applets'

[Jonny Lamb <jonnylamb src gnome org>]

commit 105cc83e67ef41c35998aaaaae8bf18c56be65c0
Merge: 6496713... da50094...
Author: Jonny Lamb <jonnylamb gnome org>
Date:   Tue Oct 20 14:00:51 2009 +0100

    Merge branch 'slatez-applets'
    
    Conflicts:
    	Makefile.am
    	configure.ac
    
    Signed-off-by: Jonny Lamb <jonnylamb gnome org>

 Makefile.am                                        |    8 -
 configure.ac                                       |   62 --
 megaphone/.gitignore                               |    4 -
 megaphone/Makefile.am                              |    2 -
 megaphone/data/GNOME_Megaphone_Applet.schemas.in   |   30 -
 megaphone/data/GNOME_Megaphone_Applet.server.in.in |   25 -
 megaphone/data/GNOME_Megaphone_Applet.xml          |    9 -
 megaphone/data/Makefile.am                         |   36 --
 megaphone/src/Makefile.am                          |   17 -
 megaphone/src/megaphone-applet.c                   |  592 --------------------
 megaphone/src/megaphone-applet.h                   |   54 --
 nothere/.gitignore                                 |    4 -
 nothere/Makefile.am                                |    2 -
 nothere/data/GNOME_NotHere_Applet.server.in.in     |   25 -
 nothere/data/GNOME_NotHere_Applet.xml              |    7 -
 nothere/data/Makefile.am                           |   36 --
 nothere/src/Makefile.am                            |   17 -
 nothere/src/nothere-applet.c                       |  136 -----
 nothere/src/nothere-applet.h                       |   52 --
 po/POTFILES.in                                     |    9 -
 po/POTFILES.skip                                   |    2 -
 21 files changed, 0 insertions(+), 1129 deletions(-)
---
diff --cc Makefile.am
index 2026895,8148380..3ce0457
--- a/Makefile.am
+++ b/Makefile.am
@@@ -8,10 -4,10 +4,6 @@@ if HAVE_NS
  SUBDIRS += nautilus-sendto-plugin
  endif
  
- if HAVE_NOTHERE
- SUBDIRS += nothere
- endif
- 
 -if HAVE_PYTHON
 -SUBDIRS += python
 -endif
 -
  if HAVE_TESTS
  SUBDIRS += tests
  endif
diff --cc configure.ac
index facdd7c,502c550..fbe8984
--- a/configure.ac
+++ b/configure.ac
@@@ -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}
  "