From f38d797e29dff82f9c1a6d469b48b8440d3775a7 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Mon, 12 May 2008 11:52:21 +0000
Subject: use NET_APPLET_DBUS variable in /etc/sysconfig/drakx-net as D-Bus
 option

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

(limited to 'bin')

diff --git a/bin/net_applet b/bin/net_applet
index 5cb7882..4c91f32 100755
--- a/bin/net_applet
+++ b/bin/net_applet
@@ -23,7 +23,7 @@ use Gtk2::Notify -init, 'notify';
 use ugtk2 qw(:create :helpers :wrappers :dialogs);
 
 my $onstartupfile = "$ENV{HOME}/.net_applet";
-my $system_file = '/etc/sysconfig/net_applet';
+my $system_file = '/etc/sysconfig/drakx-net';
 shouldStart() or die "$onstartupfile should be set to TRUE or use net_applet --force\n";
 
 #- Allow multiple instances, but only one per user:
@@ -174,7 +174,7 @@ my %actions = (
 $icon = Gtk2::StatusIcon->new;
 
 my ($monitor);
-eval { $dbus = dbus_object::system_bus() } if !defined($global_settings{DBUS}) || text2bool($global_settings{DBUS});
+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 {
     require network::net_applet::ifw;
-- 
cgit v1.2.1