diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-01-31 16:37:27 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-01-31 16:37:27 +0000 |
| commit | 160725555e03302aa52f9121e00587fb7c1488d6 (patch) | |
| tree | 0214d4204bf054cd69d0d7eb9352c3500d89af0a /gdk | |
| parent | 2947596ca533860dbebdb4c5d4d8fe76b6ebdab7 (diff) | |
| download | gtk+-160725555e03302aa52f9121e00587fb7c1488d6.tar.gz | |
Fix another missing static.
Thu Jan 31 11:33:52 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkproperty-x11.c (insert_atom_pair): Fix
another missing static.
* gtk/gtkimmodule.c (n_loaded_contexts): And another.
* gdk/x11/Makefile.am gdk/x11/gxid_lib.c: Don't
build gxid sources at all except in the vanishingly
rare case of --with-xinput=xfree.
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/x11/Makefile.am | 8 | ||||
| -rw-r--r-- | gdk/x11/gdkproperty-x11.c | 2 | ||||
| -rw-r--r-- | gdk/x11/gxid_lib.c | 15 |
3 files changed, 6 insertions, 19 deletions
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am index 1d8d57dd86..5392c5017a 100644 --- a/gdk/x11/Makefile.am +++ b/gdk/x11/Makefile.am @@ -22,6 +22,10 @@ if XINPUT_GXI xinput_sources = \ gdkinput-x11.c \ gdkinput-gxi.c +gxid_sources = \ + gxid_lib.c \ + gxid_lib.h \ + gxid_proto.h else if XINPUT_XFREE xinput_sources = \ @@ -59,12 +63,10 @@ libgdk_x11_la_SOURCES = \ gdkwindow-x11.c \ gdkwindow-x11.h \ gdkxid.c \ - gxid_lib.c \ - gxid_lib.h \ - gxid_proto.h \ gdkx.h \ gdkprivate-x11.h \ gdkinputprivate.h \ + $(gxid_sources) \ xsettings-client.h \ xsettings-client.c \ xsettings-common.h \ diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c index 320f9faf8d..8c9555a1a8 100644 --- a/gdk/x11/gdkproperty-x11.c +++ b/gdk/x11/gdkproperty-x11.c @@ -119,7 +119,7 @@ static gchar *XAtomsStrings[] = { #define ATOM_TO_INDEX(atom) (GPOINTER_TO_UINT(atom)) #define INDEX_TO_ATOM(atom) ((GdkAtom)GUINT_TO_POINTER(atom)) -void +static void insert_atom_pair (GdkAtom virtual_atom, Atom xatom) { diff --git a/gdk/x11/gxid_lib.c b/gdk/x11/gxid_lib.c index 8394b0d77c..ca07c835ef 100644 --- a/gdk/x11/gxid_lib.c +++ b/gdk/x11/gxid_lib.c @@ -7,8 +7,6 @@ #include "config.h" #include "gxid_lib.h" -#ifdef XINPUT_GXI - #include <stdio.h> #include <unistd.h> #include <sys/time.h> @@ -110,16 +108,3 @@ _gxid_release_device(char *host, int port, GxidU32 device, GxidU32 window) return gxid_send_message(host,port,(GxidMessage *)&msg); } - -#else /* !XINPUT_GXI */ - -/* Some compilers don't like empty source files */ -int -_gxid_claim_device(char *host, int port, GxidU32 device, GxidU32 window, - int exclusive) -{ - return 0; -} - -#endif /* XINPUT_GXI */ - |