show the GUI earlier to fix window icon, it gets destroyed after

initial wait message is destroyed (backport from trunk)

2 files changed, 4 insertions, 1 deletions

diff --git a/lib/network/drakroam.pm b/lib/network/drakroam.pm
index 0ad7a55..7bf8033 100755
--- a/lib/network/drakroam.pm
+++ b/lib/network/drakroam.pm
@@ -133,6 +133,8 @@ sub main {
     network::connection_manager::create_networks_list($droam);
     create_drakroam_gui($droam, $dbus, $title, $icon);
 
+    $droam->{gui}{w}->show;
+
     my @connection_types = qw(network::connection::wireless network::connection::cellular_card);
     @{$droam->{all_connections}} = map { $_->get_connections(automatic_only => 1) } @connection_types;
     $droam->{connection} = $o_interface && find { $_->get_interface eq $o_interface } @{$droam->{all_connections}};
@@ -142,7 +144,6 @@ sub main {
 
     if ($o_ap && $droam->{connection}) {
         $droam->{connection}{network} = $o_ap;
-        $droam->{gui}{w}->show;
         network::connection_manager::start_connection($droam);
     }
 
diff --git a/lib/network/netcenter.pm b/lib/network/netcenter.pm
index 3e533f4..66641d7 100755
--- a/lib/network/netcenter.pm
+++ b/lib/network/netcenter.pm
@@ -36,6 +36,8 @@ sub main {
     my $w = ugtk2->new($title);
     #- so that transient_for is defined, for wait messages and popups to be centered
     $::main_window = $w->{real_window};
+
+    $w->show;
     my $wait = $in->wait_message(N("Please wait"), N("Please wait"));
 
     my @connections = map { $_->get_connections(automatic_only => 1, fast_only => 1) } network::connection::get_types;