[gnome-contacts/wip/sorted] Update test

[Alexander Larsson <alexl src gnome org>]

commit 5acaabc929db7beba86d844d54104d0f5d5a46d3
Author: Alexander Larsson <alexl redhat com>
Date:   Tue May 15 10:48:13 2012 +0200

    Update test

 src/test-sorted.vala |   54 ++++++++++++++++++++++---------------------------
 1 files changed, 24 insertions(+), 30 deletions(-)
---
diff --git a/src/test-sorted.vala b/src/test-sorted.vala
index 8a181ce..2af61d5 100644
--- a/src/test-sorted.vala
+++ b/src/test-sorted.vala
@@ -19,36 +19,31 @@
 using Gtk;
 using Contacts;
 
-public bool need_separator (Widget widget, Widget? before)
-{
-  if (before == null) {
-    return true;
-  }
-  if (!(widget is Label))
-    return false;
-  var text = (widget as Label).get_text ();
-  return strcmp (text, "blah3") == 0;
-}
-
 public void update_separator (ref Widget? separator,
-			      Widget child,
-			      Widget? before_widget)
+			      Widget widget,
+			      Widget? before)
 {
-  if (separator == null) {
-    var hbox = new Box(Orientation.HORIZONTAL, 0);
-    var l = new Label ("Separator");
-    hbox.add (l);
-    var b = new Button.with_label ("button");
-    hbox.add (b);
-    l.show ();
-    b.show ();
-    separator = hbox;
+  if (before == null ||
+      (widget is Label && (widget as Label).get_text () == "blah3")) {
+    if (separator == null) {
+      var hbox = new Box(Orientation.HORIZONTAL, 0);
+      var l = new Label ("Separator");
+      hbox.add (l);
+      var b = new Button.with_label ("button");
+      hbox.add (b);
+      l.show ();
+      b.show ();
+      separator = hbox;
+    }
+
+    var hbox = separator as Box;
+    var id = widget.get_data<int>("sort_id");
+    var l = hbox.get_children ().data as Label;
+    l.set_text ("Separator %d".printf (id));
+  } else {
+    separator = null;
   }
-
-  var id = child.get_data<int>("sort_id");
-  var hbox = separator as Box;
-  var l = hbox.get_children ().data as Label;
-  l.set_text ("Separator %d".printf (id));
+  print ("update separator => %p\n", separator);
 }
 
 public static int
@@ -176,14 +171,13 @@ main (string[] args) {
   b = new Button.with_label ("separate");
   vbox.add (b);
   b.clicked.connect ( () => {
-		  sorted.set_separator_funcs (need_separator,
-					      update_separator);
+		  sorted.set_separator_funcs (update_separator);
 	  });
 
   b = new Button.with_label ("unseparate");
   vbox.add (b);
   b.clicked.connect ( () => {
-		  sorted.set_separator_funcs (null, null);
+		  sorted.set_separator_funcs (null);
 	  });