[maemo-commits] [maemo-commits] r10650 - projects/haf/trunk/libosso/src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-03-20 15:38:49 +0200 (Tue, 20 Mar 2007)
New Revision: 10650

Modified:
   projects/haf/trunk/libosso/src/osso-hw.c
Log:
more fixes


Modified: projects/haf/trunk/libosso/src/osso-hw.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-hw.c	2007-03-20 13:36:58 UTC (rev 10649)
+++ projects/haf/trunk/libosso/src/osso-hw.c	2007-03-20 13:38:49 UTC (rev 10650)
@@ -161,7 +161,7 @@
         if (!osso->hw_cbs.shutdown_ind.set) {
             /* if callback was not previously registered, add match */
             dbus_bus_add_match(osso->sys_conn, "type='signal',interface='"
-                MCE_SIGNAL_IF "',member='" SHUTDOWN_SIG "'", &error);
+                MCE_SIGNAL_IF "',member='" MCE_SHUTDOWN_SIG "'", &error);
             if (dbus_error_is_set(&error)) {
                 ULOG_ERR_F("dbus_bus_add_match failed: %s", error.message);
                 dbus_error_free(&error);
@@ -211,7 +211,7 @@
         osso->hw_cbs.save_unsaved_data_ind.data = data;
         if (!osso->hw_cbs.save_unsaved_data_ind.set) {
             dbus_bus_add_match(osso->sys_conn, "type='signal',interface='"
-                MCE_SIGNAL_IF "',member='" SAVE_UNSAVED_SIG "'", &error);
+                MCE_SIGNAL_IF "',member='" MCE_SAVE_UNSAVED_SIG "'", &error);
             if (dbus_error_is_set(&error)) {
                 ULOG_ERR_F("dbus_bus_add_match failed: %s", error.message);
                 dbus_error_free(&error);
@@ -228,7 +228,7 @@
         osso->hw_cbs.system_inactivity_ind.data = data;
         if (!osso->hw_cbs.system_inactivity_ind.set) {
             dbus_bus_add_match(osso->sys_conn, "type='signal',interface='"
-                MCE_SIGNAL_IF "',member='" INACTIVITY_SIG "'", &error);
+                MCE_SIGNAL_IF "',member='" MCE_INACTIVITY_SIG "'", &error);
             if (dbus_error_is_set(&error)) {
                 ULOG_ERR_F("dbus_bus_add_match failed: %s", error.message);
                 dbus_error_free(&error);
@@ -246,7 +246,7 @@
         osso->hw_cbs.sig_device_mode_ind.data = data;
         if (!osso->hw_cbs.sig_device_mode_ind.set) {
             dbus_bus_add_match(osso->sys_conn, "type='signal',interface='"
-                MCE_SIGNAL_IF "',member='" DEVICE_MODE_SIG "'", &error);
+                MCE_SIGNAL_IF "',member='" MCE_DEVICE_MODE_SIG "'", &error);
             if (dbus_error_is_set(&error)) {
                 ULOG_ERR_F("dbus_bus_add_match failed: %s", error.message);
                 dbus_error_free(&error);