From f55cccb696128fa1d9036e6e01bde07179d7b89d Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Tue, 1 May 2007 22:22:49 +0000 Subject: [PATCH] No need to allocate a guint; just stuff the ID into the pointer directly. 2007-05-02 Christian Persch * 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 --- ChangeLog | 6 ++++++ gtk/gtkstatusbar.c | 13 ++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93905d2fcc..c5fa07ecee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-05-02 Christian Persch + + * 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. + 2007-05-01 Matthias Clasen * gtk/gtkfilechooserdefault.c (struct UpdateCurrentFolderData), 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,