Mailinglist Archive: opensuse-commit (1083 mails)

< Previous Next >
commit hal
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 10 Sep 2007 12:33:34 +0200
  • Message-id: <20070910103334.6250667817A@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package hal
checked in at Mon Sep 10 12:33:34 CEST 2007.

--------
--- hal/hal.changes     2007-08-31 19:17:05.000000000 +0200
+++ /mounts/work_src_done/STABLE/hal/hal.changes        2007-09-07 15:03:59.000000000 +0200
@@ -1,0 +2,15 @@
+Mon Sep  3 12:59:06 CEST 2007 - dkukawka@xxxxxxx
+
+- backported from git HEAD:
+  - split LUKS policies into own for removable/fixed media
+    (to fix b.n.c #306694)
+  - revert commit #7b159b55: return INT32 from addons and scripts
+    to fit the SPEC (need also fixes in KPowersave and powersaved)
+- added new patches:
+  - hal-fix-storage-policy-extra-options.diff: add needed policies 
+    for uid= mount option back to HAL (b.n.c #305978)
+  - hal-fix-prevent_eject_method_for_dm-devices.diff: don't add
+    eject method for dm-mapper devices, call eject on them is
+    not possible (part of #306641)
+
+-------------------------------------------------------------------
hal-doc.changes: same change

New:
----
  hal-backport-split-luks-policy.diff
  hal-fix-prevent_eject_method_for_dm-devices.diff
  hal-fix-storage-policy-extra-options.diff
  hal-revert-returnvalues_from_int_to_uint.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ hal-doc.spec ++++++
--- /var/tmp/diff_new_pack.vR5541/_old  2007-09-10 12:33:15.000000000 +0200
+++ /var/tmp/diff_new_pack.vR5541/_new  2007-09-10 12:33:15.000000000 +0200
@@ -23,7 +23,7 @@
 License:        Other uncritical OpenSource License, HAL is licensed to you under your choice of the Academic Free
 Group:          System/Daemons
 Version:        0.5.9_git20070831
-Release:        1
+Release:        5
 Autoreqprov:    on
 Requires:       pm-utils
 BuildRequires:  ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb libusb-devel libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
@@ -72,10 +72,13 @@
 # submitted (or planed to do in next time) upstream patches
 Patch100:       hal-fix-util_compute_time_remaining_warning_highTime.diff
 Patch101:       hal-fix-acpi_on_battery_discharging.diff
+Patch102:       hal-fix-prevent_eject_method_for_dm-devices.diff
 # backports from git HEAD:
-#Patch200:       hal-fix-.diff
+Patch200:       hal-backport-split-luks-policy.diff
 # revert from HEAD:
 Patch250:       hal-revertHEAD-update-to-work-with-PolicyKit-HEAD.diff
+Patch251:       hal-revert-returnvalues_from_int_to_uint.diff
+Patch252:       hal-fix-storage-policy-extra-options.diff 
 # hal-info related patches:
 #Patch300:       hal-info-.diff
 # currently unused patches:
@@ -149,6 +152,7 @@
 chmod 644 tools/hal-functions
 # patch hal package if needed
 %patch250 -p1 -R
+%patch251 -p1 
 %patch0   -p1
 %patch1   -p0
 %patch2   -p1
@@ -156,6 +160,9 @@
 %patch10  -p0
 %patch100 -p1
 %patch101 -p1
+%patch200 -p1
+%patch102 -p1
+%patch252 -p1
 #%patch1000 -p1
 # patch hal-info package if needed
 pushd hal-info-%{hal_info_version}
@@ -316,6 +323,18 @@
 %endif
 
 %changelog
+* Mon Sep 03 2007 - dkukawka@xxxxxxx
+- backported from git HEAD:
+  - split LUKS policies into own for removable/fixed media
+  (to fix b.n.c #306694)
+  - revert commit #7b159b55: return INT32 from addons and scripts
+  to fit the SPEC (need also fixes in KPowersave and powersaved)
+- added new patches:
+  - hal-fix-storage-policy-extra-options.diff: add needed policies
+  for uid= mount option back to HAL (b.n.c #305978)
+  - hal-fix-prevent_eject_method_for_dm-devices.diff: don't add
+  eject method for dm-mapper devices, call eject on them is
+  not possible (part of #306641)
 * Fri Aug 31 2007 - dkukawka@xxxxxxx
 - updated hal/hal-info to current git (20070831):
   - include patch for b.n.c #303861 (handle device mapper volumes

++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.vR5541/_old  2007-09-10 12:33:15.000000000 +0200
+++ /var/tmp/diff_new_pack.vR5541/_new  2007-09-10 12:33:15.000000000 +0200
@@ -23,7 +23,7 @@
 License:        HAL is licensed to you under your choice of the Academic Free
 Group:          System/Daemons
 Version:        0.5.9_git20070831
-Release:        1
+Release:        5
 Autoreqprov:    on
 Requires:       pm-utils
 BuildRequires:  ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb libusb-devel libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
@@ -72,10 +72,13 @@
 # submitted (or planed to do in next time) upstream patches
 Patch100:       hal-fix-util_compute_time_remaining_warning_highTime.diff
 Patch101:       hal-fix-acpi_on_battery_discharging.diff
+Patch102:       hal-fix-prevent_eject_method_for_dm-devices.diff
 # backports from git HEAD:
-#Patch200:       hal-fix-.diff
+Patch200:       hal-backport-split-luks-policy.diff
 # revert from HEAD:
 Patch250:       hal-revertHEAD-update-to-work-with-PolicyKit-HEAD.diff
+Patch251:       hal-revert-returnvalues_from_int_to_uint.diff
+Patch252:       hal-fix-storage-policy-extra-options.diff 
 # hal-info related patches:
 #Patch300:       hal-info-.diff
 # currently unused patches:
@@ -149,6 +152,7 @@
 chmod 644 tools/hal-functions
 # patch hal package if needed
 %patch250 -p1 -R
+%patch251 -p1 
 %patch0   -p1
 %patch1   -p0
 %patch2   -p1
@@ -156,6 +160,9 @@
 %patch10  -p0
 %patch100 -p1
 %patch101 -p1
+%patch200 -p1
+%patch102 -p1
+%patch252 -p1
 #%patch1000 -p1
 # patch hal-info package if needed
 pushd hal-info-%{hal_info_version}
@@ -316,6 +323,18 @@
 %endif
 
 %changelog
+* Mon Sep 03 2007 - dkukawka@xxxxxxx
+- backported from git HEAD:
+  - split LUKS policies into own for removable/fixed media
+  (to fix b.n.c #306694)
+  - revert commit #7b159b55: return INT32 from addons and scripts
+  to fit the SPEC (need also fixes in KPowersave and powersaved)
+- added new patches:
+  - hal-fix-storage-policy-extra-options.diff: add needed policies
+  for uid= mount option back to HAL (b.n.c #305978)
+  - hal-fix-prevent_eject_method_for_dm-devices.diff: don't add
+  eject method for dm-mapper devices, call eject on them is
+  not possible (part of #306641)
 * Fri Aug 31 2007 - dkukawka@xxxxxxx
 - updated hal/hal-info to current git (20070831):
   - include patch for b.n.c #303861 (handle device mapper volumes


++++++ hal-backport-split-luks-policy.diff ++++++
--- a/policy/hal-storage.policy 2007-09-03 11:50:56.000000000 +0200
+++ b/policy/hal-storage.policy 2007-09-03 11:53:33.000000000 +0200
@@ -57,9 +57,18 @@
       </defaults>
     </policy>
 
-    <policy id="hal-storage-crypto-setup">
+    <policy id="hal-storage-crypto-setup-fixed">
       <description>Set up decryption for encrypted storage devices.</description>
-      <message>System policy prevents accessing encrypted storage devices</message>
+      <message>System policy prevents accessing encrypted fixed media</message>
+      <defaults>
+        <allow_inactive>no</allow_inactive>
+        <allow_active>auth_admin_keep_always</allow_active>
+      </defaults>
+    </policy>
+
+    <policy id="hal-storage-crypto-setup-removable">
+      <description>Set up decryption for encrypted storage devices.</description>
+      <message>System policy prevents accessing encrypted removable media</message>
       <defaults>
         <allow_inactive>no</allow_inactive>
         <allow_active>yes</allow_active>
--- a/tools/hal-luks-setup      2007-09-03 11:50:22.000000000 +0200
+++ b/tools/hal-luks-setup      2007-09-03 12:08:15.000000000 +0200
@@ -14,11 +14,15 @@
        exit 1
 }
 
-if [ -z "$HAL_PROP_BLOCK_DEVICE" ] || [ -z "$HAL_PROP_INFO_UDI" ] || [ -z "$HAL_PROP_VOLUME_UUID" ] ; then
+unknown_error() {
         echo "org.freedesktop.Hal.Device.UnknownError" >&2
         echo "Missing or empty environment variable(s)." >&2
         echo "This script should be started by hald." >&2
         exit 1
+}
+
+if [ -z "$HAL_PROP_BLOCK_DEVICE" ] || [ -z "$HAL_PROP_INFO_UDI" ] || [ -z "$HAL_PROP_VOLUME_UUID" ] ; then
+       unknown_error
 fi
 
 # Respect the same locks as Mount()/Unmount() etc.
@@ -39,6 +43,15 @@
     fi
 fi
 
-hal_check_priv hal-storage-crypto-setup
+IS_HOTPLUGGABLE=`hal-get-property --udi $HAL_PROP_BLOCK_STORAGE_DEVICE --key storage.hotpluggable`
+if [ "$IS_HOTPLUGGABLE" == "true" ] ; then
+       ACTION="hal-storage-crypto-setup-removable"
+elif [ "$IS_HOTPLUGGABLE" == "false" ] ; then
+       ACTION="hal-storage-crypto-setup-fixed"
+else
+       unknown_error
+fi
+
+hal_check_priv $ACTION
 
 hal_exec_backend
--- a/tools/hal-luks-teardown   2007-09-03 12:09:48.000000000 +0200
+++ b/tools/hal-luks-teardown   2007-09-03 12:11:43.000000000 +0200
@@ -15,11 +15,15 @@
 }
 
 # Check for environment variables
-if [ -z "$HAL_PROP_BLOCK_DEVICE" ] || [ -z "$HAL_PROP_INFO_UDI" ] || [ -z "$HAL_PROP_VOLUME_UUID" ] ; then
+unknown_error() {
         echo "org.freedesktop.Hal.Device.UnknownError" >&2
         echo "Missing or empty environment variable(s)." >&2
         echo "This script should be started by hald." >&2
         exit 1
+}
+
+if [ -z "$HAL_PROP_BLOCK_DEVICE" ] || [ -z "$HAL_PROP_INFO_UDI" ] || [ -z "$HAL_PROP_VOLUME_UUID" ] ; then
+       unknown_error
 fi
 
 # Respect the same locks as Mount()/Unmount() etc.
@@ -41,6 +45,15 @@
 fi
 
 # TODO: this is a little sketchy; we should check for hal-storage-crypto-teardown-others
-hal_check_priv hal-storage-crypto-setup
+IS_HOTPLUGGABLE=`hal-get-property --udi $HAL_PROP_BLOCK_STORAGE_DEVICE --key storage.hotpluggable`
+if [ "$IS_HOTPLUGGABLE" == "true" ] ; then
+    ACTION="hal-storage-crypto-setup-removable"
+elif [ "$IS_HOTPLUGGABLE" == "false" ] ; then
+    ACTION="hal-storage-crypto-setup-fixed"
+else
+    unknown_error
+fi
+
+hal_check_priv $ACTION
 
 hal_exec_backend
++++++ hal-cleanup-deprecated_libhal-storage.diff ++++++
Files /var/tmp/diff_new_pack.vR5541/_old and /var/tmp/diff_new_pack.vR5541/_new differ


++++++ hal-fix-prevent_eject_method_for_dm-devices.diff ++++++
--- a/fdi/policy/10osvendor/20-storage-methods.fdi      2007-09-06 15:48:02.000000000 +0200
+++ b/fdi/policy/10osvendor/20-storage-methods.fdi      2007-09-06 15:48:08.000000000 +0200
@@ -167,10 +167,12 @@
       <append key="org.freedesktop.Hal.Device.Volume.method_argnames" type="strlist">extra_options</append>
       <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-storage-unmount</append>
 
-      <append key="org.freedesktop.Hal.Device.Volume.method_names" type="strlist">Eject</append>
-      <append key="org.freedesktop.Hal.Device.Volume.method_signatures" type="strlist">as</append>
-      <append key="org.freedesktop.Hal.Device.Volume.method_argnames" type="strlist">extra_options</append>
-      <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-storage-eject</append>
+      <match key="volume.linux.is_device_mapper" bool="false">
+        <append key="org.freedesktop.Hal.Device.Volume.method_names" type="strlist">Eject</append>
+        <append key="org.freedesktop.Hal.Device.Volume.method_signatures" type="strlist">as</append>
+        <append key="org.freedesktop.Hal.Device.Volume.method_argnames" type="strlist">extra_options</append>
+        <append key="org.freedesktop.Hal.Device.Volume.method_execpaths" type="strlist">hal-storage-eject</append>
+      </match>
 
       <!-- allow these mount options for all file systems -->
       <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
++++++ hal-fix-storage-policy-extra-options.diff ++++++
--- a/policy/hal-storage.policy 2007-09-06 14:32:03.000000000 +0200
+++ b/policy/hal-storage.policy 2007-09-06 14:40:38.000000000 +0200
@@ -30,6 +30,15 @@
       </defaults>
     </policy>
 
+    <policy id="hal-storage-mount-fixed-extra-options">
+      <description>Mount file systems from internal drives using options not explicitly granted.</description>
+      <message>System policy prevents mounting internal media using options not explicitly granted</message>
+      <defaults>
+        <allow_inactive>no</allow_inactive>
+        <allow_active>auth_admin_keep_always</allow_active>
+      </defaults>
+    </policy>
+
     <policy id="hal-storage-mount-removable">
       <description>Mount file systems from removable drives.</description>
       <message>System policy prevents mounting removable media</message>
@@ -39,6 +48,15 @@
       </defaults>
     </policy>
 
+    <policy id="hal-storage-mount-removable-extra-options">
+      <description>Mount file systems from removable drives using options not explicitly granted.</description>
+      <message>System policy prevents mounting removable media using options not explicitly granted</message>
+      <defaults>
+        <allow_inactive>no</allow_inactive>
+        <allow_active>auth_self_keep_always</allow_active>
+      </defaults>
+    </policy>
+
     <policy id="hal-storage-unmount-others">
       <description>Unmount file systems mounted by other users.</description>
       <message>System policy prevents unmounting media mounted by other users</message>
++++++ hal-revert-returnvalues_from_int_to_uint.diff ++++++
>From c7f2d8ce617970c3636a61061b8954bdeffe716a Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz@xxxxxxxxxx>
Date: Fri, 31 Aug 2007 14:33:09 -0400
Subject: [PATCH] Revert "make return value for method calls implemented via programs be UINT32"

This reverts commit 7b159b55d6398d2d240817276ae27ed68f11deda.
---
 doc/spec/hal-spec-properties.xml               |   17 ++++++++---------
 hald/hald_dbus.c                               |    8 ++++----
 hald/linux/addons/addon-dell-backlight.cpp     |    8 ++++----
 hald/linux/addons/addon-macbook-backlight.c    |    8 ++++----
 hald/linux/addons/addon-macbookpro-backlight.c |    8 ++++----
 hald/linux/addons/addon-omap-backlight.c       |    8 ++++----
 6 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index 7fbee1a..1f96d06 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -524,15 +524,14 @@ CK_SESSION_UID_Session3=501
       
       <para>
         Note that method calls implemented via running a program are
-        limited to the return type being an unsigned 32-bit integer
-        (this will change in a future release so it's configurable per
-        method). The incoming parameters are limited to only basic
-        types and arrays of strings. The parameters are passed via
-        stdin using a textual representation. As such, there is a lot
-        of overhead with handling method calls by spawning programs
-        and as such it should only be used for situtations where the
-        nature of the method call is that it will not be frequently
-        used.
+        limited to the return type being an a signed 32-bit integer
+        (this will change in a future release). The incoming
+        parameters are limited to only basic types and arrays of
+        strings. The parameters are passed via stdin using a textual
+        representation. As such, there is a lot of overhead with
+        handling method calls by spawning programs and as such it
+        should only be used for situtations where the nature of the
+        method call is that it will not be frequently used.
       </para>
       
       <para>
diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c
index ddae65c..091cc89 100644
--- a/hald/hald_dbus.c
+++ b/hald/hald_dbus.c
@@ -4003,7 +4003,7 @@ hald_exec_method_cb (HalDevice *d, guint32 exit_type,
                     gint return_code, gchar **error,
                     gpointer data1, gpointer data2)
 {
-       dbus_uint32_t result;
+       dbus_int32_t result;
        DBusMessage *reply = NULL;
        DBusMessage *message;
        DBusMessageIter iter;
@@ -4048,14 +4048,14 @@ hald_exec_method_cb (HalDevice *d, guint32 exit_type,
                dbus_message_unref (reply);
 
        } else {
-               result = (dbus_uint32_t) return_code;
+               result = (dbus_int32_t) return_code;
 
                reply = dbus_message_new_method_return (message);
                if (reply == NULL)
                        DIE (("No memory"));
                
                dbus_message_iter_init_append (reply, &iter);
-               dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &result);
+               dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &result);
                
                if (conn != NULL) {
                        if (!dbus_connection_send (conn, reply, NULL))
@@ -4633,7 +4633,7 @@ do_introspect (DBusConnection  *connection,
                                        }
                                        xml = g_string_append (
                                                xml, 
-                                               "      <arg name=\"return_code\" direction=\"out\" type=\"u\"/>\n");
+                                               "      <arg name=\"return_code\" direction=\"out\" type=\"i\"/>\n");
                                        xml = g_string_append  (
                                                xml, 
                                                "    </method>\n");
diff --git a/hald/linux/addons/addon-dell-backlight.cpp b/hald/linux/addons/addon-dell-backlight.cpp
index c2e485c..d30a80e 100644
--- a/hald/linux/addons/addon-dell-backlight.cpp
+++ b/hald/linux/addons/addon-dell-backlight.cpp
@@ -217,7 +217,7 @@ filter_function (DBusConnection *connection, DBusMessage *message, void *userdat
                                return_code = 0;
 
                                dbus_message_append_args (reply,
-                                                         DBUS_TYPE_UINT32, &return_code,
+                                                         DBUS_TYPE_INT32, &return_code,
                                                          DBUS_TYPE_INVALID);
                        }
 
@@ -244,7 +244,7 @@ filter_function (DBusConnection *connection, DBusMessage *message, void *userdat
                                goto error;
 
                        dbus_message_append_args (reply,
-                                                 DBUS_TYPE_UINT32, &brightness,
+                                                 DBUS_TYPE_INT32, &brightness,
                                                  DBUS_TYPE_INVALID);
                        dbus_connection_send (connection, reply, NULL);
                }
@@ -310,10 +310,10 @@ main (int argc, char *argv[])
                                            "org.freedesktop.Hal.Device.LaptopPanel", 
                                            "    <method name=\"SetBrightness\">\n"
                                            "      <arg name=\"brightness_value\" direction=\"in\" type=\"i\"/>\n"
-                                           "      <arg name=\"return_code\" direction=\"out\" type=\"u\"/>\n"
+                                           "      <arg name=\"return_code\" direction=\"out\" type=\"i\"/>\n"
                                            "    </method>\n"
                                            "    <method name=\"GetBrightness\">\n"
-                                           "      <arg name=\"brightness_value\" direction=\"out\" type=\"u\"/>\n"
+                                           "      <arg name=\"brightness_value\" direction=\"out\" type=\"i\"/>\n"
                                            "    </method>\n",
                                            &err)) {
                HAL_ERROR (("Cannot claim interface 'org.freedesktop.Hal.Device.LaptopPanel'"));
diff --git a/hald/linux/addons/addon-macbook-backlight.c b/hald/linux/addons/addon-macbook-backlight.c
index 5a14fd8..50a57d7 100644
--- a/hald/linux/addons/addon-macbook-backlight.c
+++ b/hald/linux/addons/addon-macbook-backlight.c
@@ -241,10 +241,10 @@ out:
 #define INTERFACE_DESCRIPTION \
   "    <method name=\"SetBrightness\">\n" \
   "      <arg name=\"brightness_value\" direction=\"in\" type=\"i\"/>\n" \
-  "      <arg name=\"return_code\" direction=\"out\" type=\"u\"/>\n" \
+  "      <arg name=\"return_code\" direction=\"out\" type=\"i\"/>\n" \
   "    </method>\n" \
   "    <method name=\"GetBrightness\">\n" \
-  "      <arg name=\"brightness_value\" direction=\"out\" type=\"u\"/>\n" \
+  "      <arg name=\"brightness_value\" direction=\"out\" type=\"i\"/>\n" \
   "    </method>\n"
 
 static DBusHandlerResult
@@ -271,7 +271,7 @@ filter_function (DBusConnection * connection, DBusMessage * message, void *userd
                        backlight_set (level + 0x1f);
 
                        if ((reply = dbus_message_new_method_return (message)))
-                               dbus_message_append_args (reply, DBUS_TYPE_UINT32,
+                               dbus_message_append_args (reply, DBUS_TYPE_INT32,
                                                          &ret, DBUS_TYPE_INVALID);
                }
        } else if (dbus_message_is_method_call (message, BACKLIGHT_IFACE, "GetBrightness")) {
@@ -280,7 +280,7 @@ filter_function (DBusConnection * connection, DBusMessage * message, void *userd
                        level = CLAMP (level, 0, 117);
 
                        if ((reply = dbus_message_new_method_return (message)))
-                               dbus_message_append_args (reply, DBUS_TYPE_UINT32,
+                               dbus_message_append_args (reply, DBUS_TYPE_INT32,
                                                          &level, DBUS_TYPE_INVALID);
                }
        }
diff --git a/hald/linux/addons/addon-macbookpro-backlight.c b/hald/linux/addons/addon-macbookpro-backlight.c
index e6521e0..830f915 100644
--- a/hald/linux/addons/addon-macbookpro-backlight.c
+++ b/hald/linux/addons/addon-macbookpro-backlight.c
@@ -320,7 +320,7 @@ filter_function (DBusConnection *connection, DBusMessage *message, void *userdat
 
                                return_code = 0;
                                dbus_message_append_args (reply,
-                                                         DBUS_TYPE_UINT32, &return_code,
+                                                         DBUS_TYPE_INT32, &return_code,
                                                          DBUS_TYPE_INVALID);
                        }
 
@@ -353,7 +353,7 @@ filter_function (DBusConnection *connection, DBusMessage *message, void *userdat
                                goto error;
 
                        dbus_message_append_args (reply,
-                                                 DBUS_TYPE_UINT32, &brightness,
+                                                 DBUS_TYPE_INT32, &brightness,
                                                  DBUS_TYPE_INVALID);
                        dbus_connection_send (connection, reply, NULL);
                }
@@ -560,10 +560,10 @@ main (int argc, char *argv[])
                                            "org.freedesktop.Hal.Device.LaptopPanel", 
                                            "    <method name=\"SetBrightness\">\n"
                                            "      <arg name=\"brightness_value\" direction=\"in\" type=\"i\"/>\n"
-                                           "      <arg name=\"return_code\" direction=\"out\" type=\"u\"/>\n"
+                                           "      <arg name=\"return_code\" direction=\"out\" type=\"i\"/>\n"
                                            "    </method>\n"
                                            "    <method name=\"GetBrightness\">\n"
-                                           "      <arg name=\"brightness_value\" direction=\"out\" type=\"u\"/>\n"
+                                           "      <arg name=\"brightness_value\" direction=\"out\" type=\"i\"/>\n"
                                            "    </method>\n",
                                            &err)) {
                HAL_ERROR (("Cannot claim interface 'org.freedesktop.Hal.Device.LaptopPanel'"));
diff --git a/hald/linux/addons/addon-omap-backlight.c b/hald/linux/addons/addon-omap-backlight.c
index 95c1113..97cf7a2 100644
--- a/hald/linux/addons/addon-omap-backlight.c
+++ b/hald/linux/addons/addon-omap-backlight.c
@@ -222,7 +222,7 @@ filter_function (DBusConnection *connection, DBusMessage *message, void *userdat
 
                                return_code = 0;
                                dbus_message_append_args (reply,
-                                                         DBUS_TYPE_UINT32, &return_code,
+                                                         DBUS_TYPE_INT32, &return_code,
                                                          DBUS_TYPE_INVALID);
                        }
 
@@ -252,7 +252,7 @@ filter_function (DBusConnection *connection, DBusMessage *message, void *userdat
                                goto error;
 
                        dbus_message_append_args (reply,
-                                                 DBUS_TYPE_UINT32, &brightness,
+                                                 DBUS_TYPE_INT32, &brightness,
                                                  DBUS_TYPE_INVALID);
                        dbus_connection_send (connection, reply, NULL);
                }
@@ -308,10 +308,10 @@ main (int argc, char *argv[])
                                            "org.freedesktop.Hal.Device.LaptopPanel", 
                                            "    <method name=\"SetBrightness\">\n"
                                            "      <arg name=\"brightness_value\" direction=\"in\" type=\"i\"/>\n"
-                                           "      <arg name=\"return_code\" direction=\"out\" type=\"u\"/>\n"
+                                           "      <arg name=\"return_code\" direction=\"out\" type=\"i\"/>\n"
                                            "    </method>\n"
                                            "    <method name=\"GetBrightness\">\n"
-                                           "      <arg name=\"brightness_value\" direction=\"out\" type=\"u\"/>\n"
+                                           "      <arg name=\"brightness_value\" direction=\"out\" type=\"i\"/>\n"
                                            "    </method>\n",
                                            &err)) {
                HAL_ERROR (("Cannot claim interface 'org.freedesktop.Hal.Device.LaptopPanel'"));
-- 
1.5.0.2





++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread