Reorder code so that we don't get a g_warning message every time we

	* gtk/gtkiconfactory.c: (gtk_icon_size_register): Reorder code so
	that we don't get a g_warning message every time we register a new
	icon size.

	* gdk/x11/gdkcolor-x11.c: (gdk_colormap_alloc1): Fix warning by
	using pixel variable of the correct type.

diff --git a/ChangeLog b/ChangeLog
index 3fffd552a8beb004786c0c8f850c1752e170b29e..db8824a13e660d312bdb8db1acadf872212e5006 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-07-18  Darin Adler  <darin@bentspoon.com>
+
+       * gtk/gtkiconfactory.c: (gtk_icon_size_register): Reorder code so
+       that we don't get a g_warning message every time we register a new
+       icon size.
+
+       * gdk/x11/gdkcolor-x11.c: (gdk_colormap_alloc1): Fix warning by
+       using pixel variable of the correct type.
+       
 Fri Jul 13 15:33:32 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkwindow.[ch]: Add a function gdk_window_get_internal_paint_info(),

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3fffd552a8beb004786c0c8f850c1752e170b29e..db8824a13e660d312bdb8db1acadf872212e5006 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+2001-07-18  Darin Adler  <darin@bentspoon.com>
+
+       * gtk/gtkiconfactory.c: (gtk_icon_size_register): Reorder code so
+       that we don't get a g_warning message every time we register a new
+       icon size.
+
+       * gdk/x11/gdkcolor-x11.c: (gdk_colormap_alloc1): Fix warning by
+       using pixel variable of the correct type.
+       
 Fri Jul 13 15:33:32 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkwindow.[ch]: Add a function gdk_window_get_internal_paint_info(),

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3fffd552a8beb004786c0c8f850c1752e170b29e..db8824a13e660d312bdb8db1acadf872212e5006 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2001-07-18  Darin Adler  <darin@bentspoon.com>
+
+       * gtk/gtkiconfactory.c: (gtk_icon_size_register): Reorder code so
+       that we don't get a g_warning message every time we register a new
+       icon size.
+
+       * gdk/x11/gdkcolor-x11.c: (gdk_colormap_alloc1): Fix warning by
+       using pixel variable of the correct type.
+       
 Fri Jul 13 15:33:32 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkwindow.[ch]: Add a function gdk_window_get_internal_paint_info(),

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3fffd552a8beb004786c0c8f850c1752e170b29e..db8824a13e660d312bdb8db1acadf872212e5006 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+2001-07-18  Darin Adler  <darin@bentspoon.com>
+
+       * gtk/gtkiconfactory.c: (gtk_icon_size_register): Reorder code so
+       that we don't get a g_warning message every time we register a new
+       icon size.
+
+       * gdk/x11/gdkcolor-x11.c: (gdk_colormap_alloc1): Fix warning by
+       using pixel variable of the correct type.
+       
 Fri Jul 13 15:33:32 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkwindow.[ch]: Add a function gdk_window_get_internal_paint_info(),

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3fffd552a8beb004786c0c8f850c1752e170b29e..db8824a13e660d312bdb8db1acadf872212e5006 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+2001-07-18  Darin Adler  <darin@bentspoon.com>
+
+       * gtk/gtkiconfactory.c: (gtk_icon_size_register): Reorder code so
+       that we don't get a g_warning message every time we register a new
+       icon size.
+
+       * gdk/x11/gdkcolor-x11.c: (gdk_colormap_alloc1): Fix warning by
+       using pixel variable of the correct type.
+       
 Fri Jul 13 15:33:32 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkwindow.[ch]: Add a function gdk_window_get_internal_paint_info(),

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3fffd552a8beb004786c0c8f850c1752e170b29e..db8824a13e660d312bdb8db1acadf872212e5006 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2001-07-18  Darin Adler  <darin@bentspoon.com>
+
+       * gtk/gtkiconfactory.c: (gtk_icon_size_register): Reorder code so
+       that we don't get a g_warning message every time we register a new
+       icon size.
+
+       * gdk/x11/gdkcolor-x11.c: (gdk_colormap_alloc1): Fix warning by
+       using pixel variable of the correct type.
+       
 Fri Jul 13 15:33:32 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkwindow.[ch]: Add a function gdk_window_get_internal_paint_info(),

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3fffd552a8beb004786c0c8f850c1752e170b29e..db8824a13e660d312bdb8db1acadf872212e5006 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2001-07-18  Darin Adler  <darin@bentspoon.com>
+
+       * gtk/gtkiconfactory.c: (gtk_icon_size_register): Reorder code so
+       that we don't get a g_warning message every time we register a new
+       icon size.
+
+       * gdk/x11/gdkcolor-x11.c: (gdk_colormap_alloc1): Fix warning by
+       using pixel variable of the correct type.
+       
 Fri Jul 13 15:33:32 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkwindow.[ch]: Add a function gdk_window_get_internal_paint_info(),

diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index 24e6d3efe21403136eca61d542e9cd844dacc660..af6a1172dcc384356e993e80951a31a8c20979b2 100644 (file)
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@@ -610,7 +610,7 @@ gdk_colormap_alloc1 (GdkColormap *colormap,
          if (private->info[ret->pixel].ref_count) /* got a duplicate */
            {
              XFreeColors (private->xdisplay, private->xcolormap,
-                          &ret->pixel, 1, 0);
+                          &xcolor.pixel, 1, 0);
            }
          else
            {

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index a6b742669e4a0af96fc53eb41114a497ad9633aa..843fee856aa109947aa4bd470d64b1e9af82a340 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -727,12 +727,11 @@ gtk_icon_size_register (const gchar *name,
   icon_sizes[icon_sizes_used].width = width;
   icon_sizes[icon_sizes_used].height = height;
 
-  /* alias to self. */
-  gtk_icon_size_register_alias (icon_sizes[icon_sizes_used].name,
-                                icon_sizes[icon_sizes_used].size);
-  
   ++icon_sizes_used;
 
+  /* alias to self. */
+  gtk_icon_size_register_alias (name, icon_sizes_used - 1);
+  
   return icon_sizes_used - 1;
 }