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

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.

diff --git a/ChangeLog b/ChangeLog
index c306721db60fd9fe739f7c43013b1b4c88064604..22ed630aa6af49977798f29835cbd0aa3355e722 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * gtk/gtkfilechooserdefault.c (trap_activate_cb): "event->state &

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c306721db60fd9fe739f7c43013b1b4c88064604..22ed630aa6af49977798f29835cbd0aa3355e722 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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>
 
        * gtk/gtkfilechooserdefault.c (trap_activate_cb): "event->state &

diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index 2a16957de549c77aabb7bdf8f8712f8a41c67a9d..73c693ac20155031a314c7a957c784ab464e986d 100644 (file)
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -155,11 +155,6 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
 
   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_popped = gtk_statusbar_update;
   
@@ -300,7 +295,7 @@ gtk_statusbar_push (GtkStatusbar *statusbar,
   g_return_val_if_fail (text != NULL, 0);
 
   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->context_id = context_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,
                                                         list);
              g_free (msg->text);
-             g_mem_chunk_free (class->messages_mem_chunk, msg);
+              g_slice_free (GtkStatusbarMsg, msg);
              g_slist_free_1 (list);
              break;
            }
@@ -392,7 +387,7 @@ gtk_statusbar_remove (GtkStatusbar *statusbar,
              class = GTK_STATUSBAR_GET_CLASS (statusbar);
              statusbar->messages = g_slist_remove_link (statusbar->messages, list);
              g_free (msg->text);
-             g_mem_chunk_free (class->messages_mem_chunk, msg);
+              g_slice_free (GtkStatusbarMsg, msg);
              g_slist_free_1 (list);
              
              break;
@@ -457,7 +452,7 @@ gtk_statusbar_destroy (GtkObject *object)
 
       msg = list->data;
       g_free (msg->text);
-      g_mem_chunk_free (class->messages_mem_chunk, msg);
+      g_slice_free (GtkStatusbarMsg, msg);
     }
   g_slist_free (statusbar->messages);
   statusbar->messages = NULL;