Commit 16072555 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

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.
parent 2947596c
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.
......
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.
......
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.
......
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.
......
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.
......
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.
......
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.
......
......@@ -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 \
......
......@@ -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)
{
......
......@@ -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 */
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment