AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 05:50:10 +00:00
Code Issues Projects Releases Wiki Activity

ported memchunk uses to g_slice, so the code compiles again.

Browse Source 
Tue Dec  6 10:32:17 2005  Tim Janik  <timj@gtk.org>

        * gtk/gtkstatusbar.c: ported memchunk uses to g_slice, so the code
        compiles again.
This commit is contained in:
Tim Janik 2005-12-06 09:34:27 +00:00 committed by Tim Janik
parent 446d1edbdb
commit eed3357e6c
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Dec 6 10:32:17 2005 Tim Janik <timj@gtk.org>
* gtk/gtkstatusbar.c: ported memchunk uses to g_slice, so the code
compiles again.
2005-12-05 Federico Mena Quintero <federico@ximian.com> 2005-12-05 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (trap_activate_cb): "event->state & * gtk/gtkfilechooserdefault.c (trap_activate_cb): "event->state &

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
Tue Dec 6 10:32:17 2005 Tim Janik <timj@gtk.org>
* gtk/gtkstatusbar.c: ported memchunk uses to g_slice, so the code
compiles again.
2005-12-05 Federico Mena Quintero <federico@ximian.com> 2005-12-05 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (trap_activate_cb): "event->state & * gtk/gtkfilechooserdefault.c (trap_activate_cb): "event->state &

13
gtk/gtkstatusbar.c
View File

@ -155,11 +155,6 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
widget_class->direction_changed = gtk_statusbar_direction_changed; widget_class->direction_changed = gtk_statusbar_direction_changed;
class->messages_mem_chunk = g_mem_chunk_new ("GtkStatusbar messages mem chunk",
sizeof (GtkStatusbarMsg),
sizeof (GtkStatusbarMsg) * 64,
G_ALLOC_AND_FREE);
class->text_pushed = gtk_statusbar_update; class->text_pushed = gtk_statusbar_update;
class->text_popped = gtk_statusbar_update; class->text_popped = gtk_statusbar_update;
@ -300,7 +295,7 @@ gtk_statusbar_push (GtkStatusbar *statusbar,
g_return_val_if_fail (text != NULL, 0); g_return_val_if_fail (text != NULL, 0);
class = GTK_STATUSBAR_GET_CLASS (statusbar); class = GTK_STATUSBAR_GET_CLASS (statusbar);
msg = g_chunk_new (GtkStatusbarMsg, class->messages_mem_chunk); msg = g_slice_new (GtkStatusbarMsg);
msg->text = g_strdup (text); msg->text = g_strdup (text);
msg->context_id = context_id; msg->context_id = context_id;
msg->message_id = statusbar->seq_message_id++; msg->message_id = statusbar->seq_message_id++;
@ -341,7 +336,7 @@ gtk_statusbar_pop (GtkStatusbar *statusbar,
statusbar->messages = g_slist_remove_link (statusbar->messages, statusbar->messages = g_slist_remove_link (statusbar->messages,
list); list);
g_free (msg->text); g_free (msg->text);
g_mem_chunk_free (class->messages_mem_chunk, msg); g_slice_free (GtkStatusbarMsg, msg);
g_slist_free_1 (list); g_slist_free_1 (list);
break; break;
} }
@ -392,7 +387,7 @@ gtk_statusbar_remove (GtkStatusbar *statusbar,
class = GTK_STATUSBAR_GET_CLASS (statusbar); class = GTK_STATUSBAR_GET_CLASS (statusbar);
statusbar->messages = g_slist_remove_link (statusbar->messages, list); statusbar->messages = g_slist_remove_link (statusbar->messages, list);
g_free (msg->text); g_free (msg->text);
g_mem_chunk_free (class->messages_mem_chunk, msg); g_slice_free (GtkStatusbarMsg, msg);
g_slist_free_1 (list); g_slist_free_1 (list);
break; break;
@ -457,7 +452,7 @@ gtk_statusbar_destroy (GtkObject *object)
msg = list->data; msg = list->data;
g_free (msg->text); g_free (msg->text);
g_mem_chunk_free (class->messages_mem_chunk, msg); g_slice_free (GtkStatusbarMsg, msg);
} }
g_slist_free (statusbar->messages); g_slist_free (statusbar->messages);
statusbar->messages = NULL; statusbar->messages = NULL;