mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-04 22:36:10 +00:00
XQuartz: Integrated xpbproxy into the server.
Added a configure option called --enable-standalone-xpbproxy which is useful for deveoping xpbproxy. The 'active' switch in preferences just disables the in-server xpbproxy (not this standalone). (cherry picked from commit 42944936326ef8732f622db9f75b79a92980550d)
This commit is contained in:
parent
24928b85dc
commit
e8112784e8
12 changed files with 217 additions and 144 deletions
|
|
@ -50,6 +50,9 @@
|
|||
|
||||
#include <Xplugin.h>
|
||||
|
||||
// pbproxy/pbproxy.h
|
||||
extern BOOL xpbproxy_init (void);
|
||||
|
||||
#define DEFAULTS_FILE "/usr/X11/lib/X11/xserver/Xquartz.plist"
|
||||
|
||||
#ifndef XSERVER_VERSION
|
||||
|
|
@ -884,6 +887,9 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
|
|||
* an mieqEnqueue() - <rdar://problem/6300249>
|
||||
*/
|
||||
check_xinitrc();
|
||||
|
||||
if(!xpbproxy_init())
|
||||
fprintf(stderr, "Error initializing xpbproxy\n");
|
||||
|
||||
[NSApp run];
|
||||
/* not reached */
|
||||
|
|
|
|||
Loading…
Reference in a new issue