frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: pbproxy: Make standalone xpbproxy respect the launchd prefix 

Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
This commit is contained in:
Jeremy Huddleston 2010-03-20 11:03:28 -07:00 committed by Jeremy Huddleston
parent d16bc8a3cd
commit 927480be12
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xquartz/pbproxy/Makefile.am
View File

@ -1,5 +1,7 @@
AM_CPPFLAGS=-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks AM_CPPFLAGS=-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks \
AM_CFLAGS=$(XPBPROXY_CFLAGS) -DLAUNCHD_ID_PREFIX=\"$(LAUNCHD_ID_PREFIX)\"
AM_CFLAGS=$(XPBPROXY_CFLAGS)
noinst_LTLIBRARIES = libxpbproxy.la noinst_LTLIBRARIES = libxpbproxy.la
libxpbproxy_la_SOURCES = \ libxpbproxy_la_SOURCES = \

4
hw/xquartz/pbproxy/app-main.m
View File

@ -34,7 +34,7 @@
#include <unistd.h> /*for getpid*/ #include <unistd.h> /*for getpid*/
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
static const char *app_prefs_domain = "org.x.X11"; static const char *app_prefs_domain = LAUNCHD_ID_PREFIX".xpbproxy";
CFStringRef app_prefs_domain_cfstr; CFStringRef app_prefs_domain_cfstr;
/* Stubs */ /* Stubs */
@ -73,7 +73,7 @@ int main (int argc, const char *argv[]) {
printf("usage: xpbproxy OPTIONS\n" printf("usage: xpbproxy OPTIONS\n"
"Pasteboard proxying for X11.\n\n" "Pasteboard proxying for X11.\n\n"
"--prefs-domain <domain> Change the domain used for reading preferences\n" "--prefs-domain <domain> Change the domain used for reading preferences\n"
" (default: org.x.X11)\n"); " (default: %s)\n", app_prefs_domain);
return 0; return 0;
} else { } else {
fprintf(stderr, "usage: xpbproxy OPTIONS...\n" fprintf(stderr, "usage: xpbproxy OPTIONS...\n"