Author: lslezak Date: Mon May 4 18:38:48 2009 New Revision: 57061 URL: http://svn.opensuse.org/viewcvs/yast?rev=57061&view=rev Log: - SCR DBus service - fixed DBus object registration, fixed creating the PolicyKit action ID - 2.18.10 Modified: trunk/core/VERSION trunk/core/dbus/SCR_service/DBusServer.cc trunk/core/dbus/SCR_service/test_SCR_dbus_server.rb.in trunk/core/package/yast2-core.changes Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=57061&r1=57060&r2=57061&view=diff ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Mon May 4 18:38:48 2009 @@ -1 +1 @@ -2.18.9 +2.18.10 Modified: trunk/core/dbus/SCR_service/DBusServer.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/SCR_service/DBusServer.cc?rev=57061&r1=57060&r2=57061&view=diff ============================================================================== --- trunk/core/dbus/SCR_service/DBusServer.cc (original) +++ trunk/core/dbus/SCR_service/DBusServer.cc Mon May 4 18:38:48 2009 @@ -61,11 +61,6 @@ std::string object(SCR_OBJECT_PATH); - if (!object.empty() && object[0] == '/') - { - object.erase(object.begin()); - } - // register the manager object: register_function(object, interface, method, signature, handler) register_method(object, YAST_SCR_INTERFACE, METHOD_READ, sig_3param, cb); register_method(object, YAST_SCR_INTERFACE, METHOD_WRITE, sig_3param, cb); @@ -142,7 +137,7 @@ check_ok = true; } - y2internal("check_ok: %d", check_ok); + y2debug("check_ok: %d", check_ok); if (check_ok) { @@ -195,7 +190,7 @@ } } - y2internal("Finishing the callback"); + y2milestone("Finishing the callback"); return reply; } @@ -210,22 +205,28 @@ ret.push_back(action_id); + YCPValue path = msg.getYCPValue(0); YCPValue arg = msg.getYCPValue(1); YCPValue opt = msg.getYCPValue(2); - std::string arg_str, opt_str; + std::string path_str, arg_str, opt_str; + + if (!path.isNull()) + { + path_str = path->toString(); + } - if (!arg.isNull()) + if (!arg.isNull() && arg->isString()) { - arg_str = arg->toString(); + arg_str = arg->asString()->value(); } - if (!opt.isNull()) + if (!opt.isNull() && opt->isString()) { - opt_str = opt->toString(); + opt_str = opt->asString()->value(); } - action_id = PolKit::createActionId(POLKIT_PREFIX, msg.path(), msg.method(), arg_str, opt_str); + action_id = PolKit::createActionId(POLKIT_PREFIX, path_str, msg.method(), arg_str, opt_str); ret.push_back(action_id); #endif Modified: trunk/core/dbus/SCR_service/test_SCR_dbus_server.rb.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/SCR_service/test_SCR_dbus_server.rb.in?rev=57061&r1=57060&r2=57061&view=diff ============================================================================== --- trunk/core/dbus/SCR_service/test_SCR_dbus_server.rb.in (original) +++ trunk/core/dbus/SCR_service/test_SCR_dbus_server.rb.in Mon May 4 18:38:48 2009 @@ -26,7 +26,7 @@ # Get the object from this service # (using the root object of the service, for SCR there's just one) - objYast = yast.object("/#{yast.root}") + objYast = yast.object("/SCR") assert objYast # Create a local object for accessing the interface provided by the remote object @@ -47,7 +47,7 @@ assert yast # Get the object from this service - objYast = yast.object("/#{yast.root}") + objYast = yast.object("/SCR") assert objYast poiSCR = DBus::ProxyObjectInterface.new(objYast, "@YAST_SCR_INTERFACE@") Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?rev=57061&r1=57060&r2=57061&view=diff ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Mon May 4 18:38:48 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 4 17:28:28 CEST 2009 - lslezak@suse.cz + +- SCR DBus service - fixed DBus object registration, fixed creating + the PolicyKit action ID +- 2.18.10 + +------------------------------------------------------------------- Mon Apr 27 15:51:11 CEST 2009 - mvidner@suse.cz - Resurrected logging in the signal handler, into -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org