summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/drakconnect2
-rwxr-xr-xbin/draknetcenter2
-rwxr-xr-xbin/drakroam2
-rw-r--r--lib/network/connection_manager.pm6
-rwxr-xr-xlib/network/netcenter.pm4
5 files changed, 10 insertions, 6 deletions
diff --git a/bin/drakconnect b/bin/drakconnect
index 8318bcc..b1c7ff3 100755
--- a/bin/drakconnect
+++ b/bin/drakconnect
@@ -23,7 +23,7 @@
use strict;
-use lib qw(/usr/lib/libDrakX);
+use lib qw(lib /usr/lib/libDrakX);
# i18n: IMPORTANT: to get correct namespace (drakx-net instead of libDrakX)
BEGIN { unshift @::textdomains, 'drakx-net' }
diff --git a/bin/draknetcenter b/bin/draknetcenter
index b508da5..812d5d9 100755
--- a/bin/draknetcenter
+++ b/bin/draknetcenter
@@ -4,7 +4,7 @@
use strict;
-use lib qw(/usr/lib/libDrakX);
+use lib qw(lib /usr/lib/libDrakX);
# i18n: IMPORTANT: to get correct namespace (drakx-net instead of libDrakX)
BEGIN { unshift @::textdomains, 'drakx-net' }
diff --git a/bin/drakroam b/bin/drakroam
index 6f56c82..d8dadc0 100755
--- a/bin/drakroam
+++ b/bin/drakroam
@@ -6,7 +6,7 @@
# Licensed under the GPL
use strict;
-use lib qw(/usr/lib/libDrakX);
+use lib qw(lib /usr/lib/libDrakX);
# i18n: IMPORTANT: to get correct namespace (drakx-net instead of libDrakX)
BEGIN { unshift @::textdomains, 'drakx-net' }
diff --git a/lib/network/connection_manager.pm b/lib/network/connection_manager.pm
index 9f12b77..1e6e68c 100644
--- a/lib/network/connection_manager.pm
+++ b/lib/network/connection_manager.pm
@@ -277,6 +277,12 @@ sub update_on_status_change {
(!$cmanager->{connection}->can('get_networks') || $cmanager->{connection}{network});
$cmanager->{gui}{buttons}{configure}->set_sensitive($may_have_network)
if $cmanager->{gui}{buttons}{configure};
+
+ if ($cmanager->{gui}{status_image} && $cmanager->{connection}) {
+ my $icon = $cmanager->{connection}->get_status_icon;
+ ugtk2::_find_imgfile($icon) or $icon = $cmanager->{connection}->get_type_icon;
+ gtkset($cmanager->{gui}{status_image}, file => $icon);
+ }
}
1;
diff --git a/lib/network/netcenter.pm b/lib/network/netcenter.pm
index 880822c..a4ac43a 100755
--- a/lib/network/netcenter.pm
+++ b/lib/network/netcenter.pm
@@ -58,10 +58,8 @@ sub main {
child => gtknew('VBox', spacing => 5, children_tight => [
map_index {
my $cmanager = $cmanagers[$::i];
- my $icon = $_->get_status_icon;
- ugtk2::_find_imgfile($icon) or $icon = $_->get_type_icon;
my $head = gtknew('HBox', children => [
- 0, gtknew('Image', file => $icon),
+ 0, $cmanager->{gui}{status_image} = gtknew('Image'),
0, gtknew('Label', padding => [ 5, 0 ]),
1, gtknew('Label', ellipsize => 'end', alignment => [ 0, 0 ], text_markup => '<b>' . $_->get_description . '</b>'),
0, gtknew('Label', padding => [ 2, 0 ]),