[Xfce4-commits] r30331 - libexo/trunk/exo
Nick Schermer
nick at xfce.org
Thu Jul 16 22:22:46 CEST 2009
Author: nick
Date: 2009-07-16 20:22:46 +0000 (Thu, 16 Jul 2009)
New Revision: 30331
Modified:
libexo/trunk/exo/exo-binding.c
libexo/trunk/exo/exo-icon-bar.c
libexo/trunk/exo/exo-icon-chooser-model.c
libexo/trunk/exo/exo-icon-view.c
libexo/trunk/exo/exo-md5.c
libexo/trunk/exo/exo-mount-point.c
libexo/trunk/exo/exo-private.h
libexo/trunk/exo/exo-toolbars-model.c
Log:
Drop the slice allocator macros and use it directly.
Modified: libexo/trunk/exo/exo-binding.c
===================================================================
--- libexo/trunk/exo/exo-binding.c 2009-07-16 18:58:23 UTC (rev 30330)
+++ libexo/trunk/exo/exo-binding.c 2009-07-16 20:22:46 UTC (rev 30331)
@@ -122,7 +122,7 @@
if (link->dst_object != NULL)
g_object_weak_unref (link->dst_object, exo_binding_on_dst_object_destroy, binding);
- _exo_slice_free (ExoBinding, binding);
+ g_slice_free (ExoBinding, binding);
}
@@ -146,7 +146,7 @@
binding->base.destroy (binding->direct.user_data);
binding->direct.dst_object = NULL;
g_signal_handler_disconnect (object2, binding->reverse.handler);
- _exo_slice_free (ExoMutualBinding, binding);
+ g_slice_free (ExoMutualBinding, binding);
}
}
@@ -282,7 +282,7 @@
transform,
user_data);
- binding = _exo_slice_new (ExoBinding);
+ binding = g_slice_new (ExoBinding);
binding->src_object = src_object;
binding->base.destroy = destroy_notify;
@@ -432,7 +432,7 @@
transform,
user_data);
- binding = _exo_slice_new (ExoMutualBinding);
+ binding = g_slice_new (ExoMutualBinding);
binding->base.destroy = destroy_notify;
exo_binding_link_init (&binding->direct,
Modified: libexo/trunk/exo/exo-icon-bar.c
===================================================================
--- libexo/trunk/exo/exo-icon-bar.c 2009-07-16 18:58:23 UTC (rev 30330)
+++ libexo/trunk/exo/exo-icon-bar.c 2009-07-16 20:22:46 UTC (rev 30331)
@@ -1244,7 +1244,7 @@
{
ExoIconBarItem *item;
- item = _exo_slice_new0 (ExoIconBarItem);
+ item = g_slice_new0 (ExoIconBarItem);
item->width = -1;
item->height = -1;
@@ -1256,7 +1256,7 @@
static void
exo_icon_bar_item_free (ExoIconBarItem *item)
{
- _exo_slice_free (ExoIconBarItem, item);
+ g_slice_free (ExoIconBarItem, item);
}
Modified: libexo/trunk/exo/exo-icon-chooser-model.c
===================================================================
--- libexo/trunk/exo/exo-icon-chooser-model.c 2009-07-16 18:58:23 UTC (rev 30330)
+++ libexo/trunk/exo/exo-icon-chooser-model.c 2009-07-16 20:22:46 UTC (rev 30331)
@@ -467,7 +467,7 @@
for (itp = items; itp != NULL; itp = itp->next)
{
/* allocate a model item for the icon... */
- item = _exo_slice_new (ExoIconChooserModelItem);
+ item = g_slice_new (ExoIconChooserModelItem);
item->context = EXO_ICON_CHOOSER_CONTEXT_OTHER;
item->icon_name = itp->data;
item->display_name = NULL;
@@ -545,7 +545,7 @@
g_free (item->icon_name);
/* release the item */
- _exo_slice_free (ExoIconChooserModelItem, item);
+ g_slice_free (ExoIconChooserModelItem, item);
}
Modified: libexo/trunk/exo/exo-icon-view.c
===================================================================
--- libexo/trunk/exo/exo-icon-view.c 2009-07-16 18:58:23 UTC (rev 30330)
+++ libexo/trunk/exo/exo-icon-view.c 2009-07-16 20:22:46 UTC (rev 30331)
@@ -1939,7 +1939,7 @@
{
icon_view->priv->children = g_list_delete_link (icon_view->priv->children, lp);
gtk_widget_unparent (widget);
- _exo_slice_free (ExoIconViewChild, child);
+ g_slice_free (ExoIconViewChild, child);
return;
}
}
@@ -2003,7 +2003,7 @@
ExoIconViewChild *child;
/* allocate the new child */
- child = _exo_slice_new (ExoIconViewChild);
+ child = g_slice_new (ExoIconViewChild);
child->widget = widget;
child->item = item;
child->cell = cell;
@@ -3893,7 +3893,7 @@
idx = gtk_tree_path_get_indices (path)[0];
/* allocate the new item */
- item = _exo_slice_new0 (ExoIconViewItem);
+ item = g_slice_new0 (ExoIconViewItem);
item->iter = *iter;
item->area.width = -1;
icon_view->priv->items = g_list_insert (icon_view->priv->items, item, idx);
@@ -3953,7 +3953,7 @@
icon_view->priv->items = g_list_delete_link (icon_view->priv->items, list);
/* release the item */
- _exo_slice_free (ExoIconViewItem, item);
+ g_slice_free (ExoIconViewItem, item);
/* recalculate the layout */
exo_icon_view_queue_layout (icon_view);
@@ -4679,7 +4679,7 @@
free_cell_attributes (info);
g_object_unref (G_OBJECT (info->cell));
- _exo_slice_free (ExoIconViewCellInfo, info);
+ g_slice_free (ExoIconViewCellInfo, info);
}
@@ -4698,7 +4698,7 @@
g_object_ref (renderer);
gtk_object_sink (GTK_OBJECT (renderer));
- info = _exo_slice_new0 (ExoIconViewCellInfo);
+ info = g_slice_new0 (ExoIconViewCellInfo);
info->cell = renderer;
info->expand = expand ? TRUE : FALSE;
info->pack = GTK_PACK_START;
@@ -4727,7 +4727,7 @@
g_object_ref (renderer);
gtk_object_sink (GTK_OBJECT (renderer));
- info = _exo_slice_new0 (ExoIconViewCellInfo);
+ info = g_slice_new0 (ExoIconViewCellInfo);
info->cell = renderer;
info->expand = expand ? TRUE : FALSE;
info->pack = GTK_PACK_END;
@@ -5285,7 +5285,7 @@
for (lp = icon_view->priv->items; lp != NULL; lp = lp->next)
{
g_free (EXO_ICON_VIEW_ITEM (lp->data)->box);
- _exo_slice_free (ExoIconViewItem, lp->data);
+ g_slice_free (ExoIconViewItem, lp->data);
}
g_list_free (icon_view->priv->items);
icon_view->priv->items = NULL;
@@ -5355,7 +5355,7 @@
{
do
{
- item = _exo_slice_new0 (ExoIconViewItem);
+ item = g_slice_new0 (ExoIconViewItem);
item->iter = iter;
item->area.width = -1;
items = g_list_prepend (items, item);
@@ -6513,7 +6513,7 @@
DestRow *dr = (DestRow *)data;
gtk_tree_row_reference_free (dr->dest_row);
- _exo_slice_free (DestRow, dr);
+ g_slice_free (DestRow, dr);
}
static void
@@ -6533,7 +6533,7 @@
return;
}
- dr = _exo_slice_new0 (DestRow);
+ dr = g_slice_new0 (DestRow);
dr->dest_row = gtk_tree_row_reference_new (model, dest_row);
dr->empty_view_drop = empty_view_drop;
Modified: libexo/trunk/exo/exo-md5.c
===================================================================
--- libexo/trunk/exo/exo-md5.c 2009-07-16 18:58:23 UTC (rev 30330)
+++ libexo/trunk/exo/exo-md5.c 2009-07-16 20:22:46 UTC (rev 30331)
@@ -335,7 +335,7 @@
g_return_val_if_fail (contents != NULL, NULL);
- digest = _exo_slice_new (ExoMd5Digest);
+ digest = g_slice_new (ExoMd5Digest);
get_md5 (contents, digest->digest);
return digest;
@@ -388,7 +388,7 @@
g_return_val_if_fail (str_digest != NULL, NULL);
g_return_val_if_fail (strlen (str_digest) == 32, NULL);
- digest = _exo_slice_new (ExoMd5Digest);
+ digest = g_slice_new (ExoMd5Digest);
for (n = 0; n < 16; ++n)
{
digest->digest[n] =
@@ -453,7 +453,7 @@
if (G_LIKELY (digest != NULL))
{
/* take a copy of the digest */
- duplicate = _exo_slice_new (ExoMd5Digest);
+ duplicate = g_slice_new (ExoMd5Digest);
memcpy (duplicate, digest, sizeof (*digest));
return duplicate;
}
@@ -476,7 +476,7 @@
void
exo_md5_digest_free (ExoMd5Digest *digest)
{
- _exo_slice_free (ExoMd5Digest, digest);
+ g_slice_free (ExoMd5Digest, digest);
}
Modified: libexo/trunk/exo/exo-mount-point.c
===================================================================
--- libexo/trunk/exo/exo-mount-point.c 2009-07-16 18:58:23 UTC (rev 30330)
+++ libexo/trunk/exo/exo-mount-point.c 2009-07-16 20:22:46 UTC (rev 30331)
@@ -175,7 +175,7 @@
}
/* allocate an ExoMountPoint, we matched */
- mount_point = _exo_slice_new (ExoMountPoint);
+ mount_point = g_slice_new (ExoMountPoint);
mount_point->flags = real_read_only ? EXO_MOUNT_POINT_READ_ONLY : 0;
mount_point->device = g_strdup (real_device);
mount_point->folder = g_strdup (real_folder);
@@ -469,7 +469,7 @@
if (G_LIKELY (mount_point != NULL))
{
- duplicate = _exo_slice_new (ExoMountPoint);
+ duplicate = g_slice_new (ExoMountPoint);
duplicate->flags = mount_point->flags;
duplicate->device = g_strdup (mount_point->device);
duplicate->folder = g_strdup (mount_point->folder);
@@ -502,7 +502,7 @@
g_free (mount_point->device);
g_free (mount_point->folder);
g_free (mount_point->fstype);
- _exo_slice_free (ExoMountPoint, mount_point);
+ g_slice_free (ExoMountPoint, mount_point);
}
}
Modified: libexo/trunk/exo/exo-private.h
===================================================================
--- libexo/trunk/exo/exo-private.h 2009-07-16 18:58:23 UTC (rev 30330)
+++ libexo/trunk/exo/exo-private.h 2009-07-16 20:22:46 UTC (rev 30331)
@@ -46,23 +46,6 @@
#define _exo_return_val_if_fail(expr, val) G_STMT_START{ (void)0; }G_STMT_END
#endif
-/* support macros for the slice allocator */
-#if GLIB_CHECK_VERSION(2,10,0)
-#define _exo_slice_alloc(block_size) (g_slice_alloc ((block_size)))
-#define _exo_slice_alloc0(block_size) (g_slice_alloc0 ((block_size)))
-#define _exo_slice_free1(block_size, mem_block) G_STMT_START{ g_slice_free1 ((block_size), (mem_block)); }G_STMT_END
-#define _exo_slice_new(type) (g_slice_new (type))
-#define _exo_slice_new0(type) (g_slice_new0 (type))
-#define _exo_slice_free(type, ptr) G_STMT_START{ g_slice_free (type, (ptr)); }G_STMT_END
-#else
-#define _exo_slice_alloc(block_size) (g_malloc ((block_size)))
-#define _exo_slice_alloc0(block_size) (g_malloc0 ((block_size)))
-#define _exo_slice_free1(block_size, mem_block) G_STMT_START{ g_free ((mem_block)); }G_STMT_END
-#define _exo_slice_new(type) (g_new (type, 1))
-#define _exo_slice_new0(type) (g_new0 (type, 1))
-#define _exo_slice_free(type, ptr) G_STMT_START{ g_free ((ptr)); }G_STMT_END
-#endif
-
/* avoid trivial g_value_get_*() function calls */
#ifdef NDEBUG
#define g_value_get_boolean(v) (((const GValue *) (v))->data[0].v_int)
Modified: libexo/trunk/exo/exo-toolbars-model.c
===================================================================
--- libexo/trunk/exo/exo-toolbars-model.c 2009-07-16 18:58:23 UTC (rev 30330)
+++ libexo/trunk/exo/exo-toolbars-model.c 2009-07-16 20:22:46 UTC (rev 30331)
@@ -464,7 +464,7 @@
{
ExoToolbarsItem *item;
- item = _exo_slice_new (ExoToolbarsItem);
+ item = g_slice_new (ExoToolbarsItem);
item->id = g_strdup (id);
item->type = g_strdup (type);
item->is_separator = is_separator;
@@ -485,12 +485,12 @@
item = lp->data;
g_free (item->type);
g_free (item->id);
- _exo_slice_free (ExoToolbarsItem, item);
+ g_slice_free (ExoToolbarsItem, item);
}
g_list_free (toolbar->items);
g_free (toolbar->name);
- _exo_slice_free (ExoToolbarsToolbar, toolbar);
+ g_slice_free (ExoToolbarsToolbar, toolbar);
}
@@ -1183,7 +1183,7 @@
g_return_val_if_fail (EXO_IS_TOOLBARS_MODEL (model), -1);
g_return_val_if_fail (name != NULL, -1);
- toolbar = _exo_slice_new (ExoToolbarsToolbar);
+ toolbar = g_slice_new (ExoToolbarsToolbar);
toolbar->name = g_strdup (name);
toolbar->items = NULL;
toolbar->flags = 0;
@@ -1279,7 +1279,7 @@
toolbar->items = g_list_remove (toolbar->items, item);
g_free (item->type);
g_free (item->id);
- _exo_slice_free (ExoToolbarsItem, item);
+ g_slice_free (ExoToolbarsItem, item);
g_signal_emit (G_OBJECT (model), toolbars_model_signals[ITEM_REMOVED],
0, toolbar_position, item_position);
More information about the Xfce4-commits
mailing list