From 3a8b5caef72bd16f0fb4da9bb4b27b7c8b95f16e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Fri, 7 Aug 2009 18:47:02 +0100
Subject: Changing the Bonobo server description file name to match that of
 FUSA.

---
 data/GNOME_FastUserSwitchApplet.server.in.in | 28 ++++++++++++++++++++++++++++
 data/GNOME_IndicatorAppletSUS.server.in.in   | 28 ----------------------------
 data/Makefile.am                             |  4 ++--
 3 files changed, 30 insertions(+), 30 deletions(-)
 create mode 100644 data/GNOME_FastUserSwitchApplet.server.in.in
 delete mode 100644 data/GNOME_IndicatorAppletSUS.server.in.in

(limited to 'data')

diff --git a/data/GNOME_FastUserSwitchApplet.server.in.in b/data/GNOME_FastUserSwitchApplet.server.in.in
new file mode 100644
index 0000000..388713b
--- /dev/null
+++ b/data/GNOME_FastUserSwitchApplet.server.in.in
@@ -0,0 +1,28 @@
+<oaf_info>
+  <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet_Factory" type="exe"
+              location="@LIBEXECDIR@/indicator-applet-sus">
+
+    <oaf_attribute name="repo_ids" type="stringv">
+      <item value="IDL:Bonobo/GenericFactory:1.0"/>
+      <item value="IDL:Bonobo/Unknown:1.0"/>
+    </oaf_attribute>
+    <oaf_attribute name="name" type="string" value="Indicator Applet Factory"/>
+    <oaf_attribute name="description" type="string" value="Indicator Applet Factory"/>
+    <oaf_attribute name="bonobo:environment" type="stringv">
+       <item value="DBUS_SESSION_BUS_ADDRESS"/>
+    </oaf_attribute>
+  </oaf_server>
+
+  <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet" type="factory"
+              location="OAFIID:GNOME_FastUserSwitchApplet_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="Indicator Applet SUS"/>
+    <oaf_attribute name="description" type="string" _value="A place to adjust your status, change users or exit your session."/>
+    <oaf_attribute name="panel:icon" type="string" value="indicator-applet"/>
+  </oaf_server>
+</oaf_info>
diff --git a/data/GNOME_IndicatorAppletSUS.server.in.in b/data/GNOME_IndicatorAppletSUS.server.in.in
deleted file mode 100644
index 388713b..0000000
--- a/data/GNOME_IndicatorAppletSUS.server.in.in
+++ /dev/null
@@ -1,28 +0,0 @@
-<oaf_info>
-  <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet_Factory" type="exe"
-              location="@LIBEXECDIR@/indicator-applet-sus">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:Bonobo/GenericFactory:1.0"/>
-      <item value="IDL:Bonobo/Unknown:1.0"/>
-    </oaf_attribute>
-    <oaf_attribute name="name" type="string" value="Indicator Applet Factory"/>
-    <oaf_attribute name="description" type="string" value="Indicator Applet Factory"/>
-    <oaf_attribute name="bonobo:environment" type="stringv">
-       <item value="DBUS_SESSION_BUS_ADDRESS"/>
-    </oaf_attribute>
-  </oaf_server>
-
-  <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet" type="factory"
-              location="OAFIID:GNOME_FastUserSwitchApplet_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="Indicator Applet SUS"/>
-    <oaf_attribute name="description" type="string" _value="A place to adjust your status, change users or exit your session."/>
-    <oaf_attribute name="panel:icon" type="string" value="indicator-applet"/>
-  </oaf_server>
-</oaf_info>
diff --git a/data/Makefile.am b/data/Makefile.am
index c94932d..0908bb0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,7 +8,7 @@ serverdir =					\
 	$(libdir)/bonobo/servers
 server_in_files =				\
 	GNOME_IndicatorApplet.server.in \
-	GNOME_IndicatorAppletSUS.server.in
+	GNOME_FastUserSwitchApplet.server.in
 server_DATA =					\
 	$(server_in_files:.server.in=.server)
 
@@ -68,7 +68,7 @@ CLEANFILES =					\
 EXTRA_DIST =					\
 	$(icons_DATA) \
 	GNOME_IndicatorApplet.server.in.in	\
-	GNOME_IndicatorAppletSUS.server.in.in	\
+	GNOME_FastUserSwitchApplet.server.in.in	\
 	$(schema_in_files)
 
 MAINTAINERCLEANFILES =				\
-- 
cgit v1.2.3