From db167a4a5fc6f86157fc94eb482db2eedee6d072 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 10 May 2004 20:51:19 +0000 Subject: [PATCH] Make static. 2004-05-10 Matthias Clasen * gdk/gdkdisplay.c (singlehead_...): * gdk/x11/gdkkeys-x11.c (get_effective_keymap): * gdk/x11/gdkgeometry-x11.c (expose_serial_predicate): * gdk/x11/gdkdisplay-x11.c (escape_for_xmessage): Make static. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/gdkdisplay.c | 42 +++++++++++++++++++-------------------- gdk/x11/gdkdisplay-x11.c | 2 +- gdk/x11/gdkgeometry-x11.c | 2 +- gdk/x11/gdkkeys-x11.c | 4 ++-- 8 files changed, 45 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a333c185a..26ab9711a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-05-10 Matthias Clasen + * gdk/gdkdisplay.c (singlehead_...): + * gdk/x11/gdkkeys-x11.c (get_effective_keymap): + * gdk/x11/gdkgeometry-x11.c (expose_serial_predicate): + * gdk/x11/gdkdisplay-x11.c (escape_for_xmessage): Make static. + * gtk/gtktreeview.c (gtk_tree_view_set_fixed_height_mode): Add a note about COLUMN_FIXED restriction. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9a333c185a..26ab9711a4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2004-05-10 Matthias Clasen + * gdk/gdkdisplay.c (singlehead_...): + * gdk/x11/gdkkeys-x11.c (get_effective_keymap): + * gdk/x11/gdkgeometry-x11.c (expose_serial_predicate): + * gdk/x11/gdkdisplay-x11.c (escape_for_xmessage): Make static. + * gtk/gtktreeview.c (gtk_tree_view_set_fixed_height_mode): Add a note about COLUMN_FIXED restriction. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9a333c185a..26ab9711a4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,10 @@ 2004-05-10 Matthias Clasen + * gdk/gdkdisplay.c (singlehead_...): + * gdk/x11/gdkkeys-x11.c (get_effective_keymap): + * gdk/x11/gdkgeometry-x11.c (expose_serial_predicate): + * gdk/x11/gdkdisplay-x11.c (escape_for_xmessage): Make static. + * gtk/gtktreeview.c (gtk_tree_view_set_fixed_height_mode): Add a note about COLUMN_FIXED restriction. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9a333c185a..26ab9711a4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,10 @@ 2004-05-10 Matthias Clasen + * gdk/gdkdisplay.c (singlehead_...): + * gdk/x11/gdkkeys-x11.c (get_effective_keymap): + * gdk/x11/gdkgeometry-x11.c (expose_serial_predicate): + * gdk/x11/gdkdisplay-x11.c (escape_for_xmessage): Make static. + * gtk/gtktreeview.c (gtk_tree_view_set_fixed_height_mode): Add a note about COLUMN_FIXED restriction. diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index bd5fe9eeb7..b1f9f183f0 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -40,27 +40,27 @@ static void gdk_display_dispose (GObject *object); static void gdk_display_finalize (GObject *object); -void singlehead_get_pointer (GdkDisplay *display, +static void singlehead_get_pointer (GdkDisplay *display, GdkScreen **screen, gint *x, gint *y, GdkModifierType *mask); -GdkWindow* singlehead_window_get_pointer (GdkDisplay *display, - GdkWindow *window, - gint *x, - gint *y, - GdkModifierType *mask); -GdkWindow* singlehead_window_at_pointer (GdkDisplay *display, - gint *win_x, - gint *win_y); +static GdkWindow* singlehead_window_get_pointer (GdkDisplay *display, + GdkWindow *window, + gint *x, + gint *y, + GdkModifierType *mask); +static GdkWindow* singlehead_window_at_pointer (GdkDisplay *display, + gint *win_x, + gint *win_y); -GdkWindow* singlehead_default_window_get_pointer (GdkWindow *window, - gint *x, - gint *y, - GdkModifierType *mask); -GdkWindow* singlehead_default_window_at_pointer (GdkScreen *screen, - gint *win_x, - gint *win_y); +static GdkWindow* singlehead_default_window_get_pointer (GdkWindow *window, + gint *x, + gint *y, + GdkModifierType *mask); +static GdkWindow* singlehead_default_window_at_pointer (GdkScreen *screen, + gint *win_x, + gint *win_y); static guint signals[LAST_SIGNAL] = { 0 }; @@ -558,7 +558,7 @@ gdk_display_set_pointer_hooks (GdkDisplay *display, return (GdkDisplayPointerHooks *)result; } -void +static void singlehead_get_pointer (GdkDisplay *display, GdkScreen **screen, gint *x, @@ -573,7 +573,7 @@ singlehead_get_pointer (GdkDisplay *display, singlehead_current_pointer_hooks->get_pointer (root_window, x, y, mask); } -GdkWindow* +static GdkWindow* singlehead_window_get_pointer (GdkDisplay *display, GdkWindow *window, gint *x, @@ -583,7 +583,7 @@ singlehead_window_get_pointer (GdkDisplay *display, return singlehead_current_pointer_hooks->get_pointer (window, x, y, mask); } -GdkWindow* +static GdkWindow* singlehead_window_at_pointer (GdkDisplay *display, gint *win_x, gint *win_y) @@ -594,7 +594,7 @@ singlehead_window_at_pointer (GdkDisplay *display, win_x, win_y); } -GdkWindow* +static GdkWindow* singlehead_default_window_get_pointer (GdkWindow *window, gint *x, gint *y, @@ -604,7 +604,7 @@ singlehead_default_window_get_pointer (GdkWindow *window, window, x, y, mask); } -GdkWindow* +static GdkWindow* singlehead_default_window_at_pointer (GdkScreen *screen, gint *win_x, gint *win_y) diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 8a4d3c61dc..a765a063fb 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -813,7 +813,7 @@ _gdk_windowing_set_default_display (GdkDisplay *display) } } -char* +static char* escape_for_xmessage (const char *str) { GString *retval; diff --git a/gdk/x11/gdkgeometry-x11.c b/gdk/x11/gdkgeometry-x11.c index 6e3c29888b..08af4c22d7 100644 --- a/gdk/x11/gdkgeometry-x11.c +++ b/gdk/x11/gdkgeometry-x11.c @@ -866,7 +866,7 @@ gdk_window_postmove (GdkWindow *window, } } -Bool +static Bool expose_serial_predicate (Display *xdisplay, XEvent *xev, XPointer arg) diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c index 2729dd3966..282e60df2f 100644 --- a/gdk/x11/gdkkeys-x11.c +++ b/gdk/x11/gdkkeys-x11.c @@ -380,9 +380,9 @@ get_keymap (GdkKeymapX11 *keymap_x11) #define GET_EFFECTIVE_KEYMAP(keymap) get_effective_keymap ((keymap), G_STRFUNC) -GdkKeymap * +static GdkKeymap * get_effective_keymap (GdkKeymap *keymap, - const char *function) + const char *function) { if (!keymap) {