diff -u mouse.pm mouse.pm
--- mouse.pm	8 Jul 2003 17:27:05 -0000
+++ mouse.pm	8 Jul 2003 17:47:19 -0000
@@ -501,7 +501,7 @@
 		$draw_pixbuf->($xpms{ad}, 102, 131, 6, 8);
 	    }
 	    $draw_pixbuf->($xpms{middle}, 98, 67, 13, 62);
-	    $timeout and Glib::Timeout->remove($timeout);
+	    $timeout and Glib::Source->remove($timeout);
 	    $timeout = Glib::Timeout->add(100, sub { $drawarea->(); $timeout = 0; 0 });
 	}
     };
diff -u ugtk2.pm ugtk2.pm
--- ugtk2.pm	8 Jul 2003 17:27:06 -0000
+++ ugtk2.pm	8 Jul 2003 17:47:20 -0000
@@ -1302,6 +1302,7 @@
 }
 
 # misc helpers:
+
 package Gtk2::TreeStore;
 sub append_set {
     my ($model, $parent, @values) = @_;
@@ -1312,6 +1313,16 @@
     return $iter;
 }
 
+package Gtk2::ListStore;
+# Append a new row, set the values, return the TreeIter
+sub append_set {
+    my ($model, @values) = @_;
+    # compatibility:
+    @values = @{$values[0]} if $#values == 0 && ref($values[0]) eq 'ARRAY';
+    my $iter = $model->append();
+    $model->set($iter, @values);
+    return $iter;
+}
 
 package Gtk2::TreeModel;
 # gets the string representation of a TreeIter
diff -u interactive/gtk.pm interactive/gtk.pm
--- interactive/gtk.pm	8 Jul 2003 17:27:06 -0000
+++ interactive/gtk.pm	8 Jul 2003 17:47:20 -0000
@@ -85,7 +85,7 @@
         my ($_w, $event) = @_;
 	my $c = chr($event->keyval & 0xff);
 
-	Glib::Timeout->remove($timeout) if $timeout; $timeout = '';
+	Glib::Source->remove($timeout) if $timeout; $timeout = '';
 	
 	if ($event->keyval >= 0x100) {
 	    &$may_go_to_next if member($event->keyval, (Gtk2::Gdk::Event::Key->Sym_Return, Gtk2::Gdk::Event::Key->Sym_KP_Enter));
@@ -239,7 +239,7 @@
 	$selected_via_click = 0;
 	my $c = chr($event->keyval & 0xff);
 	$curr or return;
-	Glib::Timeout->remove($timeout) if $timeout; $timeout = '';
+	Glib::Source->remove($timeout) if $timeout; $timeout = '';
 
 	if ($event->keyval >= 0x100) {
 	    &$toggle if member($event->keyval, (Gtk2::Gdk::Event::Key->Sym_Return, Gtk2::Gdk::Event::Key->Sym_KP_Enter));
@@ -601,7 +601,7 @@
 			    sub { 
 				my ($w) = @_;
 				$set_advanced->(!$advanced);
-				$w->child->set($advanced ? $common->{advanced_label_close} : $common->{advanced_label});
+				$w->child->set_label($advanced ? $common->{advanced_label_close} : $common->{advanced_label});
 			    } ];
 
     my $create_widgets = sub {
diff -u standalone/harddrake2 standalone/harddrake2
--- standalone/harddrake2	8 Jul 2003 17:27:08 -0000
+++ standalone/harddrake2	8 Jul 2003 17:47:21 -0000
@@ -147,7 +147,6 @@
     ($menubar, $factory) = create_factory_menu($w->{rwindow}, @menu_items);
     $w->{window}->set_size_request(805, 550);
 }
-print "menubar is $menubar\n";
 
 my $tree_model = Gtk2::TreeStore->new("Gtk2::Gdk::Pixbuf", "Glib::String", "Glib::Int");
 my ($statusbar, $sig_id);
@@ -317,7 +316,6 @@
     my $title = strip_first_underscore(@{$menu_options{$_}});
     $options{$_} = 0 unless defined($options{$_}); # force detection by default
     $check_boxes{$_} = $factory->get_widget("<main>" . $title);
-    print "widget is $check_boxes{$_}\n";
     $check_boxes{$_}->set_active($options{$_});    # restore saved values
 }