From b2c2d9902a78ba3d2eb1bd40d1f300741a770af7 Mon Sep 17 00:00:00 2001
From: Sven Neumann <sven@gimp.org>
Date: Mon, 26 Mar 2007 21:19:30 +0000
Subject: [PATCH] app/widgets/dbus-service.xml be more specific in the D-Bus
 service and

2007-03-26  Sven Neumann  <sven@gimp.org>

	* app/widgets/dbus-service.xml
	* app/widgets/gimpdbusservice.h: be more specific in the D-Bus
	service and interface name.


svn path=/trunk/; revision=22171
---
 ChangeLog                     | 6 ++++++
 app/widgets/dbus-service.xml  | 4 ++--
 app/widgets/gimpdbusservice.h | 8 ++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d36dc3cc35..0106379c50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-26  Sven Neumann  <sven@gimp.org>
+
+	* app/widgets/dbus-service.xml
+	* app/widgets/gimpdbusservice.h: be more specific in the D-Bus
+	service and interface name.
+
 2007-03-23  Sven Neumann  <sven@gimp.org>
 
 	Make XOR color configurable (bug #421466):
diff --git a/app/widgets/dbus-service.xml b/app/widgets/dbus-service.xml
index 2b182fc576..6e4ea1d4c0 100644
--- a/app/widgets/dbus-service.xml
+++ b/app/widgets/dbus-service.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<node name="/org/gimp/GIMP">
+<node name="/org/gimp/GIMP/Remote">
 
-  <interface name="org.gimp.GIMP">
+  <interface name="org.gimp.GIMP.UI">
     <annotation name="org.freedesktop.DBus.GLib.CSymbol"
 		value="gimp_dbus_service" />
     <method name="Open">
diff --git a/app/widgets/gimpdbusservice.h b/app/widgets/gimpdbusservice.h
index e9a8e4398c..e183a7b0af 100644
--- a/app/widgets/gimpdbusservice.h
+++ b/app/widgets/gimpdbusservice.h
@@ -25,9 +25,9 @@
 G_BEGIN_DECLS
 
 
-#define GIMP_DBUS_SERVICE_NAME      "org.gimp.GIMP"
-#define GIMP_DBUS_SERVICE_PATH      "/org/gimp/GIMP"
-#define GIMP_DBUS_SERVICE_INTERFACE "org.gimp.GIMP"
+#define GIMP_DBUS_SERVICE_NAME      "org.gimp.GIMP.UI"
+#define GIMP_DBUS_SERVICE_PATH      "/org/gimp/GIMP/UI"
+#define GIMP_DBUS_SERVICE_INTERFACE "org.gimp.GIMP.UI"
 
 
 #define GIMP_TYPE_DBUS_SERVICE            (gimp_dbus_service_get_type ())
@@ -60,7 +60,7 @@ GObject * gimp_dbus_service_new      (Gimp             *gimp);
 
 gboolean  gimp_dbus_service_open     (GimpDBusService  *service,
                                       const gchar     **uris,
-                                      GError          **error);
+                                      GError          **dbus_error);
 gboolean  gimp_dbus_service_activate (GimpDBusService  *service,
                                       GError          **dbus_error);