[vinagre] Remove panel applet

[David King <davidk src gnome org>]

commit 3a8202f595998826e2adc5c5b199c760e04ee2a8
Author: David King <amigadave amigadave com>
Date:   Sun May 1 09:52:12 2011 +0200

    Remove panel applet

 .gitignore                                      |    4 -
 Makefile.am                                     |   46 ---
 README                                          |    3 +-
 configure.ac                                    |   28 --
 data/org.gnome.panel.Vinagre.panel-applet.in.in |   16 -
 data/org.gnome.panel.applet.Vinagre.service.in  |    3 -
 data/vinagre.1                                  |    2 -
 po/POTFILES.in                                  |    2 -
 po/POTFILES.skip                                |    1 -
 vinagre/vinagre-applet.c                        |  392 -----------------------
 10 files changed, 1 insertions(+), 496 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 193f63a..04d2a3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,9 +20,6 @@ Makefile.in
 /data/org.freedesktop.Telepathy.Client.Vinagre.service
 /data/org.gnome.Vinagre.gschema.valid
 /data/org.gnome.Vinagre.gschema.xml
-/data/org.gnome.panel.Vinagre.panel-applet
-/data/org.gnome.panel.Vinagre.panel-applet.in
-/data/org.gnome.panel.applet.Vinagre.service
 /data/vinagre-*.pc
 /data/vinagre-file.desktop
 /data/vinagre-file.desktop.in
@@ -84,7 +81,6 @@ Makefile.in
 /po/stamp-it
 /po/*.gmo
 /stamp-h1
-/vinagre-applet
 /vinagre/*.lo
 /vinagre/*.o
 /vinagre/.deps
diff --git a/Makefile.am b/Makefile.am
index 0b50671..750125b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,48 +118,6 @@ libvinagre_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[
 
 libvinagre_la_LIBADD = $(VINAGRE_LIBS)
 
-if VINAGRE_HAVE_PANELAPPLET
-
-appletdir = $(LIBPANEL_APPLET_DIR)
-applet_in_file = data/org.gnome.panel.Vinagre.panel-applet.in
-nodist_applet_DATA = $(applet_in_file:.panel-applet.in=.panel-applet)
-
-$(applet_in_file): $(applet_in_file).in Makefile
-	$(AM_V_GEN)$(SED) \
-		-e "s|\ LIBEXECDIR\@|$(libexecdir)|" \
-		-e "s|\ PACKAGE_VERSION\@|$(PACKAGE_VERSION)|" $< > $@
-
-# TODO: Replace with INTLTOOL_PANEL_APPLET_RULE when it exists.
-$(nodist_applet_DATA): $(applet_in_file) $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po)
-	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-appletservicedir = $(datadir)/dbus-1/services
-appletservice_in_file = data/org.gnome.panel.applet.Vinagre.service.in
-nodist_appletservice_DATA = $(appletservice_in_file:.service.in=.service)
-
-$(nodist_appletservice_DATA): $(appletservice_in_file) Makefile
-	$(AM_V_GEN)$(SED) \
-		-e "s|\ LOCATION\@|$(libexecdir)/vinagre-applet|" $< > $@
-
-# The applet binary
-libexec_PROGRAMS = vinagre-applet
-
-vinagre_applet_CPPFLAGS = \
-	$(PANELAPPLET_CFLAGS) \
-	$(AM_CPPFLAGS)
-
-vinagre_applet_SOURCES = \
-	vinagre/vinagre-applet.c
-
-vinagre_applet_LDADD = \
-	libvinagre.la \
-	$(PANELAPPLET_LIBS) \
-	$(VINAGRE_LIBS)
-
-vinagre_applet_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
-
-endif
-
 # Telepathy stuff
 if VINAGRE_HAVE_TELEPATHY_GLIB
 handwritten_sources += \
@@ -434,8 +392,6 @@ dist_noinst_DATA = \
 	data/vinagre-mime.xml.in \
 	$(desktop_in_files) \
 	$(gsettings_in_file) \
-	$(applet_in_file) \
-	$(appletservice_in_file) \
 	$(service_in_file) \
 	intltool-extract.in \
 	intltool-merge.in \
@@ -448,8 +404,6 @@ CLEANFILES += \
 	$(nodist_mime_DATA) \
 	$(gsettings_SCHEMAS) \
 	$(nodist_pkgconfig_DATA) \
-	$(nodist_applet_DATA) \
-	$(nodist_appletservice_DATA) \
 	$(nodist_service_DATA) \
 	$(nodist_plugin_DATA)
 
diff --git a/README b/README
index da44c1e..a59657e 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 Vinagre
 =======
 
-This is vinagre, a remote desktop viewer for the GNOME Desktop.
+This is Vinagre, a remote desktop viewer for the GNOME Desktop.
 
 You can download or see more information about it on:
    http://projects.gnome.org/vinagre/
@@ -26,7 +26,6 @@ Optional support for external libraries can be enabled with the configure
 script. Relevant libraries include:
 
 * avahi-gobject and avahi-ui-gtk3
-* libpanelapplet-4.0
 * telepathy-glib
 * spice-client-gtk-3.0
 * vte-2.90
diff --git a/configure.ac b/configure.ac
index c40a2b3..2d97fa3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,33 +165,6 @@ AS_IF([test "x$have_telepathy" = "xyes"],
 
 AM_CONDITIONAL([VINAGRE_HAVE_TELEPATHY_GLIB], [test "x$have_telepathy" = "xyes"])
 
-# Check for panelapplet.
-# TODO: Applet needs porting to GTK+ 3 and libpanelapplet-4.0, and is currently
-# broken. Do not enable applet support unless you are a developer who wants to
-# hack on it.
-PANELAPPLET_DEPS="libpanelapplet-4.0 >= 2.91.91"
-
-AC_ARG_WITH([panelapplet],
-  [AS_HELP_STRING([--without-panelapplet],
-    [ignore libpanelapplet support and disable it])])
-
-AS_IF([test "x$with_panelapplet" != "xno"],
-  [PKG_CHECK_MODULES([PANELAPPLET],
-    [$PANELAPPLET_DEPS],
-    [have_panelapplet=yes],
-    [have_panelapplet=no])],
-  [have_panelapplet=no])
-
-AS_IF([test "x$have_panelapplet" = "xyes"],
-  [AC_MSG_CHECKING([for panel applet path in pkg-config file])
-    AC_SUBST([LIBPANEL_APPLET_DIR], [`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0`])
-    AC_MSG_RESULT([$LIBPANEL_APPLET_DIR])],
-  [PANELAPPLET_DEPS=""
-    AS_IF([test "x$with_panelapplet" = "xyes"],
-      [AC_MSG_ERROR([panelapplet support requested but not found])])])
-
-AM_CONDITIONAL([VINAGRE_HAVE_PANELAPPLET], [test "x$have_panelapplet" = "xyes"])
-
 # Check required libraries
 PKG_CHECK_MODULES([VINAGRE], [$GLIB_DEPS $GTHREAD_DEPS $GTK_DEPS gnome-keyring-1 $XML2_DEPS $PEAS_DEPS $AVAHI_DEPS $TELEPATHY_GLIB_DEPS $SSH_DEPS])
 
@@ -266,7 +239,6 @@ GLIB_GSETTINGS
 
 AC_CONFIG_FILES([
 Makefile
-data/org.gnome.panel.Vinagre.panel-applet.in
 data/vinagre.desktop.in
 data/vinagre-file.desktop.in
 data/vinagre-${VINAGRE_ABI_VERSION}.pc:data/vinagre.pc.in
diff --git a/data/vinagre.1 b/data/vinagre.1
index fdde2f3..48ad3a7 100644
--- a/data/vinagre.1
+++ b/data/vinagre.1
@@ -18,8 +18,6 @@ Vinagre has many features, among others:\&.
 .PP
 - GNOME keyring integration
 .PP
-- GNOME panel applet to quickly launch vinagre to access VNC servers
-.PP
 - You can connect to a VNC server by double clicking on a \&.vnc file when using nautilus\&.
 .SH "OPTIONS"
 .SS "Help Options:"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c19e65b..e1d21e7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
 # List of source files containing translatable strings.
 
-data/org.gnome.panel.Vinagre.panel-applet.in.in
 data/org.gnome.Vinagre.gschema.xml.in
 data/vinagre.desktop.in.in
 data/vinagre-file.desktop.in.in
@@ -30,7 +29,6 @@ plugins/spice/vinagre-spice-tunnel.c
 [type: gettext/glade]plugins/reverse-vnc/reverse-vnc.ui
 plugins/im-status/im-status.plugin.desktop.in
 plugins/im-status/im-status.js
-vinagre/vinagre-applet.c
 vinagre/vinagre-bookmarks.c
 vinagre/vinagre-bookmarks-migration.c
 vinagre/vinagre-bookmarks-tree.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index db575f6..708b5c5 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,4 +1,3 @@
-data/org.gnome.panel.Vinagre.panel-applet.in
 data/vinagre.desktop.in
 data/vinagre-file.desktop.in
 data/vinagre-mime.xml.in