callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for XAddConnectionWatch()/X11R6, and if found, disable XIM and use

Browse Source 
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:
Owen Taylor
2003-04-18 20:53:37 +00:00
committed by Owen Taylor
parent dcaf1b80e2
commit ac2ef34988
7 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> Fri Apr 18 15:56:46 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkdrawable-x11.[ch]: * gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkdrawable-x11.[ch]:

7
ChangeLog.pre-2-10
View File

@ -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> Fri Apr 18 15:56:46 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkdrawable-x11.[ch]: * gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkdrawable-x11.[ch]:

7
ChangeLog.pre-2-4
View File

@ -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> Fri Apr 18 15:56:46 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkdrawable-x11.[ch]: * gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkdrawable-x11.[ch]:

7
ChangeLog.pre-2-6
View File

@ -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> Fri Apr 18 15:56:46 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkdrawable-x11.[ch]: * gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkdrawable-x11.[ch]:

7
ChangeLog.pre-2-8
View File

@ -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> Fri Apr 18 15:56:46 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkdrawable-x11.[ch]: * gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkdrawable-x11.[ch]:

6
gdk/x11/gdkdisplay-x11.c
View File

@ -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_dispose (GObject *object);
static void gdk_display_x11_finalize (GObject *object); static void gdk_display_x11_finalize (GObject *object);
#ifdef HAVE_X11R6
static void gdk_internal_connection_watch (Display *display, static void gdk_internal_connection_watch (Display *display,
XPointer arg, XPointer arg,
gint fd, gint fd,
gboolean opening, gboolean opening,
XPointer *watch_data); XPointer *watch_data);
#endif /* HAVE_X11R6 */
static gpointer parent_class = NULL; static gpointer parent_class = NULL;
@ -130,8 +132,10 @@ gdk_display_open (const gchar *display_name)
display_x11->use_xshm = TRUE; display_x11->use_xshm = TRUE;
display_x11->xdisplay = xdisplay; display_x11->xdisplay = xdisplay;
#ifdef HAVE_X11R6
/* Set up handlers for Xlib internal connections */ /* Set up handlers for Xlib internal connections */
XAddConnectionWatch (xdisplay, gdk_internal_connection_watch, NULL); XAddConnectionWatch (xdisplay, gdk_internal_connection_watch, NULL);
#endif /* HAVE_X11R6 */
/* initialize the display's screens */ /* initialize the display's screens */
display_x11->screens = g_new (GdkScreen *, ScreenCount (display_x11->xdisplay)); display_x11->screens = g_new (GdkScreen *, ScreenCount (display_x11->xdisplay));
@ -228,6 +232,7 @@ gdk_display_open (const gchar *display_name)
return display; return display;
} }
#ifdef HAVE_X11R6
/* /*
* XLib internal connection handling * XLib internal connection handling
*/ */
@ -299,6 +304,7 @@ gdk_internal_connection_watch (Display *display,
else else
gdk_remove_connection_handler ((GdkInternalConnection *)*watch_data); gdk_remove_connection_handler ((GdkInternalConnection *)*watch_data);
} }
#endif /* HAVE_X11R6 */
/** /**
* gdk_display_get_name: * gdk_display_get_name:

2
modules/input/Makefile.am
View File

@ -37,7 +37,7 @@ im_xim_la_SOURCES = \
gtkimcontextxim.h \ gtkimcontextxim.h \
imxim.c imxim.c
im_xim_la_LIBADD = $(LDADDS) im_xim_la_LIBADD = $(LDADDS)
if USE_X11 if HAVE_X11R6
IM_XIM_MODULE=im-xim.la IM_XIM_MODULE=im-xim.la
endif endif