diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-07-18 22:06:40 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-07-18 22:06:40 +0000 |
| commit | f500db339a6db572819663947933396cf79c3534 (patch) | |
| tree | 6f89582d1b35638a4f73059cf23da4236b1127b3 /gtk/gtkiconfactory.c | |
| parent | 94239d144e223cacbffceeb804e44ceedbf2f6b1 (diff) | |
| download | gtk+-f500db339a6db572819663947933396cf79c3534.tar.gz | |
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.
Diffstat (limited to 'gtk/gtkiconfactory.c')
| -rw-r--r-- | gtk/gtkiconfactory.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index a6b742669e..843fee856a 100644 --- 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; } |