From a63db013c53a49a6654a55a99f83a36d81b74d27 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Tue, 3 Mar 2009 18:17:12 +0000
Subject: fix crash in net_applet when mandi is started (happens if mandi was
 not available at net_applet start), this requires some API change to split
 init code, so that we do not add the dbus filters every time we try to
 reconnect the network::ifw object

---
 bin/net_applet | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'bin/net_applet')

diff --git a/bin/net_applet b/bin/net_applet
index 9fe641b..d62e302 100755
--- a/bin/net_applet
+++ b/bin/net_applet
@@ -193,11 +193,10 @@ $icon = Gtk2::StatusIcon->new;
 
 eval { $dbus = dbus_object::system_bus() } if !defined($global_settings{NET_APPLET_DBUS}) || text2bool($global_settings{NET_APPLET_DBUS});
 eval { $net->{monitor} = network::monitor->new($dbus) } if $dbus;
-eval {
+if ($dbus) {
     require network::net_applet::ifw;
-    network::net_applet::ifw::create();
-} if $dbus;
-
+    network::net_applet::ifw::init();
+}
 if ($dbus) {
     $dbus->{connection}->add_filter(sub {
         my ($_con, $msg) = @_;
-- 
cgit v1.2.1