diff options
| author | Christian Persch <chpe@gnome.org> | 2007-05-01 22:22:49 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2007-05-01 22:22:49 +0000 |
| commit | f55cccb696128fa1d9036e6e01bde07179d7b89d (patch) | |
| tree | e6d5b3e5c10c46d71ba333a0aabfc232e1ee84da /gtk/gtkstatusbar.c | |
| parent | a5cbbdef9179041aa9a083d73c6eb17a9656fc1d (diff) | |
| download | gtk+-f55cccb696128fa1d9036e6e01bde07179d7b89d.tar.gz | |
No need to allocate a guint; just stuff the ID into the pointer directly.
2007-05-02 Christian Persch <chpe@gnome.org>
* gtk/gtkstatusbar.c: (gtk_statusbar_get_context_id),
(gtk_statusbar_expose_event): No need to allocate a guint; just stuff
the ID into the pointer directly. Bug #434865.
svn path=/trunk/; revision=17758
Diffstat (limited to 'gtk/gtkstatusbar.c')
| -rw-r--r-- | gtk/gtkstatusbar.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c index 7410e55848..69c6787a56 100644 --- a/gtk/gtkstatusbar.c +++ b/gtk/gtkstatusbar.c @@ -276,18 +276,17 @@ gtk_statusbar_get_context_id (GtkStatusbar *statusbar, /* we need to preserve namespaces on object datas */ string = g_strconcat ("gtk-status-bar-context:", context_description, NULL); - id = g_object_get_data (G_OBJECT (statusbar), string); - if (!id) + id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (statusbar), string)); + if (id == 0) { - id = g_new (guint, 1); - *id = statusbar->seq_context_id++; - g_object_set_data_full (G_OBJECT (statusbar), string, id, g_free); + id = statusbar->seq_context_id++; + g_object_set_data_full (G_OBJECT (statusbar), string, GUINT_TO_POINTER (id), NULL); statusbar->keys = g_slist_prepend (statusbar->keys, string); } else g_free (string); - return *id; + return id; } /** @@ -787,7 +786,7 @@ gtk_statusbar_expose_event (GtkWidget *widget, gtk_paint_resize_grip (widget->style, widget->window, GTK_WIDGET_STATE (widget), - NULL, + &event->area, widget, "statusbar", edge, |