Author: lslezak Date: Mon Jul 14 13:31:07 2008 New Revision: 49038 URL: http://svn.opensuse.org/viewcvs/yast?rev=49038&view=rev Log: - added support for SCR::Error() in the DBus layer Modified: branches/tmp/lslezak/workshop/core/libscr/src/SCR.cc branches/tmp/lslezak/workshop/core/scr/src/DBusServer.cc Modified: branches/tmp/lslezak/workshop/core/libscr/src/SCR.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/core/libscr/src/SCR.cc?rev=49038&r1=49037&r2=49038&view=diff ============================================================================== --- branches/tmp/lslezak/workshop/core/libscr/src/SCR.cc (original) +++ branches/tmp/lslezak/workshop/core/libscr/src/SCR.cc Mon Jul 14 13:31:07 2008 @@ -200,11 +200,9 @@ static YCPValue SCRError (const YCPPath &path) { - // TODO FIXME if (connection != NULL) { - y2error("SCR::Error() call is not implemented yet in DBus layer!"); - return YCPVoid(); + return CallDBus("Error", path); } if (! SCRAgent::instance()) Modified: branches/tmp/lslezak/workshop/core/scr/src/DBusServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/core/scr/src/DBusServer.cc?rev=49038&r1=49037&r2=49038&view=diff ============================================================================== --- branches/tmp/lslezak/workshop/core/scr/src/DBusServer.cc (original) +++ branches/tmp/lslezak/workshop/core/scr/src/DBusServer.cc Mon Jul 14 13:31:07 2008 @@ -91,7 +91,8 @@ { std::string method(request.method()); - if (method == "Read" || method == "Write" || method == "Execute" || method == "Dir") + if (method == "Read" || method == "Write" || method == "Execute" || + method == "Dir" || method == "Error") { YCPValue arg = request.getYCPValue(1); YCPValue opt = request.getYCPValue(2); @@ -128,6 +129,8 @@ ret = sa->Execute(pth, arg, opt); else if (method == "Dir") ret = sa->Dir(pth); + else if (method == "Error") + ret = sa->Error(pth); reply.createReply(request); @@ -194,6 +197,10 @@ " <arg name='path' type='s' direction='in'/>" " <arg name='ret' type='av' direction='out'/>" " </method>" +" <method name='Error'>" +" <arg name='path' type='s' direction='in'/>" +" <arg name='ret' type='av' direction='out'/>" +" </method>" " <interface name='org.freedesktop.DBus.Introspectable'>" " <method name='Introspect'>" " <arg name='xml_data' type='s' direction='out'/>" -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org