Small cleanup.

1 files changed, 15 insertions, 11 deletions

diff --git a/dock.c b/dock.c
index 27fa132..202ab1a 100644
--- a/dock.c
+++ b/dock.c
@@ -75,8 +75,6 @@ struct _KibaDock
   KibaLauncher    *dragging_launcher;
 
   GConfClient  *gconf_client;
-
-  Object *object;
 };
 
 struct _KibaDockClass
@@ -471,29 +469,35 @@ timeout_callback (gpointer data)
   return TRUE;
 }
 
+typedef struct {
+  KibaDock *dock;
+  Object *object;
+} AddSpacerClosure;
+
 static void
 add_spacer (Object *object, void *data)
 {
-  KibaDock *dock = data;
+  AddSpacerClosure *closure = data;
 
   /* Skip the anchor object. */
-  if (object != dock->anchor->object && object != dock->object)
-    model_add_spacer (&dock->model, dock->object, object, dock->spacing);
+  if (object != closure->dock->anchor->object && object != closure->object)
+    model_add_spacer (&closure->dock->model,
+		      closure->object, object, closure->dock->spacing);
 }
 
 static void
 kiba_dock_add_launcher (KibaDock *dock, KibaLauncher *launcher, int x, int y)
 {
-  Object *object;
+  AddSpacerClosure closure;
 
-  object = model_add_object (&dock->model, x, y, 12, NULL);
-  model_add_spring (&dock->model, dock->anchor->object, object, 0);
-  dock->object = object;
-  model_for_each_object (&dock->model, add_spacer, dock);
+  closure.dock = dock;
+  closure.object = model_add_object (&dock->model, x, y, 12, NULL);
+  model_add_spring (&dock->model, dock->anchor->object, closure.object, 0);
+  model_for_each_object (&dock->model, add_spacer, &closure);
   dock->launchers = g_list_prepend (dock->launchers, launcher);
   dock->num_launchers++;
 
-  launcher->object = object;
+  launcher->object = closure.object;
   launcher->dock = dock;
 
   if (GTK_WIDGET_REALIZED (GTK_WIDGET (dock)))