accidental exported symbols



Hey,
	I just noticed several accidentally exported symbols in gtk
and gdk. Attached is a patch to fix it.

	May I commit?

Cheers,
Mark.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtk+/ChangeLog,v
retrieving revision 1.2913
diff -u -p -r1.2913 ChangeLog
--- ChangeLog	2002/01/31 01:17:20	1.2913
+++ ChangeLog	2002/01/31 11:55:28
@@ -1,3 +1,22 @@
+2002-01-31  Mark McLoughlin  <mark skynet ie>
+
+	* gdk/gdkimage.c: (scratch_image_info_for_depth): make static.
+
+	* gdk/x11/gdkimage-x11.c: (get_full_image): ditto.
+
+	* gdk/x11/gxid_lib.[ch]: (_gxid_claim_device), (_gxid_release_device):
+	renamed from gxid_(claim|release)_device.
+
+	* gdk/x11/gdkinput-gxi.c: (_gdk_input_enable_window),
+	(_gdk_input_disable_window): upd for gxid change.
+
+	* gtk/gtkimage.c: (animation_timeout): make static.
+
+	* gtk/gtkstyle.c: (draw_thin_shadow), (draw_spin_entry_shadow): make
+	static.
+
+	* gtk/gtktextutil.c: (bidi_menu_entries): make static.
+
 Wed Jan 30 20:15:49 2002  Jonathan Blandford  <jrb redhat com>

 	* gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute
Index: gdk/gdkimage.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkimage.c,v
retrieving revision 1.28
diff -u -p -r1.28 gdkimage.c
--- gdk/gdkimage.c	2002/01/04 05:57:58	1.28
+++ gdk/gdkimage.c	2002/01/31 11:55:28
@@ -220,7 +220,7 @@ allocate_scratch_images (GdkScratchImage
   return TRUE;
 }

-GdkScratchImageInfo *
+static GdkScratchImageInfo *
 scratch_image_info_for_depth (gint depth)
 {
   GSList *tmp_list;
Index: gdk/x11/gdkimage-x11.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkimage-x11.c,v
retrieving revision 1.40
diff -u -p -r1.40 gdkimage-x11.c
--- gdk/x11/gdkimage-x11.c	2002/01/29 11:47:15	1.40
+++ gdk/x11/gdkimage-x11.c	2002/01/31 11:55:28
@@ -420,7 +420,7 @@ gdk_image_new (GdkImageType  type,
   return _gdk_image_new_for_depth (type, visual, width, height, -1);
 }

-GdkImage*
+static GdkImage*
 get_full_image (GdkDrawable    *drawable,
 		gint            src_x,
 		gint            src_y,
Index: gdk/x11/gdkinput-gxi.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkinput-gxi.c,v
retrieving revision 1.12
diff -u -p -r1.12 gdkinput-gxi.c
--- gdk/x11/gdkinput-gxi.c	2001/09/07 21:50:09	1.12
+++ gdk/x11/gdkinput-gxi.c	2002/01/31 11:55:28
@@ -365,9 +365,9 @@ _gdk_input_enable_window (GdkWindow *win

   if (!gdkdev->claimed)
     {
-      if (gxid_claim_device(_gdk_input_gxid_host, _gdk_input_gxid_port,
-			    gdkdev->deviceid,
-			    GDK_WINDOW_XWINDOW(window), FALSE) !=
+      if (_gxid_claim_device(_gdk_input_gxid_host, _gdk_input_gxid_port,
+			     gdkdev->deviceid,
+			     GDK_WINDOW_XWINDOW(window), FALSE) !=
 	  GXID_RETURN_OK)
 	{
 	  g_warning("Could not get device (is gxid running?)\n");
@@ -394,9 +394,9 @@ _gdk_input_disable_window (GdkWindow *wi

   if (gdkdev->claimed)
     {
-      gxid_release_device(_gdk_input_gxid_host, _gdk_input_gxid_port,
-			  gdkdev->deviceid,
-			  GDK_WINDOW_XWINDOW(window));
+      _gxid_release_device(_gdk_input_gxid_host, _gdk_input_gxid_port,
+			   gdkdev->deviceid,
+			   GDK_WINDOW_XWINDOW(window));

       gdkdev->claimed = FALSE;
     }
Index: gdk/x11/gxid_lib.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gxid_lib.c,v
retrieving revision 1.3
diff -u -p -r1.3 gxid_lib.c
--- gdk/x11/gxid_lib.c	1998/11/24 05:58:46	1.3
+++ gdk/x11/gxid_lib.c	2002/01/31 11:55:28
@@ -85,7 +85,7 @@ gxid_send_message(char *host, int port,

 /* claim a device. If exclusive, device is claimed exclusively */
 int
-gxid_claim_device(char *host, int port, GxidU32 device, GxidU32 window,
+_gxid_claim_device(char *host, int port, GxidU32 device, GxidU32 window,
 		  int exclusive)
 {
   GxidClaimDevice msg;
@@ -100,7 +100,7 @@ gxid_claim_device(char *host, int port,

 /* release a device/window pair */
 int
-gxid_release_device(char *host, int port, GxidU32 device, GxidU32 window)
+_gxid_release_device(char *host, int port, GxidU32 device, GxidU32 window)
 {
   GxidReleaseDevice msg;
   msg.type = htonl(GXID_RELEASE_DEVICE);
@@ -115,8 +115,8 @@ gxid_release_device(char *host, int port

 /* Some compilers don't like empty source files */
 int
-gxid_claim_device(char *host, int port, GxidU32 device, GxidU32 window,
-		  int exclusive)
+_gxid_claim_device(char *host, int port, GxidU32 device, GxidU32 window,
+		   int exclusive)
 {
   return 0;
 }
Index: gdk/x11/gxid_lib.h
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gxid_lib.h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 gxid_lib.h
--- gdk/x11/gxid_lib.h	1997/11/24 22:37:32	1.1.1.1
+++ gdk/x11/gxid_lib.h	2002/01/31 11:55:28
@@ -1,6 +1,6 @@
 #include "gxid_proto.h"

-int gxid_claim_device(char *host, int port,
+int _gxid_claim_device(char *host, int port,
 		      GxidU32 device, GxidU32 window, int exclusive);
-int gxid_release_device(char *host, int port, GxidU32 device,
+int _gxid_release_device(char *host, int port, GxidU32 device,
 			GxidU32 window);
Index: gtk/gtkimage.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkimage.c,v
retrieving revision 1.34
diff -u -p -r1.34 gtkimage.c
--- gtk/gtkimage.c	2002/01/30 00:08:41	1.34
+++ gtk/gtkimage.c	2002/01/31 11:55:28
@@ -1164,7 +1164,7 @@ gtk_image_unmap (GtkWidget *widget)
     GTK_WIDGET_CLASS (parent_class)->unmap (widget);
 }

-gint
+static gint
 animation_timeout (gpointer data)
 {
   GtkImage *image;
Index: gtk/gtkstyle.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkstyle.c,v
retrieving revision 1.102
diff -u -p -r1.102 gtkstyle.c
--- gtk/gtkstyle.c	2002/01/30 21:00:49	1.102
+++ gtk/gtkstyle.c	2002/01/31 11:55:29
@@ -2090,7 +2090,7 @@ gtk_default_draw_vline (GtkStyle     *st
 }


-void
+static void
 draw_thin_shadow (GtkStyle      *style,
 		  GdkWindow     *window,
 		  GtkStateType   state,
@@ -2130,7 +2130,7 @@ draw_thin_shadow (GtkStyle      *style,
     }
 }

-void
+static void
 draw_spin_entry_shadow (GtkStyle      *style,
 			GdkWindow     *window,
 			GtkStateType   state,
Index: gtk/gtktextutil.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktextutil.c,v
retrieving revision 1.1
diff -u -p -r1.1 gtktextutil.c
--- gtk/gtktextutil.c	2001/12/17 16:46:08	1.1
+++ gtk/gtktextutil.c	2002/01/31 11:55:29
@@ -42,7 +42,7 @@ struct _GtkTextUtilCallbackInfo
   gpointer data;
 };

-GtkUnicodeMenuEntry bidi_menu_entries[] = {
+static GtkUnicodeMenuEntry bidi_menu_entries[] = {
   { N_("LRM _Left-to-right mark"), 0x200E },
   { N_("RLM _Right-to-left mark"), 0x200F },
   { N_("LRE Left-to-right _embedding"), 0x202A },




[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]