AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

No need to allocate a guint; just stuff the ID into the pointer directly.

Browse Source 
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
This commit is contained in:
Christian Persch 2007-05-01 22:22:49 +00:00 committed by Christian Persch
parent a5cbbdef91
commit f55cccb696
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
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.
2007-05-01 Matthias Clasen <mclasen@redhat.com> 2007-05-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserdefault.c (struct UpdateCurrentFolderData), * gtk/gtkfilechooserdefault.c (struct UpdateCurrentFolderData),

13
gtk/gtkstatusbar.c
View File

@ -276,18 +276,17 @@ gtk_statusbar_get_context_id (GtkStatusbar *statusbar,
/* we need to preserve namespaces on object datas */ /* we need to preserve namespaces on object datas */
string = g_strconcat ("gtk-status-bar-context:", context_description, NULL); string = g_strconcat ("gtk-status-bar-context:", context_description, NULL);
id = g_object_get_data (G_OBJECT (statusbar), string); id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (statusbar), string));
if (!id) if (id == 0)
{ {
id = g_new (guint, 1); id = statusbar->seq_context_id++;
*id = statusbar->seq_context_id++; g_object_set_data_full (G_OBJECT (statusbar), string, GUINT_TO_POINTER (id), NULL);
g_object_set_data_full (G_OBJECT (statusbar), string, id, g_free);
statusbar->keys = g_slist_prepend (statusbar->keys, string); statusbar->keys = g_slist_prepend (statusbar->keys, string);
} }
else else
g_free (string); g_free (string);
return *id; return id;
} }
/** /**
@ -787,7 +786,7 @@ gtk_statusbar_expose_event (GtkWidget *widget,
gtk_paint_resize_grip (widget->style, gtk_paint_resize_grip (widget->style,
widget->window, widget->window,
GTK_WIDGET_STATE (widget), GTK_WIDGET_STATE (widget),
NULL, &event->area,
widget, widget,
"statusbar", "statusbar",
edge, edge,