From 38e4c747a4c637441224b8c20092d15a330ad257 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Fri, 7 Aug 2009 18:38:59 +0100
Subject: Oops, we need more identity.

---
 src-sus/applet-main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src-sus/applet-main.c b/src-sus/applet-main.c
index 34440d8..0e43923 100644
--- a/src-sus/applet-main.c
+++ b/src-sus/applet-main.c
@@ -48,9 +48,9 @@ static GnomeProgram *program = NULL;
  * main
  * ***********/
 
-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_IndicatorApplet_Factory",
+PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FastUserSwitchApplet_Factory",
                PANEL_TYPE_APPLET,
-               "indicator-applet", "0",
+               "indicator-applet-sus", "0",
                applet_fill_cb, NULL);
 
 /*************
@@ -219,10 +219,10 @@ applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data)
 	if (!first_time)
 	{
         gint argc = 1;
-        gchar *argv[2] = { "indicator-applet", NULL};
+        gchar *argv[2] = { "indicator-applet-sus", NULL};
 	    
 		first_time = TRUE;
-		program = gnome_program_init ("indicator-applet", "0.1",
+		program = gnome_program_init ("indicator-applet-sus", "0.1",
 				    LIBGNOMEUI_MODULE, argc, argv,
 				    GNOME_PROGRAM_STANDARD_PROPERTIES,
 				    NULL);
@@ -233,7 +233,7 @@ applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data)
 	panel_applet_set_flags(applet, PANEL_APPLET_EXPAND_MINOR);
 	panel_applet_setup_menu(applet, menu_xml, menu_verbs, NULL);
     atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
-                         "indicator-applet");
+                         "indicator-applet-sus");
   
 	/* Init some theme/icon stuff */
 	gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
-- 
cgit v1.2.3


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

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