Drop superfluous "garage" from the D-Bus service name

org.maemo.cinaest should be enough.

diff --git a/Makefile.am b/Makefile.am
index d08053a..801e736 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,8 +16,8 @@ pkglib_LTLIBRARIES = \
        libimdb-plugin.la
 
 dbusservice_DATA = \
-       data/org.maemo.garage.cinaest.service \
-       data/org.maemo.garage.cinaest.IMDb.service
+       data/org.maemo.cinaest.service \
+       data/org.maemo.cinaest.IMDb.service
 
 desktopentry_DATA = \
        data/cinaest.desktop

diff --git a/configure.ac b/configure.ac
index 55848ea..7feb0cd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,7 @@ AC_OUTPUT([
        Makefile
        po/Makefile.in
        po/Makefile
-       data/org.maemo.garage.cinaest.service
-       data/org.maemo.garage.cinaest.IMDb.service
+       data/org.maemo.cinaest.service
+       data/org.maemo.cinaest.IMDb.service
        data/cinaest.desktop
 ])

diff --git a/data/cinaest.desktop.in b/data/cinaest.desktop.in
index 3ab5d02..f89016c 100644 (file)
--- a/data/cinaest.desktop.in
+++ b/data/cinaest.desktop.in
@@ -7,5 +7,5 @@ Exec=@prefix@/bin/cinaest
 Icon=general_video
 X-Window-Icon=cinaest
 X-Window-Icon-Dimmed=cinaest
-X-Osso-Service=org.maemo.garage.cinaest
+X-Osso-Service=org.maemo.cinaest
 X-Osso-Type=application/x-executable

diff --git a/data/org.maemo.cinaest.IMDb.service.in b/data/org.maemo.cinaest.IMDb.service.in
new file mode 100644 (file)
index 0000000..d2ab25d
--- /dev/null
+++ b/data/org.maemo.cinaest.IMDb.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.maemo.cinaest.IMDb
+Exec=@libexecdir@/imdb-plaintext-downloader

diff --git a/data/org.maemo.cinaest.service.in b/data/org.maemo.cinaest.service.in
new file mode 100644 (file)
index 0000000..a50a50f
--- /dev/null
+++ b/data/org.maemo.cinaest.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.maemo.cinaest
+Exec=@prefix@/bin/cinaest

diff --git a/data/org.maemo.garage.cinaest.IMDb.service.in b/data/org.maemo.garage.cinaest.IMDb.service.in
deleted file mode 100644 (file)
index 1689380..0000000
--- a/data/org.maemo.garage.cinaest.IMDb.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.maemo.garage.cinaest.IMDb
-Exec=@libexecdir@/imdb-plaintext-downloader

diff --git a/data/org.maemo.garage.cinaest.service.in b/data/org.maemo.garage.cinaest.service.in
deleted file mode 100644 (file)
index 355ee6d..0000000
--- a/data/org.maemo.garage.cinaest.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.maemo.garage.cinaest
-Exec=@prefix@/bin/cinaest

diff --git a/debian/cinaest-plugin-imdb.install b/debian/cinaest-plugin-imdb.install
index 8b418ea..f6ba498 100644 (file)
--- a/debian/cinaest-plugin-imdb.install
+++ b/debian/cinaest-plugin-imdb.install
@@ -1,4 +1,4 @@
-usr/share/dbus-1/services/org.maemo.garage.cinaest.IMDb.service
+usr/share/dbus-1/services/org.maemo.cinaest.IMDb.service
 usr/lib/cinaest/libimdb-plugin.so*
 usr/libexec/imdb-plaintext-downloader
 

diff --git a/debian/cinaest.install b/debian/cinaest.install
index bcb78f1..175ed5a 100644 (file)
--- a/debian/cinaest.install
+++ b/debian/cinaest.install
@@ -1,3 +1,3 @@
 usr/bin/cinaest
-usr/share/dbus-1/services/org.maemo.garage.cinaest.service
+usr/share/dbus-1/services/org.maemo.cinaest.service
 usr/share/applications/hildon/cinaest.desktop

diff --git a/src/imdb/plaintext-downloader-interface.vala b/src/imdb/plaintext-downloader-interface.vala
index bdacd6d..0aa840a 100644 (file)
--- a/src/imdb/plaintext-downloader-interface.vala
+++ b/src/imdb/plaintext-downloader-interface.vala
@@ -1,10 +1,10 @@
 using GLib;
 
-[DBus (name = "org.maemo.garage.cinaest.Downloader", signals = ("progress", "description_changed"))]
+[DBus (name = "org.maemo.cinaest.Downloader", signals = ("progress", "description_changed"))]
 public interface IMDbDownloader {
-       public const string DBUS_SERVICE = "org.maemo.garage.cinaest.IMDb";
-       public const string DBUS_OBJECT = "/org/maemo/garage/cinaest/imdb";
-       public const string DBUS_IFACE = "org.maemo.garage.cinaest.Downloader";
+       public const string DBUS_SERVICE = "org.maemo.cinaest.IMDb";
+       public const string DBUS_OBJECT = "/org/maemo/cinaest/imdb";
+       public const string DBUS_IFACE = "org.maemo.cinaest.Downloader";
        public const int MOVIES = 0x1;
        public const int GENRES = 0x2;
        public const int RATINGS = 0x4;

diff --git a/src/main.vala b/src/main.vala
index c278f89..a61c122 100644 (file)
--- a/src/main.vala
+++ b/src/main.vala
@@ -78,7 +78,7 @@ public class CinaestProgram : Hildon.Program {
                Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
                Intl.textdomain (Config.GETTEXT_PACKAGE);
 
-               var osso_context = new Osso.Context ("org.maemo.garage.cinaest", Config.VERSION, true, null);
+               var osso_context = new Osso.Context ("org.maemo.cinaest", Config.VERSION, true, null);
                if (osso_context == null) {
                        return Osso.Status.ERROR;
                }