s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daiki Ueno
2011-04-27 18:25:53 +09:00
parent cae9c89b64
commit 70b0d95d9b
10 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Makefile.am
View File

@ -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

3
src/eekboard-server.service.in
View File

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

2
src/server-context.c
View File

@ -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'/>"

4
src/server-context.h
View File

@ -22,8 +22,8 @@
G_BEGIN_DECLS
#define SERVER_CONTEXT_PATH "/com/redhat/Eekboard/Context_%d"
#define SERVER_CONTEXT_INTERFACE "com.redhat.Eekboard.Context"
#define SERVER_CONTEXT_PATH "/org/fedorahosted/Eekboard/Context_%d"
#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))

2
src/server-server.c
View File

@ -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'/>"

4
src/server-server.h
View File

@ -22,8 +22,8 @@
G_BEGIN_DECLS
#define SERVER_SERVER_PATH "/com/redhat/Eekboard/Server"
#define SERVER_SERVER_INTERFACE "com.redhat.Eekboard.Server"
#define SERVER_SERVER_PATH "/org/fedorahosted/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))