Change D-Bus interface name and object path to fedorahosted ones.

.gitignore

@@ -47,7 +47,6 @@ tests/eek-xml-test
 src/eekboard
 src/eekboard-server
 src/eekboard-xml
-src/eekboard-server.service
 docs/reference/eek/*.stamp
 docs/reference/eek/*.txt
 docs/reference/eek/eek.types
@@ -76,6 +75,8 @@ po/stamp-it
 po/.intltool-merge-cache
 bindings/vala/*.vapi
 py-compile
+data/org.fedorahosted.eekboard.gschema.xml
+data/eekboard-server.service
 data/*.desktop
 examples/eekboard-inscript/eekboard-inscript
 examples/simple-client/simple-client

data/Makefile.am

@@ -5,6 +5,13 @@ SUBDIRS = icons themes keyboards
 gsettings_schemas_in_files = org.fedorahosted.eekboard.gschema.xml.in
 gsettings_SCHEMAS = $(gsettings_schemas_in_files:.gschema.xml.in=.gschema.xml)
 
+servicedir       = $(datadir)/dbus-1/services
+service_in_files = eekboard-server.service.in
+service_DATA     = $(service_in_files:.service.in=.service)
+
+$(service_DATA): $(service_in_files) Makefile
+	$(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@
+
 desktopdir = $(datadir)/applications
 desktop_in_files = eekboard.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -17,8 +24,8 @@ endif
 
 @INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES = $(desktop_DATA) $(gsettings_SCHEMAS)
+CLEANFILES = $(service_DATA) $(desktop_DATA) $(gsettings_SCHEMAS)
-EXTRA_DIST = $(desktop_in_files) $(gsettings_schemas_in_files)
+EXTRA_DIST = $(service_in_files) $(desktop_in_files) $(gsettings_schemas_in_files)
 
 if ENABLE_ATSPI
 CLEANFILES += $(autostart_DATA)

data/eekboard-server.service.in

@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=com.redhat.Eekboard.Server
+Name=org.fedorahosted.Eekboard.Server
 Exec=@bindir@/eekboard-server

eekboard/eekboard-context.c

@@ -368,9 +368,9 @@ eekboard_context_new (GDBusConnection *connection,
         g_initable_new (EEKBOARD_TYPE_CONTEXT,
                         cancellable,
                         &error,
-                        "g-name", "com.redhat.Eekboard.Server",
+                        "g-name", "org.fedorahosted.Eekboard.Server",
                         "g-connection", connection,
-                        "g-interface-name", "com.redhat.Eekboard.Context",
+                        "g-interface-name", "org.fedorahosted.Eekboard.Context",
                         "g-object-path", object_path,
                         NULL);
     if (initable != NULL) {

eekboard/eekboard-eekboard.c

@@ -143,9 +143,9 @@ eekboard_eekboard_new (GDBusConnection *connection,
                         cancellable,
                         &error,
                         "g-connection", connection,
-                        "g-name", "com.redhat.Eekboard.Server",
+                        "g-name", "org.fedorahosted.Eekboard.Server",
-                        "g-interface-name", "com.redhat.Eekboard.Server",
+                        "g-interface-name", "org.fedorahosted.Eekboard.Server",
-                        "g-object-path", "/com/redhat/Eekboard/Server",
+                        "g-object-path", "/org/fedorahosted/Eekboard/Server",
                         NULL);
     if (initable != NULL) {
         EekboardEekboard *eekboard = EEKBOARD_EEKBOARD (initable);

src/Makefile.am

@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
-if ENABLE_EEKBOARD
 bin_PROGRAMS = \
 	eekboard \
 	eekboard-server \
@@ -116,14 +115,3 @@ noinst_HEADERS = \
 	$(eekboard_server_headers) \
 	$(eekboard_xml_headers) \
 	$(libxklutil_la_headers)
-
-EXTRA_DIST = $(service_in_files)
-DISTCLEANFILES = $(service_DATA)
-
-servicedir       = $(datadir)/dbus-1/services
-service_in_files = eekboard-server.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-$(service_DATA): $(service_in_files) Makefile
-	$(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@
-endif

src/server-context.c

@@ -45,7 +45,7 @@ enum {
 
 static const gchar introspection_xml[] =
     "<node>"
-    "  <interface name='com.redhat.Eekboard.Context'>"
+    "  <interface name='org.fedorahosted.Eekboard.Context'>"
     "    <method name='AddKeyboard'>"
     "      <arg direction='in' type='v' name='keyboard'/>"
     "      <arg direction='out' type='u' name='keyboard_id'/>"

src/server-context.h

@@ -22,8 +22,8 @@
 
 G_BEGIN_DECLS
 
-#define SERVER_CONTEXT_PATH "/com/redhat/Eekboard/Context_%d"
+#define SERVER_CONTEXT_PATH "/org/fedorahosted/Eekboard/Context_%d"
-#define SERVER_CONTEXT_INTERFACE "com.redhat.Eekboard.Context"
+#define SERVER_CONTEXT_INTERFACE "org.fedorahosted.Eekboard.Context"
 
 #define SERVER_TYPE_CONTEXT (server_context_get_type())
 #define SERVER_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SERVER_TYPE_CONTEXT, ServerContext))

src/server-server.c

@@ -40,7 +40,7 @@ static guint signals[LAST_SIGNAL] = { 0, };
 
 static const gchar introspection_xml[] =
     "<node>"
-    "  <interface name='com.redhat.Eekboard.Server'>"
+    "  <interface name='org.fedorahosted.Eekboard.Server'>"
     "    <method name='CreateContext'>"
     "      <arg direction='in' type='s' name='client_name'/>"
     "      <arg direction='out' type='s' name='object_path'/>"

src/server-server.h

@@ -22,8 +22,8 @@
 
 G_BEGIN_DECLS
 
-#define SERVER_SERVER_PATH "/com/redhat/Eekboard/Server"
+#define SERVER_SERVER_PATH "/org/fedorahosted/Eekboard/Server"
-#define SERVER_SERVER_INTERFACE "com.redhat.Eekboard.Server"
+#define SERVER_SERVER_INTERFACE "org.fedorahosted.Eekboard.Server"
 
 #define SERVER_TYPE_SERVER (server_server_get_type())
 #define SERVER_SERVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SERVER_TYPE_SERVER, ServerServer))