[gnome-utils] gnome-dictionary: remove the dictionary panel applet

[Cosimo Cecchi <cosimoc src gnome org>]

commit ce02ab6d9384adba92817ad188fc0eed2ee4549d
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Apr 4 13:54:07 2011 -0400

    gnome-dictionary: remove the dictionary panel applet
    
    It doesn't even build with 3.0; let's get rid of it.

 configure.ac                                       |   23 -
 .../data/GNOME_DictionaryApplet.server.in.in       |   55 -
 gnome-dictionary/data/GNOME_DictionaryApplet.xml   |   15 -
 gnome-dictionary/data/Makefile.am                  |   28 +-
 gnome-dictionary/src/Makefile.am                   |   44 -
 gnome-dictionary/src/gdict-aligned-window.c        |  348 -----
 gnome-dictionary/src/gdict-aligned-window.h        |   69 -
 gnome-dictionary/src/gdict-applet.c                | 1333 --------------------
 gnome-dictionary/src/gdict-applet.h                |   48 -
 9 files changed, 2 insertions(+), 1961 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 02c16a8..2e69030 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,28 +143,6 @@ AS_IF([test "x$GCONFTOOL" = "xno"],
       [AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])]
 )
 
-AC_ARG_ENABLE([gdict-applet],
-               [AS_HELP_STRING([--enable-gdict-applet=@<:@yes/no@:>@],
-                               [Whether to build the Dictionary gnome-panel applet])],
-               [],
-               [enable_gdict_applet=no])
-
-AS_CASE([$enable_gdict_applet],
-        [yes],
-        [
-          # Gdict applet checks
-          PKG_CHECK_MODULES(APPLET, libpanelapplet-2.0 >= $LIBPANEL_APPLET_REQUIRED)
-          AC_SUBST(APPLET_LIBS)
-          AC_SUBST(APPLET_CFLAGS)
-        ],
-
-        [no], [],
-
-        [*], [AC_MSG_ERROR([Invalid value for --enable-gdict-applet])]
-)
-
-AM_CONDITIONAL([BUILD_GDICT_APPLET], [test "x$enable_gdict_applet" = "xyes"])
-
 # Baobab checks
 PKG_CHECK_MODULES([LIBGTOP], [libgtop-2.0 >= $LIBGTOP_REQUIRED])
 AC_SUBST(LIBGTOP_CFLAGS)
@@ -422,5 +400,4 @@ gnome-utils $VERSION configuration summary:
         Debug messages (libgdict) : $enable_debug
          API Reference (libgdict) : $enable_gtk_doc
   Logview built with ZLib support : $msg_zlib
-    Dictionary gnome-panel applet : $enable_gdict_applet
 "
diff --git a/gnome-dictionary/data/Makefile.am b/gnome-dictionary/data/Makefile.am
index 6629fc1..229a73f 100644
--- a/gnome-dictionary/data/Makefile.am
+++ b/gnome-dictionary/data/Makefile.am
@@ -37,40 +37,16 @@ builder_DATA = \
 uidir = $(datadir)/gnome-dictionary
 ui_DATA = gnome-dictionary-ui.xml
 
-# applet menu definition
-appletuidir = $(datadir)/gnome-2.0/ui
-appletui_DATA = GNOME_DictionaryApplet.xml
-
-EXTRA_DIST += $(appletui_DATA) \
+EXTRA_DIST += \
 	$(builder_DATA) \
 	$(ui_DATA) \
 	$(NULL)
 
-serverdir =
-server_DATA =
-
-if BUILD_GDICT_APPLET
-serverdir       += $(libdir)/bonobo/servers
-server_in_files = GNOME_DictionaryApplet.server.in
-server_DATA     += $(server_in_files:.server.in=.server)
-
-$(server_in_files): $(server_in_files:.server.in=.server.in.in)
-	$(AM_V_GEN)sed 					\
-		-e "s|\ VERSION\@|@VERSION@|" 		\
-		-e "s|\ LIBEXECDIR\@|$(libexecdir)|" 	\
-	$< > $@
-
- INTLTOOL_SERVER_RULE@
-endif # BUILD_GDICT_APPLET
-
-EXTRA_DIST += GNOME_DictionaryApplet.server.in.in
-
 gsettings_SCHEMAS = org.gnome.dictionary.gschema.xml
 CLEANFILES += $(gsettings_SCHEMAS) \
 	$(dictsource_DATA) \
 	$(gdictapp_in_files) \
-	$(gdictapp_DATA) \
-	$(server_DATA)
+	$(gdictapp_DATA)
 	
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
diff --git a/gnome-dictionary/src/Makefile.am b/gnome-dictionary/src/Makefile.am
index f11eeb0..f17cd8b 100644
--- a/gnome-dictionary/src/Makefile.am
+++ b/gnome-dictionary/src/Makefile.am
@@ -12,10 +12,6 @@ INCLUDES = \
 
 bin_PROGRAMS = gnome-dictionary
 
-if BUILD_GDICT_APPLET
-libexec_PROGRAMS = gnome-dictionary-applet
-endif
-
 gnome_dictionary_SOURCES = \
 	gdict-about.c		\
 	gdict-about.h		\
@@ -52,43 +48,3 @@ gnome_dictionary_LDADD = \
 	$(GTK_LIBS)		\
 	$(NULL)
 
-if BUILD_GDICT_APPLET
-gnome_dictionary_applet_SOURCES = \
-	gdict-about.c 		\
-	gdict-about.h		\
-	gdict-aligned-window.c	\
-	gdict-aligned-window.h	\
-	gdict-applet.c		\
-	gdict-applet.h		\
-	gdict-common.c		\
-	gdict-common.h		\
-	gdict-pref-dialog.c	\
-	gdict-pref-dialog.h	\
-	gdict-print.c 		\
-	gdict-print.h 		\
-	gdict-sidebar.c		\
-	gdict-sidebar.h		\
-	gdict-source-dialog.c 	\
-	gdict-source-dialog.h 	\
-	$(NULL)
-
-gnome_dictionary_applet_CFLAGS = \
-	-I$(top_builddir)/gnome-dictionary	\
-	-I$(top_srcdir)/gnome-dictionary	\
-	$(GLIB_CFLAGS)				\
-	$(GIO_CFLAG)				\
-	$(GTK_CFLAGS)				\
-	$(APPLET_CFLAGS) 			\
-	$(GCONF_CFLAGS)				\
-	$(NULL)
-
-gnome_dictionary_applet_LDADD = \
-	-lm			\
-	$(top_builddir)/gnome-dictionary/libgdict/libgdict-1.0.la \
-	$(GLIB_LIBS)		\
-	$(GIO_LIBS)		\
-	$(GTK_LIBS)		\
-	$(APPLET_LIBS)		\
-	$(GCONF_LIBS)		\
-	$(NULL)
-endif # BUILD_GDICT_APPLET