[empathy: 1/3] Remove the panel applets. (Closes bug #599042)
- From: Jonny Lamb <jonnylamb src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy: 1/3] Remove the panel applets. (Closes bug #599042)
- Date: Tue, 20 Oct 2009 13:01:15 +0000 (UTC)
commit da500948288ec5e9e675502151e5305bdf063592
Author: Jonny Lamb <jonnylamb gnome org>
Date: Tue Oct 20 13:07:52 2009 +0100
Remove the panel applets. (Closes bug #599042)
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 --git a/Makefile.am b/Makefile.am
index 2ffb7d6..8148380 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +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
-endif
-
if HAVE_PYTHON
SUBDIRS += python
endif
diff --git a/configure.ac b/configure.ac
index f98d937..502c550 100644
--- a/configure.ac
+++ b/configure.ac
@@ -356,33 +356,6 @@ 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
# -----------------------------------------------------------
AC_ARG_ENABLE(nautilus-sendto,
@@ -406,33 +379,6 @@ fi
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
# -----------------------------------------------------------
AC_ARG_ENABLE(tests,
@@ -515,13 +461,7 @@ 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
@@ -562,7 +502,5 @@ Configure summary:
Extras:
Documentation...............: ${enable_gtk_doc}
Python bindings.............: ${have_python}
- Megaphone applet............: ${have_megaphone}
- Nothere applet..............: ${have_nothere}
Nautilus-sendto plugin......: ${have_nst}
"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e34bdd7..fdb0744 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -51,17 +51,8 @@ libempathy-gtk/empathy-theme-manager.c
libempathy-gtk/empathy-ui-utils.c
libempathy-gtk/totem-subtitle-encoding.c
-megaphone/data/GNOME_Megaphone_Applet.schemas.in
-megaphone/data/GNOME_Megaphone_Applet.server.in.in
-megaphone/data/GNOME_Megaphone_Applet.xml
-megaphone/src/megaphone-applet.c
-
nautilus-sendto-plugin/empathy-nautilus-sendto.c
-nothere/data/GNOME_NotHere_Applet.server.in.in
-nothere/data/GNOME_NotHere_Applet.xml
-nothere/src/nothere-applet.c
-
src/empathy.c
src/empathy-about-dialog.c
src/empathy-account-assistant.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 126726d..ca6ce5f 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,6 +1,4 @@
# Please keep this file sorted alphabetically.
data/empathy.desktop.in
-megaphone/data/GNOME_Megaphone_Applet.server.in
-nothere/data/GNOME_NotHere_Applet.server.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]