force = 0;
break;
case json_type_object:
- wgtfile = j_get_string(req, "wgt", NULL);
+ wgtfile = j_string_at(req, "wgt", NULL);
if (wgtfile != NULL) {
- root = j_get_string(req, "root", rootdir);
- force = j_get_boolean(req, "force", 0);
+ root = j_string_at(req, "root", rootdir);
+ force = j_boolean_at(req, "force", 0);
break;
}
default:
resp = json_object_new_object();
if(!resp || !j_add_string(resp, "added", wgt_info_desc(ifo)->idaver))
jbus_reply_error_s(jreq, "\"out of memory but installed!\"");
- else
+ else {
+ jbus_send_signal_s(jbus, "changed", "true");
jbus_reply_j(jreq, resp);
+ }
/* clean-up */
wgt_info_unref(ifo);
json_object_put(resp);
}
-
- /* still sends the signal */
- jbus_send_signal_s(jbus, "changed", "true");
}
static void on_uninstall(struct jreq *jreq, struct json_object *req)
root = rootdir;
break;
case json_type_object:
- idaver = j_get_string(req, "id", NULL);
+ idaver = j_string_at(req, "id", NULL);
if (idaver != NULL) {
- root = j_get_string(req, "root", rootdir);
+ root = j_string_at(req, "root", rootdir);
break;
}
default:
rc = uninstall_widget(idaver, root);
if (rc)
jbus_reply_error_s(jreq, "\"uninstallation had error\"");
- else
+ else {
+ jbus_send_signal_s(jbus, "changed", "true");
jbus_reply_s(jreq, "true");
-
- /* still sends the signal */
- jbus_send_signal_s(jbus, "changed", "true");
+ }
}
static int daemonize()