diff options
Diffstat (limited to 'perl-install/standalone')
| -rw-r--r-- | perl-install/standalone/drakids | 5 | ||||
| -rw-r--r-- | perl-install/standalone/net_applet | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/perl-install/standalone/drakids b/perl-install/standalone/drakids index fd1e3cefd..b00bd9ec4 100644 --- a/perl-install/standalone/drakids +++ b/perl-install/standalone/drakids @@ -8,6 +8,7 @@ use standalone; use Socket; use mygtk2 qw(gtknew); use POSIX qw(strftime); +use dbus_object; use network::activefw; use Gtk2::SimpleList; @@ -40,7 +41,7 @@ $whitelist->set_headers_clickable(1); $whitelist->get_column(0)->signal_connect('clicked', \&sort_by_column, $whitelist->get_model); $whitelist->get_column(0)->set_sort_column_id(0); -my $activefw = network::activefw->new(sub { +my $activefw = network::activefw->new(dbus_object::system_bus(), sub { my ($_con, $msg) = @_; my $member = $msg->get_member; if ($member eq 'Blacklist') { @@ -91,7 +92,7 @@ sub sort_by_column { } sub handle_init() { - $activefw->attach_daemon; + $activefw->attach_object; init_lists(); } diff --git a/perl-install/standalone/net_applet b/perl-install/standalone/net_applet index 37300d5a5..14ba43e6f 100644 --- a/perl-install/standalone/net_applet +++ b/perl-install/standalone/net_applet @@ -30,6 +30,8 @@ my $current_md5 = md5file($prog_name); my $net = {}; my $watched_interface; +my $dbus = dbus_object::system_bus(); + $SIG{HUP} = sub { print "received SIGHUP, reloading network configuration\n"; checkNetworkForce(); @@ -110,7 +112,7 @@ my $interactive_cb; my @attacks_queue; if ($enable_activefw) { - $activefw = network::activefw->new(sub { + $activefw = network::activefw->new($dbus, sub { my ($_con, $msg) = @_; handle_attack($msg->get_args_list) if $msg->get_member eq "Attack"; }); |