]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
dbus: fix the string RPC calls
authorJaroslav Kysela <perex@perex.cz>
Sat, 9 Aug 2014 14:54:12 +0000 (16:54 +0200)
committerJaroslav Kysela <perex@perex.cz>
Mon, 11 Aug 2014 09:50:51 +0000 (11:50 +0200)
src/dbus.c
src/subscriptions.c

index 5548987332cd6bdd991a70abecae2d43f053b48b..c5eaf3b583f9c6ada9f7dfddceb98af3b310af18 100644 (file)
@@ -243,8 +243,8 @@ dbus_reply_to_rpc(dbus_rpc_t *rpc, DBusMessage *msg, DBusConnection *conn)
     reply = dbus_message_new_method_return(msg);
     dbus_message_iter_init_append(reply, &args);
     dbus_message_iter_append_basic(&args, DBUS_TYPE_INT64, &param_s64);
-  } else if (rpc->rpc_s64) {
-    if (DBUS_TYPE_INT64 != dbus_message_iter_get_arg_type(&args))
+  } else if (rpc->rpc_str) {
+    if (DBUS_TYPE_STRING != dbus_message_iter_get_arg_type(&args))
       return;
     dbus_message_iter_get_basic(&args, &param_str);
     param_str = rpc->rpc_str(rpc->opaque, path, param_str);
index 6c837fb174787b946f0faabd0d29e83c1525cd0f..66e5a43de73f3fbd3122d3bb040bd41fc71b47d7 100644 (file)
@@ -346,7 +346,7 @@ subscription_set_postpone(void *aux, const char *path, int64_t postpone)
   th_subscription_t *s;
   time_t now = time(NULL);
 
-  if (strcmp(path, "set"))
+  if (strcmp(path, "/set"))
     return -1;
   /* some limits that make sense */
   if (postpone < 0)