[gnome-applets] Clean the keyboard indicator applet on upgrade (closes bgo#613089)

[Sergey V. Udaltsov <svu src gnome org>]

commit deb12efcd0de559dfa9addcd3e14f33d317643d9
Author: Chris Coulson <chrisccoulson googlemail com>
Date:   Wed Mar 17 12:51:39 2010 +0000

    Clean the keyboard indicator applet on upgrade (closes bgo#613089)
    
    Build a null keyboard indicator applet so that it can be properly
    removed from the panel configuration on upgrade.

 null_applet/GNOME_KeyboardApplet.server.in |   22 ++++++++++++++++++++++
 null_applet/Makefile.am                    |    4 +++-
 null_applet/null_applet.c                  |    2 ++
 po/POTFILES.in                             |    1 +
 4 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/null_applet/GNOME_KeyboardApplet.server.in b/null_applet/GNOME_KeyboardApplet.server.in
new file mode 100644
index 0000000..ea8bb2c
--- /dev/null
+++ b/null_applet/GNOME_KeyboardApplet.server.in
@@ -0,0 +1,22 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:GNOME_KeyboardApplet"
+            type="factory"
+            location="OAFIID:GNOME_NullApplet_Factory">
+
+        <oaf_attribute name="repo_ids" type="stringv">
+                <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
+                <item value="IDL:Bonobo/Control:1.0"/>
+                <item value="IDL:Bonobo/Unknown:1.0"/>
+        </oaf_attribute>
+        <oaf_attribute name="name" type="string" _value="Keyboard Indicator (Deprecated)"/>
+        <oaf_attribute name="description" type="string" _value="Keyboard layout indicator"/>
+        <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
+        <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
+        <oaf_attribute name="bugzilla:component" type="string" value="keyboard indicator (gswitchit)"/>
+        <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
+        <oaf_attribute name="bugzilla:other_binaries" type="string" value="gnome-keyboard-applet"/>
+
+</oaf_server>
+
+</oaf_info>
diff --git a/null_applet/Makefile.am b/null_applet/Makefile.am
index b66f10f..2fe1d3e 100644
--- a/null_applet/Makefile.am
+++ b/null_applet/Makefile.am
@@ -20,6 +20,7 @@ server_in_files =				\
 	GNOME_CDPlayerApplet.server.in		\
 	GNOME_MailcheckApplet_Factory.server.in	\
 	GNOME_Panel_WirelessApplet.server.in	\
+	GNOME_KeyboardApplet.server.in		\
 	$(mixer_server_in)
 server_DATA = $(server_in_files:.server.in=.server)
 
@@ -37,6 +38,7 @@ EXTRA_DIST =					\
 	GNOME_CDPlayerApplet.server.in		\
 	GNOME_MailcheckApplet_Factory.server.in	\
 	GNOME_Panel_WirelessApplet.server.in	\
-	GNOME_MixerApplet.server.in
+	GNOME_MixerApplet.server.in		\
+	GNOME_KeyboardApplet.server.in
 
 -include $(top_srcdir)/git.mk
diff --git a/null_applet/null_applet.c b/null_applet/null_applet.c
index a3898fb..b03521b 100644
--- a/null_applet/null_applet.c
+++ b/null_applet/null_applet.c
@@ -44,6 +44,8 @@ insert_oafiids (GHashTable *hash_table)
 			     "OAFIID:GNOME_MixerApplet_Factory", _("Volume Control"));
 	g_hash_table_insert (hash_table,
 			     "OAFIID:GNOME_MixerApplet", _("Volume Control"));
+	g_hash_table_insert (hash_table,
+			     "OAFIID:GNOME_KeyboardApplet", _("Keyboard Indicator"));
 }
 
 static gboolean already_running;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c656db6..b066315 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -100,6 +100,7 @@ null_applet/GNOME_MailcheckApplet_Factory.server.in
 null_applet/GNOME_MixerApplet.server.in
 null_applet/GNOME_NullApplet_Factory.server.in.in
 null_applet/GNOME_Panel_WirelessApplet.server.in
+null_applet/GNOME_KeyboardApplet.server.in
 null_applet/null_applet.c
 # NB. these are actually separate files
 stickynotes/data/GNOME_StickyNotesApplet.server.in