diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-04-18 20:53:49 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-04-18 20:53:49 +0000 |
| commit | 42b4c8eb25bf6031a0f3b504a6be530ec142fefb (patch) | |
| tree | b85098f8b5e702a83f5f7dd451858c705fa173af | |
| parent | 5c3af4861b62419bb8b90e88d57bd74bc60059be (diff) | |
| download | gdk-pixbuf-42b4c8eb25bf6031a0f3b504a6be530ec142fefb.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | gdk/x11/gdkdisplay-x11.c | 6 | ||||
| -rw-r--r-- | modules/input/Makefile.am | 2 |
7 files changed, 42 insertions, 1 deletions
@@ -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]: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6e316b607..7dca87a6d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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]: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6e316b607..7dca87a6d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -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]: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6e316b607..7dca87a6d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -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]: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6e316b607..7dca87a6d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -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]: diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 68eed944c..2e3914c16 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -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: diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index 201dad60f..cb931f4f3 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -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 |