do not "restore" mouse cursor on the root window, we haven't set it to

'wait' since 2005 and this causes a crash if we don't own it (mga#15729)

4 files changed, 3 insertions, 7 deletions

diff --git a/perl-install/NEWS b/perl-install/NEWS
index e9259f2e2..e5e616741 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,9 @@
     where Windows will have most space left after resizing.
   o suggest up to 20GB/20% of the windows partition (whichever is larger),
     previously 6GB/10% (mga#15589)
+- ugtk2, ugtk3, harddrake2:
+  o do not "restore" mouse cursor on the root window, we haven't set it to
+    'wait' since 2005 and this causes a crash if we don't own it (mga#15729).
 
 Version 16.85 - 15 April 2015
 
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index b40663209..95353fd03 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -249,7 +249,6 @@ $w->{window}->add(gtkpack_(0, Gtk3::VBox->new(0, 0),
                                                                                                       local $SIG{CHLD} = undef;
                                                                                                       require modules::interactive;
                                                                                                       modules::interactive::config_window($in, $current_device);
-                                                                                                      gtkset_mousecursor_normal();
                                                                                                   }),
                                                      0, my $config_button = gtksignal_connect(Gtk3::Button->new(N("Run config tool")),
                                                                                               # we've a configurator, let's add a button for it and show it
@@ -499,7 +498,6 @@ $tree->signal_connect(realize => sub { $tree->get_selection->select_path(Gtk3::T
         my @packages2install = uniq($in->do_pkgs->are_available(@packages));
 
         undef $wait;
-        gtkset_mousecursor_normal();
         
         if (@packages2install && $in->ask_yesorno(N("Warning"), N("The following packages need to be installed:\n") . join(', ', @packages2install))) {
             $in->do_pkgs->install(@packages2install);
@@ -508,7 +506,6 @@ $tree->signal_connect(realize => sub { $tree->get_selection->select_path(Gtk3::T
 }
 $SIG{CHLD} = \&reap_children;
 undef $wait;
-gtkset_mousecursor_normal();
 
 # fill in default right text since no device is selected on startup:
 fill_default_text($text);
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index fe548940e..09f877c9f 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -760,7 +760,6 @@ sub new {
 
 sub main {
     my ($o, $o_completed, $o_canceled) = @_;
-    gtkset_mousecursor_normal();
 
     $o->show;
     mygtk2::main($o->{rwindow},
@@ -788,7 +787,6 @@ sub shrink_topwindow {
     $o->{real_window}->signal_emit('size_allocate', Gtk2::Gdk::Rectangle->new(-1, -1, -1, -1));
 }
 sub exit {
-    gtkset_mousecursor_normal(); #- for restoring a normal in any case
     flush();
     if ($::isStandalone) {
         require standalone;
diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 04c0fe493..b65041e2c 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -853,7 +853,6 @@ sub new {
 
 sub main {
     my ($o, $o_completed, $o_canceled) = @_;
-    gtkset_mousecursor_normal();
 
     $o->show;
     mygtk3::main($o->{rwindow},
@@ -881,7 +880,6 @@ sub shrink_topwindow {
     $o->{real_window}->resize(1, 1);
 }
 sub exit {
-    gtkset_mousecursor_normal(); #- for restoring a normal in any case
     flush();
     if ($::isStandalone) {
         require standalone;