diff options
Diffstat (limited to 'perl-install/dbus_object.pm')
| -rw-r--r-- | perl-install/dbus_object.pm | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/perl-install/dbus_object.pm b/perl-install/dbus_object.pm index 1b4a4264e..5c59de7e0 100644 --- a/perl-install/dbus_object.pm +++ b/perl-install/dbus_object.pm @@ -1,8 +1,10 @@ package dbus_object; -sub system_bus() { +sub system_bus { + my %params = @_; + #- use nomainloop => 1 to disable Net::DBus::Reactor main loop require Net::DBus; - Net::DBus->system; + Net::DBus->system(%params); } sub new { @@ -42,20 +44,20 @@ sub safe_call_method { @ret; } -sub set_gtk2_watch { +sub set_gtk3_watch { my ($o) = @_; - set_gtk2_watch_helper($o->{bus}); + set_gtk3_watch_helper($o->{bus}); } -sub set_gtk2_watch_helper { +sub set_gtk3_watch_helper { my ($bus) = @_; $bus->{connection}->set_watch_callbacks(sub { my ($con, $watch) = @_; my $flags = $watch->get_flags; require Net::DBus::Binding::Watch; - require Gtk2::Helper; + require Gtk3::Helper; if ($flags & &Net::DBus::Binding::Watch::READABLE) { - Gtk2::Helper->add_watch($watch->get_fileno, 'in', sub { + Gtk3::Helper->add_watch($watch->get_fileno, 'in', sub { $watch->handle(&Net::DBus::Binding::Watch::READABLE); $con->dispatch; 1; |
