From dba609e88f5377382d7f51b61a5c633019aa999a Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Thu, 9 Aug 2007 20:02:26 +0000
Subject: build a cmanager even if no network list is shown
---
lib/network/netcenter.pm | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
(limited to 'lib')
diff --git a/lib/network/netcenter.pm b/lib/network/netcenter.pm
index 454e574..e71be9b 100755
--- a/lib/network/netcenter.pm
+++ b/lib/network/netcenter.pm
@@ -20,16 +20,18 @@ sub filter_networks {
splice @networks, 0, 3;
}
-sub build_networks_list {
+sub build_cmanager {
my ($in, $net, $w, $pixbufs, $connection) = @_;
my $cmanager = network::connection_manager::create($in, $net, $w, $pixbufs);
- network::connection_manager::create_networks_list($cmanager);
$cmanager->{connection} = $connection;
- $cmanager->{filter_networks} = sub { filter_networks($connection) };
- network::connection_manager::update_networks($cmanager);
-
- $cmanager->{gui}{networks_list};
+ $cmanager->{gui}{show_networks} = $connection->can('get_networks') && !$connection->network_scan_is_slow;
+ if ($cmanager->{gui}{show_networks}) {
+ network::connection_manager::create_networks_list($cmanager);
+ $cmanager->{filter_networks} = sub { filter_networks($connection) };
+ network::connection_manager::update_networks($cmanager);
+ }
+ $cmanager;
}
sub gtkset_image {
@@ -62,6 +64,7 @@ sub main {
$::isEmbedded ? () : (0, Gtk2::Banner->new($icon, $title)),
1, gtknew('ScrolledWindow', width => 500, height => 300, child => gtknew('VBox', spacing => 20, children_tight => [
map {
+ my $cmanager = build_cmanager($in, $net, $w, $pixbufs, $_);
gtknew('HBox', children_tight => [
gtknew('Image', file => $_->get_type_icon),
gtknew('VBox', spacing => 10, children_tight => [
@@ -69,14 +72,14 @@ sub main {
gtknew('HBox', children_tight => [
gtknew('Label', padding => [ 5, 0 ]),
gtknew('VBox', children_tight => [
- ($_->can('get_networks') && !$_->network_scan_is_slow ? build_networks_list($in, $net, $w, $pixbufs, $_) : ()),
+ if_($cmanager->{gui}{show_networks}, $cmanager->{gui}{networks_list}),
gtknew('HBox', children_tight => [
gtknew('VBox', children_tight => [
gtknew('HButtonBox', children_tight => [
gtkset_image(gtknew('Button'), 'connected'),
gtkset_image(gtknew('Button'), 'monitor-24'),
gtkset_image(gtknew('Button'), 'configure-24'),
- ($_->can('get_networks') ? (0, gtkset_image(gtknew('Button'), 'refresh')) : ()),
+ ($cmanager->{gui}{show_networks} ? (0, gtkset_image(gtknew('Button'), 'refresh')) : ()),
]),
]),
]),
--
cgit v1.2.1