forked from AuroraMiddleware/gtk
Check for XAddConnectionWatch()/X11R6, and if found, disable XIM and use
Fri Apr 18 16:31:49 2003 Owen Taylor <otaylor@redhat.com> * configure.in gdk/x11/gdkdisplay-x11.c modules/input/Makefile.am: Check for XAddConnectionWatch()/X11R6, and if found, disable XIM and use of XAddConnectionWatch. Remove --enable-xim config option. Should fix building on X11R6 (#110523, Albert Chin
This commit is contained in:
parent
dcaf1b80e2
commit
ac2ef34988
@ -1,3 +1,10 @@
|
||||
Fri Apr 18 16:31:49 2003 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in gdk/x11/gdkdisplay-x11.c modules/input/Makefile.am:
|
||||
Check for XAddConnectionWatch()/X11R6, and if found, disable XIM and
|
||||
use of XAddConnectionWatch. Remove --enable-xim config option.
|
||||
Should fix building on X11R6 (#110523, Albert Chin)
|
||||
|
||||
Fri Apr 18 15:56:46 2003 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkdrawable-x11.[ch]:
|
||||
|
@ -1,3 +1,10 @@
|
||||
Fri Apr 18 16:31:49 2003 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in gdk/x11/gdkdisplay-x11.c modules/input/Makefile.am:
|
||||
Check for XAddConnectionWatch()/X11R6, and if found, disable XIM and
|
||||
use of XAddConnectionWatch. Remove --enable-xim config option.
|
||||
Should fix building on X11R6 (#110523, Albert Chin)
|
||||
|
||||
Fri Apr 18 15:56:46 2003 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkdrawable-x11.[ch]:
|
||||
|
@ -1,3 +1,10 @@
|
||||
Fri Apr 18 16:31:49 2003 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in gdk/x11/gdkdisplay-x11.c modules/input/Makefile.am:
|
||||
Check for XAddConnectionWatch()/X11R6, and if found, disable XIM and
|
||||
use of XAddConnectionWatch. Remove --enable-xim config option.
|
||||
Should fix building on X11R6 (#110523, Albert Chin)
|
||||
|
||||
Fri Apr 18 15:56:46 2003 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkdrawable-x11.[ch]:
|
||||
|
@ -1,3 +1,10 @@
|
||||
Fri Apr 18 16:31:49 2003 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in gdk/x11/gdkdisplay-x11.c modules/input/Makefile.am:
|
||||
Check for XAddConnectionWatch()/X11R6, and if found, disable XIM and
|
||||
use of XAddConnectionWatch. Remove --enable-xim config option.
|
||||
Should fix building on X11R6 (#110523, Albert Chin)
|
||||
|
||||
Fri Apr 18 15:56:46 2003 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkdrawable-x11.[ch]:
|
||||
|
@ -1,3 +1,10 @@
|
||||
Fri Apr 18 16:31:49 2003 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in gdk/x11/gdkdisplay-x11.c modules/input/Makefile.am:
|
||||
Check for XAddConnectionWatch()/X11R6, and if found, disable XIM and
|
||||
use of XAddConnectionWatch. Remove --enable-xim config option.
|
||||
Should fix building on X11R6 (#110523, Albert Chin)
|
||||
|
||||
Fri Apr 18 15:56:46 2003 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkdrawable-x11.[ch]:
|
||||
|
@ -47,11 +47,13 @@ static void gdk_display_x11_class_init (GdkDisplayX11Cla
|
||||
static void gdk_display_x11_dispose (GObject *object);
|
||||
static void gdk_display_x11_finalize (GObject *object);
|
||||
|
||||
#ifdef HAVE_X11R6
|
||||
static void gdk_internal_connection_watch (Display *display,
|
||||
XPointer arg,
|
||||
gint fd,
|
||||
gboolean opening,
|
||||
XPointer *watch_data);
|
||||
#endif /* HAVE_X11R6 */
|
||||
|
||||
static gpointer parent_class = NULL;
|
||||
|
||||
@ -130,8 +132,10 @@ gdk_display_open (const gchar *display_name)
|
||||
display_x11->use_xshm = TRUE;
|
||||
display_x11->xdisplay = xdisplay;
|
||||
|
||||
#ifdef HAVE_X11R6
|
||||
/* Set up handlers for Xlib internal connections */
|
||||
XAddConnectionWatch (xdisplay, gdk_internal_connection_watch, NULL);
|
||||
#endif /* HAVE_X11R6 */
|
||||
|
||||
/* initialize the display's screens */
|
||||
display_x11->screens = g_new (GdkScreen *, ScreenCount (display_x11->xdisplay));
|
||||
@ -228,6 +232,7 @@ gdk_display_open (const gchar *display_name)
|
||||
return display;
|
||||
}
|
||||
|
||||
#ifdef HAVE_X11R6
|
||||
/*
|
||||
* XLib internal connection handling
|
||||
*/
|
||||
@ -299,6 +304,7 @@ gdk_internal_connection_watch (Display *display,
|
||||
else
|
||||
gdk_remove_connection_handler ((GdkInternalConnection *)*watch_data);
|
||||
}
|
||||
#endif /* HAVE_X11R6 */
|
||||
|
||||
/**
|
||||
* gdk_display_get_name:
|
||||
|
@ -37,7 +37,7 @@ im_xim_la_SOURCES = \
|
||||
gtkimcontextxim.h \
|
||||
imxim.c
|
||||
im_xim_la_LIBADD = $(LDADDS)
|
||||
if USE_X11
|
||||
if HAVE_X11R6
|
||||
IM_XIM_MODULE=im-xim.la
|
||||
endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user