[gnome-contacts/wip/sorted] update test for separator func changes



commit b7106199d499013698677a831a36cb4b20193d78
Author: Alexander Larsson <alexl redhat com>
Date:   Mon May 14 17:06:17 2012 +0200

    update test for separator func changes

 src/test-sorted.vala |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)
---
diff --git a/src/test-sorted.vala b/src/test-sorted.vala
index fe2592c..8a181ce 100644
--- a/src/test-sorted.vala
+++ b/src/test-sorted.vala
@@ -30,22 +30,21 @@ public bool need_separator (Widget widget, Widget? before)
   return strcmp (text, "blah3") == 0;
 }
 
-public Widget create_separator ()
-{
-  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 ();
-  return hbox;
-}
-
-public void update_separator (Widget separator,
+public void update_separator (ref Widget? separator,
 			      Widget child,
 			      Widget? before_widget)
 {
+  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 id = child.get_data<int>("sort_id");
   var hbox = separator as Box;
   var l = hbox.get_children ().data as Label;
@@ -178,14 +177,13 @@ main (string[] args) {
   vbox.add (b);
   b.clicked.connect ( () => {
 		  sorted.set_separator_funcs (need_separator,
-									  create_separator,
-									  update_separator);
+					      update_separator);
 	  });
 
   b = new Button.with_label ("unseparate");
   vbox.add (b);
   b.clicked.connect ( () => {
-		  sorted.set_separator_funcs (null, null, null);
+		  sorted.set_separator_funcs (null, null);
 	  });
 
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]