simpler proxy object

turns out you can get the name of the sender by using `caller` as a
parameter type (it's documented in Net::DBus::Exporter, section "magic
types")

1 files changed, 5 insertions, 11 deletions

diff --git a/lib/App/XScreenSaver/DBus/Saver.pm b/lib/App/XScreenSaver/DBus/Saver.pm
index 6eae4ed..1f48a7f 100644
--- a/lib/App/XScreenSaver/DBus/Saver.pm
+++ b/lib/App/XScreenSaver/DBus/Saver.pm
@@ -95,7 +95,7 @@ a logger
 
 has log => ( is => 'lazy', builder => sub { Log::Any->get_logger } );
 
-has _impls => ( is => 'rw' );
+has _proxies => ( is => 'rw' );
 has _prod_id => ( is => 'rw' );
 has _inhibits => ( is => 'rw', default => sub { +{} } );
 
@@ -111,16 +111,12 @@ to be notified when that happens, and release that inhibition.
 =cut
 
 sub start($self) {
-    my $inhibit_cb = $self->curry::weak::_inhibit;
-    my $uninhibit_cb = $self->curry::weak::_uninhibit;
-
     # export to dbus
-    $self->_impls([ map {
+    $self->_proxies([ map {
         App::XScreenSaver::DBus::SaverProxy->new(
             $self->service,
             $_,
-            $inhibit_cb,
-            $uninhibit_cb,
+            $self,
         )
     } $self->paths->@* ]);
 
@@ -142,13 +138,12 @@ sub start($self) {
     return;
 }
 
-sub _inhibit($self,$name,$reason,$message) {
+sub Inhibit($self,$name,$reason,$sender) {
     my $cookie;
     do {
         $cookie = int(rand(2**31))
     } until !exists $self->_inhibits->{$cookie};
 
-    my $sender = $message->get_sender;
     $self->_inhibits->{$cookie} = [ $name, $reason, $sender ];
 
     $self->log->debugf(
@@ -162,11 +157,10 @@ sub _inhibit($self,$name,$reason,$message) {
     return $cookie;
 }
 
-sub _uninhibit($self,$cookie,$message) {
+sub Uninhibit($self,$cookie,$this_sender) {
     my $inhibit = delete $self->_inhibits->{$cookie}
         or return;
     my ($name, $reason, $sender) = @$inhibit;
-    my $this_sender = $message->get_sender;
 
     $self->log->debugf(
         '<%s> (was %s, is %s) resumed screensaver for <%s> (cookie %d) - %d left',