brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ShellGenericContainer] minor style fixes

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=611647
This commit is contained in:
Dan Winship 2010-03-02 14:11:45 -05:00
parent 0f0e3d9644
commit 0f81c7efe0
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/shell-generic-container.c
View File

@ -54,15 +54,13 @@ static void
shell_generic_container_allocation_unref (ShellGenericContainerAllocation *alloc) shell_generic_container_allocation_unref (ShellGenericContainerAllocation *alloc)
{ {
if (--alloc->_refcount == 0) if (--alloc->_refcount == 0)
{ g_slice_free (ShellGenericContainerAllocation, alloc);
g_slice_free1 (sizeof (ShellGenericContainerAllocation), alloc);
}
} }
static void static void
shell_generic_container_allocate (ClutterActor *self, shell_generic_container_allocate (ClutterActor *self,
const ClutterActorBox *box, const ClutterActorBox *box,
ClutterAllocationFlags flags) ClutterAllocationFlags flags)
{ {
/* chain up to set actor->allocation */ /* chain up to set actor->allocation */
(CLUTTER_ACTOR_CLASS (g_type_class_peek (clutter_actor_get_type ())))->allocate (self, box, flags); (CLUTTER_ACTOR_CLASS (g_type_class_peek (clutter_actor_get_type ())))->allocate (self, box, flags);
@ -73,11 +71,12 @@ shell_generic_container_allocate (ClutterActor *self,
static void static void
shell_generic_container_get_preferred_width (ClutterActor *actor, shell_generic_container_get_preferred_width (ClutterActor *actor,
gfloat for_height, gfloat for_height,
gfloat *min_width_p, gfloat *min_width_p,
gfloat *natural_width_p) gfloat *natural_width_p)
{ {
ShellGenericContainerAllocation *alloc = g_slice_alloc0 (sizeof (ShellGenericContainerAllocation)); ShellGenericContainerAllocation *alloc = g_slice_new0 (ShellGenericContainerAllocation);
alloc->_refcount = 1; alloc->_refcount = 1;
g_signal_emit (G_OBJECT (actor), shell_generic_container_signals[GET_PREFERRED_WIDTH], 0, g_signal_emit (G_OBJECT (actor), shell_generic_container_signals[GET_PREFERRED_WIDTH], 0,
for_height, alloc); for_height, alloc);
@ -90,11 +89,12 @@ shell_generic_container_get_preferred_width (ClutterActor *actor,
static void static void
shell_generic_container_get_preferred_height (ClutterActor *actor, shell_generic_container_get_preferred_height (ClutterActor *actor,
gfloat for_width, gfloat for_width,
gfloat *min_height_p, gfloat *min_height_p,
gfloat *natural_height_p) gfloat *natural_height_p)
{ {
ShellGenericContainerAllocation *alloc = g_slice_alloc0 (sizeof (ShellGenericContainerAllocation)); ShellGenericContainerAllocation *alloc = g_slice_new0 (ShellGenericContainerAllocation);
alloc->_refcount = 1; alloc->_refcount = 1;
g_signal_emit (G_OBJECT (actor), shell_generic_container_signals[GET_PREFERRED_HEIGHT], 0, g_signal_emit (G_OBJECT (actor), shell_generic_container_signals[GET_PREFERRED_HEIGHT], 0,
for_width, alloc); for_width, alloc);
@ -244,7 +244,7 @@ shell_generic_container_class_init (ShellGenericContainerClass *klass)
static void static void
shell_generic_container_remove (ClutterContainer *container, shell_generic_container_remove (ClutterContainer *container,
ClutterActor *actor) ClutterActor *actor)
{ {
ShellGenericContainer *self = SHELL_GENERIC_CONTAINER (container); ShellGenericContainer *self = SHELL_GENERIC_CONTAINER (container);
@ -269,7 +269,8 @@ shell_generic_container_init (ShellGenericContainer *area)
area->priv->skip_paint = g_hash_table_new (NULL, NULL); area->priv->skip_paint = g_hash_table_new (NULL, NULL);
} }
GType shell_generic_container_allocation_get_type (void) GType
shell_generic_container_allocation_get_type (void)
{ {
static GType gtype = G_TYPE_INVALID; static GType gtype = G_TYPE_INVALID;
if (gtype == G_TYPE_INVALID) if (gtype == G_TYPE_INVALID)