From 5bc7f7d4b45e8aa2242c5681edc0715292dea030 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 7 Aug 2009 14:19:27 +0100 Subject: Adding a new server to connect with our new applet. Still needs changes as it's just a copy. --- data/GNOME_FastUserSwitchApplet.server.in.in | 28 ++++++++++++++++++++++++++++ data/Makefile.am | 4 +++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 data/GNOME_FastUserSwitchApplet.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..c576246 --- /dev/null +++ b/data/GNOME_FastUserSwitchApplet.server.in.in @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/Makefile.am b/data/Makefile.am index a03fadc..35b709b 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -7,7 +7,8 @@ serverdir = \ $(libdir)/bonobo/servers server_in_files = \ - GNOME_IndicatorApplet.server.in + GNOME_IndicatorApplet.server.in \ + GNOME_FastUserSwitchApplet.server.in server_DATA = \ $(server_in_files:.server.in=.server) @@ -67,6 +68,7 @@ CLEANFILES = \ EXTRA_DIST = \ $(icons_DATA) \ GNOME_IndicatorApplet.server.in.in \ + GNOME_FastUserSwitchApplet.server.in.in \ $(schema_in_files) MAINTAINERCLEANFILES = \ -- cgit v1.2.3 From 019d958217a16b8c816b90cf240c84ffc38cd2e8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 7 Aug 2009 14:24:33 +0100 Subject: Adjusting the namespace. Just to make things fun like that. --- data/GNOME_FastUserSwitchApplet.server.in.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data') diff --git a/data/GNOME_FastUserSwitchApplet.server.in.in b/data/GNOME_FastUserSwitchApplet.server.in.in index c576246..1f9ac5a 100644 --- a/data/GNOME_FastUserSwitchApplet.server.in.in +++ b/data/GNOME_FastUserSwitchApplet.server.in.in @@ -1,5 +1,5 @@ - @@ -13,16 +13,16 @@ - + - - + + -- cgit v1.2.3 From f33fa710e65205472c1c01ec2e4d7b8dacc7cabf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 7 Aug 2009 15:32:30 +0100 Subject: Renaming the server file --- 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(-) delete mode 100644 data/GNOME_FastUserSwitchApplet.server.in.in create 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 deleted file mode 100644 index 1f9ac5a..0000000 --- a/data/GNOME_FastUserSwitchApplet.server.in.in +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/GNOME_IndicatorAppletSUS.server.in.in b/data/GNOME_IndicatorAppletSUS.server.in.in new file mode 100644 index 0000000..1f9ac5a --- /dev/null +++ b/data/GNOME_IndicatorAppletSUS.server.in.in @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/Makefile.am b/data/Makefile.am index 35b709b..3eb84f2 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_FastUserSwitchApplet.server.in + GNOME_IndicatorAppletSUS.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_FastUserSwitchApplet.server.in.in \ + GNOME_IndicatorAppletSUS.server.in.in \ $(schema_in_files) MAINTAINERCLEANFILES = \ -- cgit v1.2.3 From c35dbea8f670052a79830eee94375aebba48af2c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 7 Aug 2009 15:45:40 +0100 Subject: New executable name --- data/GNOME_IndicatorAppletSUS.server.in.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/GNOME_IndicatorAppletSUS.server.in.in b/data/GNOME_IndicatorAppletSUS.server.in.in index 1f9ac5a..388713b 100644 --- a/data/GNOME_IndicatorAppletSUS.server.in.in +++ b/data/GNOME_IndicatorAppletSUS.server.in.in @@ -1,6 +1,6 @@ + location="@LIBEXECDIR@/indicator-applet-sus"> -- cgit v1.2.3 From 3bb78064ad72b0f49b67e306dc3ba428c9abcfb3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 7 Aug 2009 16:55:23 +0100 Subject: Fixing the generation rules for the bonobo server files. --- data/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 3eb84f2..c94932d 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -12,7 +12,7 @@ server_in_files = \ server_DATA = \ $(server_in_files:.server.in=.server) -$(server_in_files): $(server_in_files:.server.in=.server.in.in) +%.server.in: %.server.in.in sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@ @INTLTOOL_SERVER_RULE@ -- cgit v1.2.3 From 3a8b5caef72bd16f0fb4da9bb4b27b7c8b95f16e Mon Sep 17 00:00:00 2001 From: Ted Gould 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - 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