diff options
| author | Janos Kovacs <janos.f.kovacs@nokia.com> | 2010-01-19 14:42:55 +0200 |
|---|---|---|
| committer | Janos Kovacs <janos.f.kovacs@nokia.com> | 2010-01-19 14:42:55 +0200 |
| commit | edc3f58ef9729a98a6e5aacb611009a4bb0f619e (patch) | |
| tree | d5d52b03996234c76019a4b56ce4567c4c266dd4 /src/dbus-proto.c | |
| parent | 4904ef50dd16b68f6eb33999a39e3e71f32436f5 (diff) | |
changed class -> klass to be able to use the structs in C++
Diffstat (limited to 'src/dbus-proto.c')
| -rw-r--r-- | src/dbus-proto.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dbus-proto.c b/src/dbus-proto.c index 0201a0c..b0db7c8 100644 --- a/src/dbus-proto.c +++ b/src/dbus-proto.c @@ -103,14 +103,14 @@ static resset_t *connect_to_manager(resconn_t *rcon, resmsg_t *resmsg) char *name = RESPROTO_DBUS_MANAGER_NAME; uint32_t id = resmsg->record.id; resmsg_rset_t *flags = &resmsg->record.rset; - const char *class = resmsg->record.class; + const char *klass = resmsg->record.klass; uint32_t mode = resmsg->record.mode; resset_t *rset; if ((rset = resset_find(rcon, name, id)) == NULL) { if (register_client_object(&rcon->dbus, id)) { rset = resset_create(rcon, name, id, RESPROTO_RSET_STATE_CREATED, - class, mode, flags->all, flags->opt, + klass, mode, flags->all, flags->opt, flags->share, flags->mask); } } @@ -602,7 +602,7 @@ static DBusHandlerResult manager_method(DBusConnection *dcon, if (resmsg.type == RESMSG_REGISTER) { rset = resset_create(rcon, sender, resmsg.any.id, RESPROTO_RSET_STATE_CONNECTED, - resmsg.record.class, + resmsg.record.klass, resmsg.record.mode, resmsg.record.rset.all, resmsg.record.rset.opt, |