const correctness fixes

	found by Arjan van de Ven and gcc.

diff --git a/ChangeLog b/ChangeLog
index 8e55301e2212670e76e338270f9bdbde57f21b85..28a729fd63a44e62fc970dffffa1afe54b70f34a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * perf/treeview.c: const correctness fixes
+       found by Arjan van de Ven and gcc.
+
 2005-11-16  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkimage.c (animation_timeout): call

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8e55301e2212670e76e338270f9bdbde57f21b85..28a729fd63a44e62fc970dffffa1afe54b70f34a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * perf/treeview.c: const correctness fixes
+       found by Arjan van de Ven and gcc.
+
 2005-11-16  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkimage.c (animation_timeout): call

diff --git a/contrib/gdk-pixbuf-xlib/ChangeLog b/contrib/gdk-pixbuf-xlib/ChangeLog
index be68449d57c79f20cfb0268da49f9c317bcee526..fbd75fa8b48a73ac6f4d3e891a2bc4826851ab79 100644 (file)
--- a/contrib/gdk-pixbuf-xlib/ChangeLog
+++ b/contrib/gdk-pixbuf-xlib/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk-pixbuf-xlib-drawable.c: 
+       * gdk-pixbuf-xlibrgb.c: const correctness fixes
+       found by Arjan van de Ven and gcc.
+
 2005-10-05  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk-pixbuf-xlib-2.0.pc.in (Requires): Require

diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
index da9dae2f802629411c2e647082576d6a6ca4a3f5..38ad9b20b9ae99d4fbc92cc596527e7841e81af6 100644 (file)
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
@@ -41,7 +41,7 @@
 
 \f
 
-static guint32 mask_table[] = {
+static const guint32 mask_table[] = {
        0x00000000, 0x00000001, 0x00000003, 0x00000007,
        0x0000000f, 0x0000001f, 0x0000003f, 0x0000007f,
        0x000000ff, 0x000001ff, 0x000003ff, 0x000007ff,
@@ -1058,7 +1058,7 @@ convert_real_slow (XImage *image, guchar *pixels, int rowstride, xlib_colormap *
 
 typedef void (* cfunc) (XImage *image, guchar *pixels, int rowstride, xlib_colormap *cmap);
 
-static cfunc convert_map[] = {
+static const cfunc convert_map[] = {
        rgb1,rgb1,rgb1a,rgb1a,
        rgb8,rgb8,rgb8a,rgb8a,
        rgb555lsb,rgb555msb,rgb555alsb,rgb555amsb,

diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
index b5d0f8e3e94cd6b1fd594952a529b380583d8859..701f34a9ddd266f5292c7cfa9bc2cff8683bf435 100644 (file)
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
@@ -516,7 +516,7 @@ static guint32
 xlib_rgb_score_visual (XVisualInfo *visual)
 {
   guint32 quality, speed, pseudo, sys;
-  static const char* visual_names[] =
+  static const char * const visual_names[] =
   {
     "static gray",
     "grayscale",

diff --git a/modules/engines/pixbuf/ChangeLog b/modules/engines/pixbuf/ChangeLog
index 60b3260eb87f31d15e2d6c5740de6eaeab57faa5..fd72931d10722a7138938d28db0fbd688f18a816 100644 (file)
--- a/modules/engines/pixbuf/ChangeLog
+++ b/modules/engines/pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * pixbuf-rc-style.c: const correctness fixes
+       found by Arjan van de Ven and gcc.
+
 2005-08-24  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.8.2 ===

diff --git a/modules/engines/pixbuf/pixbuf-rc-style.c b/modules/engines/pixbuf/pixbuf-rc-style.c
index ef93363cee7bd104dbc2830f8955941c02fc823a..e688927c580b134027d39e24091033c3f768fb6f 100644 (file)
--- a/modules/engines/pixbuf/pixbuf-rc-style.c
+++ b/modules/engines/pixbuf/pixbuf-rc-style.c
@@ -36,7 +36,7 @@ static GtkStyle *pixbuf_rc_style_create_style (GtkRcStyle         *rc_style);
 
 static void theme_image_unref (ThemeImage *data);
 
-static struct
+static const struct
   {
     gchar              *name;
     guint               token;

diff --git a/perf/treeview.c b/perf/treeview.c
index 461a67a37749948932f53fd756d10298b1036e7d..4c5c2d7999815f398bc844110c9696f7d4be1619 100644 (file)
--- a/perf/treeview.c
+++ b/perf/treeview.c
@@ -7,7 +7,7 @@ struct row_data {
   char *text2;
 };
 
-static struct row_data row_data[] = {
+static const struct row_data row_data[] = {
   { GTK_STOCK_NEW,             "First",                "Here bygynneth the Book of the tales of Caunterbury." },
   { GTK_STOCK_OPEN,            "Second",               "Whan that Aprille, with hise shoures soote," },
   { GTK_STOCK_ABOUT,           "Third",                "The droghte of March hath perced to the roote" },