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.

11 files changed, 84 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index f640ae1ba..089dd01ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+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.
+
 2002-01-31  Mark McLoughlin  <mark@skynet.ie>
 
 	* gdk/gdkimage.c: (scratch_image_info_for_depth): make static.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f640ae1ba..089dd01ec 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+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.
+
 2002-01-31  Mark McLoughlin  <mark@skynet.ie>
 
 	* gdk/gdkimage.c: (scratch_image_info_for_depth): make static.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f640ae1ba..089dd01ec 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+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.
+
 2002-01-31  Mark McLoughlin  <mark@skynet.ie>
 
 	* gdk/gdkimage.c: (scratch_image_info_for_depth): make static.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f640ae1ba..089dd01ec 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+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.
+
 2002-01-31  Mark McLoughlin  <mark@skynet.ie>
 
 	* gdk/gdkimage.c: (scratch_image_info_for_depth): make static.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f640ae1ba..089dd01ec 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+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.
+
 2002-01-31  Mark McLoughlin  <mark@skynet.ie>
 
 	* gdk/gdkimage.c: (scratch_image_info_for_depth): make static.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f640ae1ba..089dd01ec 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+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.
+
 2002-01-31  Mark McLoughlin  <mark@skynet.ie>
 
 	* gdk/gdkimage.c: (scratch_image_info_for_depth): make static.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f640ae1ba..089dd01ec 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+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.
+
 2002-01-31  Mark McLoughlin  <mark@skynet.ie>
 
 	* gdk/gdkimage.c: (scratch_image_info_for_depth): make static.
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 1d8d57dd8..5392c5017 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 320f9faf8..8c9555a1a 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 8394b0d77..ca07c835e 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 */
-
diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 85f1c927c..ff571c75b 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -76,7 +76,7 @@ struct _GtkIMModuleClass
 
 GType gtk_im_module_get_type (void);
 
-gint n_loaded_contexts = 0;
+static gint n_loaded_contexts = 0;
 static GHashTable *contexts_hash = NULL;
 static GSList *modules_list = NULL;