[libnet-dbus-perl] 65/335: Updated to reflect API changes

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to branch experimental
in repository libnet-dbus-perl.

commit 4fc678e76de315de2e3653369031afb4c567fd8f
Author: Daniel P. Berrange <dan at berrange.com>
Date:   Sun Aug 14 18:06:14 2005 +0000

    Updated to reflect API changes
---
 examples/example-client.pl          |  3 +--
 examples/example-service.pl         | 14 +++++---------
 examples/example-signal-emitter.pl  | 27 +++++++++++++--------------
 examples/example-signal-receiver.pl | 13 +++++--------
 examples/list-services.pl           | 12 +++++-------
 5 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/examples/example-client.pl b/examples/example-client.pl
index 9568f79..c24c963 100644
--- a/examples/example-client.pl
+++ b/examples/example-client.pl
@@ -8,8 +8,7 @@ use Carp qw(cluck carp);
 my $bus = Net::DBus->find();
 
 my $service = $bus->get_service("org.designfu.SampleService");
-my $object = $service->get_object("/SomeObject",
-				  "org.designfu.SampleInterface");
+my $object = $service->get_object("/SomeObject");
 
 my $list = $object->HelloWorld("Hello from example-client.pl!");
 
diff --git a/examples/example-service.pl b/examples/example-service.pl
index 7291c5b..cd391d2 100644
--- a/examples/example-service.pl
+++ b/examples/example-service.pl
@@ -4,10 +4,6 @@ use Carp qw(confess cluck);
 use Net::DBus;
 use Net::DBus::Service;
 use Net::DBus::Reactor;
-use Net::DBus::Exporter foo => "bar";
-my $bus = Net::DBus->find();
-my $service = Net::DBus::Service->new("org.designfu.SampleService", 
-				      $bus);
 
 #...  continued at botom
 
@@ -15,12 +11,12 @@ my $service = Net::DBus::Service->new("org.designfu.SampleService",
 package SomeObject;
 
 use base qw(Net::DBus::Object);
-use Net::DBus::Exporter qw(SomeObject);
+use Net::DBus::Exporter qw(org.designfu.SampleInterface);
 
 sub new {
     my $class = shift;
     my $service = shift;
-    my $self = $class->SUPER::new("/SomeObject", $service);
+    my $self = $class->SUPER::new($service, "/SomeObject");
     bless $self, $class;
     
     return $self;
@@ -51,8 +47,8 @@ sub GetTuple {
 
 package main;
 
+my $bus = Net::DBus->find();
+my $service = $bus->export_service("org.designfu.SampleService");
 my $object = SomeObject->new($service);
 
-my $reactor = Net::DBus::Reactor->new();
-$reactor->manage($bus->{connection});
-$reactor->run();
+Net::DBus::Reactor->main->run();
diff --git a/examples/example-signal-emitter.pl b/examples/example-signal-emitter.pl
index 02af77f..2dde6b0 100644
--- a/examples/example-signal-emitter.pl
+++ b/examples/example-signal-emitter.pl
@@ -7,12 +7,9 @@ use Net::DBus::Object;
 
 use Carp qw(confess cluck);
 
-$SIG{__WARN__} = sub { cluck $_[0] };
-$SIG{__DIE__} = sub { confess $_[0] };
+#$SIG{__WARN__} = sub { cluck $_[0] };
+#$SIG{__DIE__} = sub { confess $_[0] };
 
-my $bus = Net::DBus->session();
-my $service = Net::DBus::Service->new("org.designfu.TestService", 
-				      $bus);
 package TestObject;
 
 use base qw(Net::DBus::Object);
@@ -21,29 +18,31 @@ use Net::DBus::Exporter qw(org.designfu.TestService);
 sub new {
     my $class = shift;
     my $service = shift;
-    my $self = $class->SUPER::new("/org/designfu/TestService/object",
-				  $service);
+    my $self = $class->SUPER::new($service, "/org/designfu/TestService/object");
+				  
     
     bless $self, $class;
     
     return $self;
 }
 
-dbus_signal("hello", []);
-dbus_method("emitHelloSignal", [], []);
+dbus_signal("hello", ["string"]);
+dbus_method("emitHelloSignal", ["string"]);
 sub emitHelloSignal {
     my $self = shift;
-    return $self->emit_signal("org.designfu.TestService", 
-			      "hello");
+    my $name = shift;
+    print "Got request to send hello signal\n";
+    return $self->emit_signal("hello", "Hello " . $name);
 }
 
 
 package main;
 
+
+my $bus = Net::DBus->find();
+my $service = $bus->export_service("org.designfu.TestService");
 my $object = TestObject->new($service);
 
-my $reactor = Net::DBus::Reactor->new();
-$reactor->manage($bus->{connection});
-$reactor->run();
+Net::DBus::Reactor->main->run();
 
 
diff --git a/examples/example-signal-receiver.pl b/examples/example-signal-receiver.pl
index b13da64..4e2a5a1 100644
--- a/examples/example-signal-receiver.pl
+++ b/examples/example-signal-receiver.pl
@@ -11,23 +11,20 @@ use Carp qw(confess cluck);
 my $bus = Net::DBus->session();
 
 my $service = $bus->get_service("org.designfu.TestService");
-my $object  = $service->get_object("/org/designfu/TestService/object", 
-				   "org.designfu.TestService");
+my $object  = $service->get_object("/org/designfu/TestService/object");
 
 sub hello_signal_handler {
-    my ($interface, $signal_name, $service_name, $path, $message) = @_;
-    printf "Received signal '%s.%s' from object '%s%s'\n", 
-      $interface, $signal_name, $service_name, $path;
+    my $greeting = shift;
+    print "Received hello signal with greeting '$greeting'\n";
 }
 
 $object->connect_to_signal("hello", \&hello_signal_handler);
 
-my $reactor = Net::DBus::Reactor->new();
-$reactor->manage($bus->{connection});
+my $reactor = Net::DBus::Reactor->main();
 
 my $ticks = 0;
 $reactor->add_timeout(1000, Net::DBus::Callback->new(method => sub {
-    $object->emitHelloSignal();
+    $object->emitHelloSignal("John Doe");
     if ($ticks++ == 10) {
       $reactor->shutdown();
     }
diff --git a/examples/list-services.pl b/examples/list-services.pl
index 2acc2d7..92341d5 100644
--- a/examples/list-services.pl
+++ b/examples/list-services.pl
@@ -2,8 +2,7 @@
 
 use Net::DBus;
 
-# Connect to the system bus
-my $bus = Net::DBus->new($Net::DBus::TYPE_SESSION);
+my $bus = Net::DBus->find;
 
 # Get the service provided by the dbus-daemon named org.freedesktop.DBus
 my $service = $bus->get_service("org.freedesktop.DBus");
@@ -13,13 +12,12 @@ my $service = $bus->get_service("org.freedesktop.DBus");
 # implements the 'org.freedesktop.DBus' interface
 my $object = $service->get_object('/org/freedesktop/DBus',
 				  'org.freedesktop.DBus');
-            
 # One of the member functions in the org.freedesktop.DBus interface
 # is ListServices(), which provides a list of all the other services
 # registered on this bus. Call it, and print the list.
-print "Before\n";
-my @service_list = $object->ListServices();
-print "After\n";
-print "Got ", join("\n", map { "'" . $_ . "'" } @service_list), "\n";
+
+my $service_list = $object->ListNames();
+
+print "Services on the bus: \n", join("\n", map { "  '" . $_ . "'" } sort { $a cmp $b } @{$service_list}), "\n";
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libnet-dbus-perl.git