prevent potential gtk warnings (like in mcc)

3 files changed, 14 insertions, 4 deletions

diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock
index 4206a11be..d1dc4758f 100755
--- a/perl-install/standalone/drakclock
+++ b/perl-install/standalone/drakclock
@@ -266,7 +266,10 @@ sub update_time() {
 }
 
 sub cal_changed() {
-    !$its_reset and $timer and Glib::Source->remove($timer);
+    if (!$its_reset and $timer) {
+	Glib::Source->remove($timer);
+	undef $timer;
+    }
     $button_reset->set_sensitive(1);
 }
 
@@ -282,6 +285,7 @@ sub changed() {
 
 sub spinned() {
     Glib::Source->remove($timer);
+    undef $timer;
     $button_reset->set_sensitive(1);
     time_to_rad($adjs->get_value, $adjm->get_value, $adjh->get_value);
     Repaint($drawing_area);
@@ -293,6 +297,7 @@ sub motion_event {
     $pressed or return;
     if ($first) {
 	Glib::Source->remove($timer);
+	undef $timer;
 	$Radian = determine_radian($event->x, $event->y);
 	$button_reset->set_sensitive(1);
     }
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index a8e50d319..fe548940e 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -1154,7 +1154,10 @@ sub ask_browse_tree_info_given_widgets {
     $w->{tree}->get_selection->signal_connect(changed => sub {
 	my ($model, $iter) = $_[0]->get_selected;
 	$model && $iter or return;
-	Glib::Source->remove($idle) if $idle;
+	if ($idle) {
+	    Glib::Source->remove($idle);
+	    undef $idle;
+	}
 	
 	if (!$model->iter_has_child($iter)) {
 	    $curr = $model->get($iter, 0);
diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 518789b20..04c0fe493 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1249,8 +1249,10 @@ sub ask_browse_tree_info_given_widgets {
     $w->{tree}->get_selection->signal_connect(changed => sub {
 	my ($model, $iter) = $_[0]->get_selected;
 	$model && $iter or return;
-	Glib::Source->remove($idle) if $idle;
-	
+	if ($idle) {
+	    Glib::Source->remove($idle);
+	    undef $idle;
+	}
 	if (!$model->iter_has_child($iter)) {
 	    $curr = $model->get($iter, 0);
 	    $idle = Glib::Timeout->add(100, $common->{display_info});