aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/Hal/Cdroms.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/Hal/Cdroms.pm b/lib/Hal/Cdroms.pm
index c0086b1..53bcba4 100644
--- a/lib/Hal/Cdroms.pm
+++ b/lib/Hal/Cdroms.pm
@@ -59,9 +59,9 @@ sub new {
require Net::DBus;
require Net::DBus::Reactor; # must be done before line below:
my $dbus = Net::DBus->system;
- my $hal = $dbus->get_service($hal_dn);
+ my $service = $dbus->get_service($hal_dn);
- bless { dbus => $dbus, hal => $hal }, $class;
+ bless { dbus => $dbus, service => $service }, $class;
}
=head2 $hal_cdroms->list
@@ -73,7 +73,7 @@ Returns the list of C<hal_path> of the cdroms (mounted or not).
sub list {
my ($o) = @_;
- my $manager = $o->{hal}->get_object("/org/freedesktop/UDisks",
+ my $manager = $o->{service}->get_object("/org/freedesktop/UDisks",
$hal_dn);
@@ -88,17 +88,17 @@ Return the mount point associated to the C<hal_path>, or undef it is not mounted
sub _get_udisks_device {
my ($o, $hal_path) = @_;
- $o->{hal}->get_object($hal_path, "$hal_dn.Device");
+ $o->{service}->get_object($hal_path, "$hal_dn.Device");
}
sub _get_device {
my ($o, $hal_path) = @_;
- $o->{hal}->get_object($hal_path, 'org.freedesktop.DBus.Properties');
+ $o->{service}->get_object($hal_path, 'org.freedesktop.DBus.Properties');
}
sub _get_volume {
my ($o, $hal_path) = @_;
- $o->{hal}->get_object($hal_path, "$hal_dn.Device.Volume");
+ $o->{service}->get_object($hal_path, "$hal_dn.Device.Volume");
}
sub _GetProperty {