From 3723e9f74b377fb861443d7fb47add8091744afe Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Thu, 2 Oct 2008 18:30:05 +0000
Subject: correctly initialize monitor object in
 draknetcenter/drakroam/net_applet so that it can be reused later

---
 bin/net_applet | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'bin/net_applet')

diff --git a/bin/net_applet b/bin/net_applet
index 4c91f32..d20f5ed 100755
--- a/bin/net_applet
+++ b/bin/net_applet
@@ -173,9 +173,8 @@ my %actions = (
 
 $icon = Gtk2::StatusIcon->new;
 
-my ($monitor);
 eval { $dbus = dbus_object::system_bus() } if !defined($global_settings{NET_APPLET_DBUS}) || text2bool($global_settings{NET_APPLET_DBUS});
-eval { $monitor = network::monitor->new($dbus) } if $dbus;
+eval { $net->{monitor} = network::monitor->new($dbus) } if $dbus;
 eval {
     require network::net_applet::ifw;
     network::net_applet::ifw::create();
@@ -256,8 +255,8 @@ sub generate_wireless_menuitem {
                                             0, $menuitem->{security} = Gtk2::Image->new,
                                 ));
     $menuitem->{activate} = $menuitem->{widget}->signal_connect('activate' => sub {
-        if ($monitor && exists $wnet->{id}) {
-            eval { $monitor->select_network($wnet->{id}) };
+        if ($net->{monitor} && exists $wnet->{id}) {
+            eval { $net->{monitor}->select_network($wnet->{id}) };
             $@ and err_dialog(N("Interactive Firewall"), N("Unable to contact daemon"));
         } else {
             run_drakroam($wnet->{ap});
@@ -280,7 +279,7 @@ sub update_wireless_item {
 }
 sub checkWireless() {
     $wireless_device or return;
-    my ($networks) =  network::monitor::list_wireless($monitor);
+    my ($networks) =  network::monitor::list_wireless($net->{monitor});
     my $force_applet_update;
     foreach (keys %$networks) {
         exists $wireless_networks{$_} or $force_applet_update = 1;
-- 
cgit v1.2.1