Index: gtk/gtkbutton.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkbutton.c,v
retrieving revision 1.87
diff -u -b -B -p -r1.87 gtkbutton.c
--- gtk/gtkbutton.c	11 Oct 2002 22:57:11 -0000	1.87
+++ gtk/gtkbutton.c	22 Nov 2002 23:38:07 -0000
@@ -38,8 +38,8 @@
 
 #define CHILD_SPACING     1
 
-static GtkBorder default_default_border = { 1, 1, 1, 1 };
-static GtkBorder default_default_outside_border = { 0, 0, 0, 0 };
+static const GtkBorder default_default_border = { 1, 1, 1, 1 };
+static const GtkBorder default_default_outside_border = { 0, 0, 0, 0 };
 
 /* Time out before giving up on getting a key release when animatng
  * the close button.
Index: gtk/gtkclipboard.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkclipboard.c,v
retrieving revision 1.19
diff -u -b -B -p -r1.19 gtkclipboard.c
--- gtk/gtkclipboard.c	9 Oct 2002 23:55:27 -0000	1.19
+++ gtk/gtkclipboard.c	22 Nov 2002 23:38:08 -0000
@@ -87,10 +87,10 @@ enum {
   TARGET_UTF8_STRING
 };
 
-static const gchar *request_contents_key = "gtk-request-contents";
+static const gchar request_contents_key[] = "gtk-request-contents";
 static GQuark request_contents_key_id = 0;
 
-static const gchar *clipboards_owned_key = "gtk-clipboards-owned";
+static const gchar clipboards_owned_key[] = "gtk-clipboards-owned";
 static GQuark clipboards_owned_key_id = 0;
 
 static GObjectClass *parent_class;
Index: gtk/gtkclist.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkclist.c,v
retrieving revision 1.221
diff -u -b -B -p -r1.221 gtkclist.c
--- gtk/gtkclist.c	20 Nov 2002 01:07:27 -0000	1.221
+++ gtk/gtkclist.c	22 Nov 2002 23:38:09 -0000
@@ -463,7 +463,7 @@ static void drag_dest_cell            (G
 static GtkContainerClass *parent_class = NULL;
 static guint clist_signals[LAST_SIGNAL] = {0};
 
-static GtkTargetEntry clist_target_table = { "gtk-clist-drag-reorder", 0, 0};
+static const GtkTargetEntry clist_target_table = { "gtk-clist-drag-reorder", 0, 0};
 
 GtkType
 gtk_clist_get_type (void)
Index: gtk/gtkcolorsel.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcolorsel.c,v
retrieving revision 1.104
diff -u -b -B -p -r1.104 gtkcolorsel.c
--- gtk/gtkcolorsel.c	20 Nov 2002 01:07:27 -0000	1.104
+++ gtk/gtkcolorsel.c	22 Nov 2002 23:38:10 -0000
@@ -173,7 +173,7 @@ static void     default_change_palette_f
 static gpointer parent_class = NULL;
 static guint color_selection_signals[LAST_SIGNAL] = { 0 };
 
-static gchar* default_colors = "black:white:gray50:red:purple:blue:light blue:green:yellow:orange:lavender:brown:goldenrod4:dodger blue:pink:light green:gray10:gray30:gray75:gray90";
+static const gchar default_colors[] = "black:white:gray50:red:purple:blue:light blue:green:yellow:orange:lavender:brown:goldenrod4:dodger blue:pink:light green:gray10:gray30:gray75:gray90";
 
 static GtkColorSelectionChangePaletteFunc noscreen_change_palette_hook = default_noscreen_change_palette_func;
 static GtkColorSelectionChangePaletteWithScreenFunc change_palette_hook = default_change_palette_func;
Index: gtk/gtkentry.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v
retrieving revision 1.212
diff -u -b -B -p -r1.212 gtkentry.c
--- gtk/gtkentry.c	22 Oct 2002 19:54:40 -0000	1.212
+++ gtk/gtkentry.c	22 Nov 2002 23:38:11 -0000
@@ -93,7 +93,7 @@ typedef enum {
   CURSOR_DND
 } CursorType;
 
-static GtkTargetEntry target_table[] = {
+static const GtkTargetEntry target_table[] = {
   { "UTF8_STRING",   0, 0 },
   { "COMPOUND_TEXT", 0, 0 },
   { "TEXT",          0, 0 },
Index: gtk/gtkfilesel.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkfilesel.c,v
retrieving revision 1.129
diff -u -b -B -p -r1.129 gtkfilesel.c
--- gtk/gtkfilesel.c	7 Nov 2002 23:20:32 -0000	1.129
+++ gtk/gtkfilesel.c	22 Nov 2002 23:38:12 -0000
@@ -1016,11 +1016,11 @@ static void
 file_selection_setup_dnd (GtkFileSelection *filesel)
 {
   GtkWidget *eventbox;
-  static GtkTargetEntry drop_types[] = {
+  static const GtkTargetEntry drop_types[] = {
     { "text/uri-list", 0, TARGET_URILIST}
   };
   static gint n_drop_types = sizeof(drop_types)/sizeof(drop_types[0]);
-  static GtkTargetEntry drag_types[] = {
+  static const GtkTargetEntry drag_types[] = {
     { "text/uri-list", 0, TARGET_URILIST},
     { "UTF8_STRING", 0, TARGET_UTF8_STRING },
     { "STRING", 0, 0 },
@@ -1199,7 +1199,7 @@ gtk_file_selection_set_filename (GtkFile
 G_CONST_RETURN gchar*
 gtk_file_selection_get_filename (GtkFileSelection *filesel)
 {
-  static gchar nothing[2] = "";
+  static const gchar nothing[2] = "";
   static gchar something[MAXPATHLEN*2];
   char *sys_filename;
   const char *text;
@@ -2519,7 +2519,7 @@ static gchar*
 cmpl_completion_fullname (const gchar     *text,
 			  CompletionState *cmpl_state)
 {
-  static char nothing[2] = "";
+  static const char nothing[2] = "";
 
   if (!cmpl_state_okay (cmpl_state))
     {
Index: gtk/gtklist.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtklist.c,v
retrieving revision 1.70
diff -u -b -B -p -r1.70 gtklist.c
--- gtk/gtklist.c	20 Nov 2002 01:07:28 -0000	1.70
+++ gtk/gtklist.c	22 Nov 2002 23:38:14 -0000
@@ -168,9 +168,9 @@ static void gtk_list_drag_begin (GtkWidg
 static GtkContainerClass *parent_class = NULL;
 static guint list_signals[LAST_SIGNAL] = { 0 };
 
-static const gchar *vadjustment_key = "gtk-vadjustment";
+static const gchar vadjustment_key[] = "gtk-vadjustment";
 static guint        vadjustment_key_id = 0;
-static const gchar *hadjustment_key = "gtk-hadjustment";
+static const gchar hadjustment_key[] = "gtk-hadjustment";
 static guint        hadjustment_key_id = 0;
 
 GtkType
Index: gtk/gtkoptionmenu.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkoptionmenu.c,v
retrieving revision 1.65
diff -u -b -B -p -r1.65 gtkoptionmenu.c
--- gtk/gtkoptionmenu.c	8 Nov 2002 21:53:31 -0000	1.65
+++ gtk/gtkoptionmenu.c	22 Nov 2002 23:38:14 -0000
@@ -48,7 +48,7 @@ struct _GtkOptionMenuProps
   gint focus_pad;
 };
 
-static GtkOptionMenuProps default_props = {
+static const GtkOptionMenuProps default_props = {
   TRUE,
   { 7, 13 },
   { 7, 5, 2, 2 },		/* Left, right, top, bottom */
Index: gtk/gtkselection.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkselection.c,v
retrieving revision 1.60
diff -u -b -B -p -r1.60 gtkselection.c
--- gtk/gtkselection.c	8 Nov 2002 19:41:44 -0000	1.60
+++ gtk/gtkselection.c	22 Nov 2002 23:38:15 -0000
@@ -156,7 +156,7 @@ static GList *current_incrs = NULL;
 static GList *current_selections = NULL;
 
 static GdkAtom gtk_selection_atoms[LAST_ATOM];
-static const char *gtk_selection_handler_key = "gtk-selection-handlers";
+static const char gtk_selection_handler_key[] = "gtk-selection-handlers";
 
 /****************
  * Target Lists *
Index: gtk/gtksizegroup.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtksizegroup.c,v
retrieving revision 1.8
diff -u -b -B -p -r1.8 gtksizegroup.c
--- gtk/gtksizegroup.c	9 Oct 2002 23:55:27 -0000	1.8
+++ gtk/gtksizegroup.c	22 Nov 2002 23:38:15 -0000
@@ -47,7 +47,7 @@ static void add_widget_to_closure (GtkWi
 				   GSList           **widgets);
 
 static GQuark size_groups_quark;
-static const gchar *size_groups_tag = "gtk-size-groups";
+static const gchar size_groups_tag[] = "gtk-size-groups";
 
 static GSList *
 get_size_groups (GtkWidget *widget)
Index: gtk/gtkstock.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkstock.c,v
retrieving revision 1.9
diff -u -b -B -p -r1.9 gtkstock.c
--- gtk/gtkstock.c	27 Sep 2002 19:59:10 -0000	1.9
+++ gtk/gtkstock.c	22 Nov 2002 23:38:16 -0000
@@ -260,7 +260,7 @@ gtk_stock_item_free (GtkStockItem *item)
   g_free (item);
 }
 
-static GtkStockItem builtin_items [] =
+static const GtkStockItem builtin_items [] =
 {
   /* KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate */ 
  
Index: gtk/gtkstyle.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkstyle.c,v
retrieving revision 1.134
diff -u -b -B -p -r1.134 gtkstyle.c
--- gtk/gtkstyle.c	20 Nov 2002 01:07:29 -0000	1.134
+++ gtk/gtkstyle.c	22 Nov 2002 23:38:17 -0000
@@ -319,8 +319,8 @@ static GdkFont *gtk_style_get_font_inter
  * Data for default check and radio buttons
  */
 
-static GtkRequisition default_option_indicator_size = { 7, 13 };
-static GtkBorder default_option_indicator_spacing = { 7, 5, 2, 2 };
+static const GtkRequisition default_option_indicator_size = { 7, 13 };
+static const GtkBorder default_option_indicator_spacing = { 7, 5, 2, 2 };
 
 #define INDICATOR_PART_SIZE 13
 
@@ -446,19 +446,19 @@ static struct {
 };
 
 /* --- variables --- */
-static GdkColor gtk_default_normal_fg =      { 0,      0,      0,      0 };
-static GdkColor gtk_default_active_fg =      { 0,      0,      0,      0 };
-static GdkColor gtk_default_prelight_fg =    { 0,      0,      0,      0 };
-static GdkColor gtk_default_selected_fg =    { 0, 0xffff, 0xffff, 0xffff };
-static GdkColor gtk_default_insensitive_fg = { 0, 0x7530, 0x7530, 0x7530 };
-
-static GdkColor gtk_default_normal_bg =      { 0, 0xd6d6, 0xd6d6, 0xd6d6 };
-static GdkColor gtk_default_active_bg =      { 0, 0xc350, 0xc350, 0xc350 };
-static GdkColor gtk_default_prelight_bg =    { 0, 0xea60, 0xea60, 0xea60 };
-static GdkColor gtk_default_selected_bg =    { 0,      0,      0, 0x9c40 };
-static GdkColor gtk_default_insensitive_bg = { 0, 0xd6d6, 0xd6d6, 0xd6d6 };
-static GdkColor gtk_default_selected_base =  { 0, 0xa4a4, 0xdfdf, 0xffff };
-static GdkColor gtk_default_active_base =    { 0, 0xbcbc, 0xd2d2, 0xeeee };
+static const GdkColor gtk_default_normal_fg =      { 0,      0,      0,      0 };
+static const GdkColor gtk_default_active_fg =      { 0,      0,      0,      0 };
+static const GdkColor gtk_default_prelight_fg =    { 0,      0,      0,      0 };
+static const GdkColor gtk_default_selected_fg =    { 0, 0xffff, 0xffff, 0xffff };
+static const GdkColor gtk_default_insensitive_fg = { 0, 0x7530, 0x7530, 0x7530 };
+
+static const GdkColor gtk_default_normal_bg =      { 0, 0xd6d6, 0xd6d6, 0xd6d6 };
+static const GdkColor gtk_default_active_bg =      { 0, 0xc350, 0xc350, 0xc350 };
+static const GdkColor gtk_default_prelight_bg =    { 0, 0xea60, 0xea60, 0xea60 };
+static const GdkColor gtk_default_selected_bg =    { 0,      0,      0, 0x9c40 };
+static const GdkColor gtk_default_insensitive_bg = { 0, 0xd6d6, 0xd6d6, 0xd6d6 };
+static const GdkColor gtk_default_selected_base =  { 0, 0xa4a4, 0xdfdf, 0xffff };
+static const GdkColor gtk_default_active_base =    { 0, 0xbcbc, 0xd2d2, 0xeeee };
 
 static gpointer parent_class = NULL;
 
@@ -4981,7 +4981,7 @@ get_insensitive_layout (GdkDrawable *dra
         {
 #define gray50_width 2
 #define gray50_height 2
-          static char gray50_bits[] = {
+          static const char gray50_bits[] = {
             0x02, 0x01
           };
 
@@ -6266,7 +6266,7 @@ _gtk_get_insertion_cursor_gc (GtkWidget 
     }
   else
     {
-      static GdkColor gray = { 0, 0x8888, 0x8888, 0x8888 };
+      static const GdkColor gray = { 0, 0x8888, 0x8888, 0x8888 };
       
       if (!cursor_info->secondary_gc)
 	cursor_info->secondary_gc = make_cursor_gc (widget,
Index: gtk/gtktextutil.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktextutil.c,v
retrieving revision 1.5
diff -u -b -B -p -r1.5 gtktextutil.c
--- gtk/gtktextutil.c	10 Oct 2002 21:45:40 -0000	1.5
+++ gtk/gtktextutil.c	22 Nov 2002 23:38:17 -0000
@@ -42,7 +42,7 @@ struct _GtkTextUtilCallbackInfo
   gpointer data;
 };
 
-static GtkUnicodeMenuEntry bidi_menu_entries[] = {
+static const 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 },
Index: gtk/gtktextview.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktextview.c,v
retrieving revision 1.207
diff -u -b -B -p -r1.207 gtktextview.c
--- gtk/gtktextview.c	8 Nov 2002 22:34:38 -0000	1.207
+++ gtk/gtktextview.c	22 Nov 2002 23:38:19 -0000
@@ -399,7 +399,7 @@ enum
   TARGET_TEXT_BUFFER_CONTENTS
 };
 
-static GtkTargetEntry target_table[] = {
+static const GtkTargetEntry target_table[] = {
   { "GTK_TEXT_BUFFER_CONTENTS", GTK_TARGET_SAME_APP,
     TARGET_TEXT_BUFFER_CONTENTS },
   { "UTF8_STRING", 0, TARGET_UTF8_STRING },
Index: gtk/line-arrow.xbm
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/line-arrow.xbm,v
retrieving revision 1.1.1.1
diff -u -b -B -p -r1.1.1.1 line-arrow.xbm
--- gtk/line-arrow.xbm	24 Nov 1997 22:37:50 -0000	1.1.1.1
+++ gtk/line-arrow.xbm	22 Nov 2002 23:38:20 -0000
@@ -1,4 +1,4 @@
 #define line_arrow_width 6
 #define line_arrow_height 9
-static unsigned char line_arrow_bits[] = {
+static const unsigned char line_arrow_bits[] = {
    0x00, 0x00, 0x04, 0x0c, 0x18, 0x3f, 0x18, 0x0c, 0x04};
Index: gtk/line-wrap.xbm
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/line-wrap.xbm,v
retrieving revision 1.1.1.1
diff -u -b -B -p -r1.1.1.1 line-wrap.xbm
--- gtk/line-wrap.xbm	24 Nov 1997 22:37:50 -0000	1.1.1.1
+++ gtk/line-wrap.xbm	22 Nov 2002 23:38:20 -0000
@@ -1,4 +1,4 @@
 #define line_wrap_width 6
 #define line_wrap_height 9
-static unsigned char line_wrap_bits[] = {
+static const unsigned char line_wrap_bits[] = {
   0x1e, 0x3e, 0x30, 0x30, 0x39, 0x1f, 0x0f, 0x0f, 0x1f, };
Index: gtk/tree_minus.xbm
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/tree_minus.xbm,v
retrieving revision 1.1
diff -u -b -B -p -r1.1 tree_minus.xbm
--- gtk/tree_minus.xbm	17 Dec 1997 23:41:40 -0000	1.1
+++ gtk/tree_minus.xbm	22 Nov 2002 23:38:20 -0000
@@ -1,5 +1,5 @@
 #define tree_minus_width 9
 #define tree_minus_height 9
-static char tree_minus_bits[] = {
+static const char tree_minus_bits[] = {
  0xff,0xff,0x01,0xff,0x01,0xff,0x01,0xff,0x7d,0xff,0x01,0xff,0x01,0xff,0x01,
  0xff,0xff,0xff};
Index: gtk/tree_minus.xpm
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/tree_minus.xpm,v
retrieving revision 1.1
diff -u -b -B -p -r1.1 tree_minus.xpm
--- gtk/tree_minus.xpm	17 Dec 1997 23:41:41 -0000	1.1
+++ gtk/tree_minus.xpm	22 Nov 2002 23:38:20 -0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char *tree_minus[] = {
+static const char *tree_minus[] = {
 /* width height num_colors chars_per_pixel */
 "     9     9        2            1",
 /* colors */
Index: gtk/tree_plus.xbm
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/tree_plus.xbm,v
retrieving revision 1.1
diff -u -b -B -p -r1.1 tree_plus.xbm
--- gtk/tree_plus.xbm	17 Dec 1997 23:41:42 -0000	1.1
+++ gtk/tree_plus.xbm	22 Nov 2002 23:38:20 -0000
@@ -1,5 +1,5 @@
 #define tree_plus_width 9
 #define tree_plus_height 9
-static char tree_plus_bits[] = {
+static const char tree_plus_bits[] = {
  0xff,0xff,0x01,0xff,0x11,0xff,0x11,0xff,0x7d,0xff,0x11,0xff,0x11,0xff,0x01,
  0xff,0xff,0xff};
Index: gtk/tree_plus.xpm
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/tree_plus.xpm,v
retrieving revision 1.1
diff -u -b -B -p -r1.1 tree_plus.xpm
--- gtk/tree_plus.xpm	17 Dec 1997 23:41:42 -0000	1.1
+++ gtk/tree_plus.xpm	22 Nov 2002 23:38:20 -0000
@@ -1,5 +1,5 @@
 /* XPM */
-static char *tree_plus[] = {
+static const char *tree_plus[] = {
 /* width height num_colors chars_per_pixel */
 "     9     9        2            1",
 /* colors */


