February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55405 - /tags/stable-2_18_4/libyui/
by gs＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: gs Date: Wed Feb 11 11:44:31 2009 New Revision: 55405 URL: http://svn.opensuse.org/viewcvs/yast?rev=55405&view=rev Log: Created tag stable-2_18_4 for libyui Added: tags/stable-2_18_4/libyui/ - copied from r55404, trunk/libyui/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55404 - /trunk/ncurses/package/yast2-ncurses.changes
by gs＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: gs Date: Wed Feb 11 11:43:21 2009 New Revision: 55404 URL: http://svn.opensuse.org/viewcvs/yast?rev=55404&view=rev Log: move version Modified: trunk/ncurses/package/yast2-ncurses.changes Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Wed Feb 11 11:43:21 2009 @@ -3,12 +3,12 @@ - Internal changes in NCFileSelection: correct references to YTableItems and YTableCells +- V 2.18.3 ------------------------------------------------------------------- Mon Feb 9 11:53:36 CET 2009 - sh(a)suse.de - Require latest libyui in spec file (API change) -- V 2.18.3 ------------------------------------------------------------------- Tue Jan 20 16:50:55 CET 2009 - kmachalkova(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55403 - /tags/stable-2_18_0/schema/
by mvidner＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: mvidner Date: Wed Feb 11 09:55:47 2009 New Revision: 55403 URL: http://svn.opensuse.org/viewcvs/yast?rev=55403&view=rev Log: Created tag stable-2_18_0 for schema Added: tags/stable-2_18_0/schema/ - copied from r55402, trunk/schema/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55402 - in /trunk/schema: VERSION package/yast2-schema.changes scripts/collect.sh
by mvidner＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: mvidner Date: Wed Feb 11 09:49:05 2009 New Revision: 55402 URL: http://svn.opensuse.org/viewcvs/yast?rev=55402&view=rev Log: Sort found files to avoid unnecessary rebuilds. Modified: trunk/schema/VERSION trunk/schema/package/yast2-schema.changes trunk/schema/scripts/collect.sh Modified: trunk/schema/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/schema/VERSION?rev=55402&r1=5540… ============================================================================== --- trunk/schema/VERSION (original) +++ trunk/schema/VERSION Wed Feb 11 09:49:05 2009 @@ -1 +1 @@ -2.17.4 +2.18.0 Modified: trunk/schema/package/yast2-schema.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/schema/package/yast2-schema.chan… ============================================================================== --- trunk/schema/package/yast2-schema.changes (original) +++ trunk/schema/package/yast2-schema.changes Wed Feb 11 09:49:05 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 11 09:48:39 CET 2009 - mvidner(a)suse.cz + +- Sort found files to avoid unnecessary rebuilds. +- 2.18.0 + +------------------------------------------------------------------- Wed Oct 15 13:43:16 CEST 2008 - ug(a)suse.de - moved common.rnc from yast2-schema to autoyast2 to Modified: trunk/schema/scripts/collect.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/schema/scripts/collect.sh?rev=55… ============================================================================== --- trunk/schema/scripts/collect.sh (original) +++ trunk/schema/scripts/collect.sh Wed Feb 11 09:49:05 2009 @@ -25,7 +25,7 @@ # check all desktop files -for desktop in `find $DESKTOP_DIR $DESKTOP_DIR2 -name '*.desktop'`; do +for desktop in `find $DESKTOP_DIR $DESKTOP_DIR2 -name '*.desktop' | LC_ALL=C sort`; do unset X_SuSE_YaST_AutoInstSchema unset X_SuSE_YaST_AutoInstResource unset X_SuSE_YaST_AutoInstPath -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55401 - in /branches/tmp/lslezak/core: dbus/namespace_service/DBusModulesServer.cc liby2dbus/src/DBusServerBase.cc liby2dbus/src/DBusServerBase.h
by lslezak＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: lslezak Date: Wed Feb 11 07:59:08 2009 New Revision: 55401 URL: http://svn.opensuse.org/viewcvs/yast?rev=55401&view=rev Log: - DBus service - moved "Import" from /ModuleManeger object directly to the service interface org.opensuse.yast.modules.ModuleManager Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Wed Feb 11 07:59:08 2009 @@ -222,7 +222,7 @@ sig.params = p; // register the manager object: register_function(object, interface, method, signature, handler) - register_method("ModuleManager", "org.opensuse.yast.modules.ModuleManager", "Import", sig, manager_callback); + register_method("", "org.opensuse.yast.modules.ModuleManager", "Import", sig, manager_callback); } std::string DBusModulesServer::Y2Dtype(constTypePtr type) const @@ -522,7 +522,7 @@ YCPValue ret; - if (object == "/ModuleManager") + if (object == "/") { if (interface == "org.opensuse.yast.modules.ModuleManager") { Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc Wed Feb 11 07:59:08 2009 @@ -73,6 +73,42 @@ return clients.size() == 0; } +std::string DBusServerBase::CreateObjectIntrospection(const ObjectData &od) +{ + std::string introspect; + + // iterate over the interfaces + for(ObjectData::const_iterator ii = od.begin(); + ii != od.end(); + ++ii) + { + introspect += " <interface name='" + ii->first + "'>\n"; + + InterfaceData id = ii->second; + + // iterate over all methods + for(InterfaceData::const_iterator iii = id.begin(); + iii != id.end(); + ++iii) + { + // iterate over the methods in the interface + introspect += " <method name='" + iii->first + "'>"; + + // iterate over all parameters + DBusSignature sig = iii->second.second; + + // add somthing like "<arg name='xml_data' type='s' direction='out'/>" + introspect += sig.asXML(); + + introspect += "</method>\n"; + } + + introspect += " </interface>\n"; + } + + return introspect; +} + /** * Server that exposes a method call and waits for it to be called */ @@ -143,11 +179,22 @@ " </method>\n" " </interface>\n"; + // add "static" methods (with empty object) + for(Objects::const_iterator i = registered_objects.begin(); i != registered_objects.end(); ++i) { - introspect += " <node name='" + i->first + "'/>\n"; + std::string object(i->first); + + if (!object.empty()) + { + introspect += " <node name='" + object + "'/>\n"; + } + else + { + introspect += CreateObjectIntrospection(i->second); + } } // close the node section @@ -183,36 +230,7 @@ else { ObjectData od = i->second; - - // iterate over the interfaces - for(ObjectData::const_iterator ii = od.begin(); - ii != od.end(); - ++ii) - { - introspect += " <interface name='" + ii->first + "'>\n"; - - InterfaceData id = ii->second; - - // iterate over all methods - for(InterfaceData::const_iterator iii = id.begin(); - iii != id.end(); - ++iii) - { - // iterate over the methods in the interface - introspect += " <method name='" + iii->first + "'>"; - - // iterate over all parameters - DBusSignature sig = iii->second.second; - - // add somthing like "<arg name='xml_data' type='s' direction='out'/>" - introspect += sig.asXML(); - - introspect += "</method>\n"; - } - - introspect += " </interface>\n"; - } - + introspect += CreateObjectIntrospection(od); } introspect += " </node>\n"; Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h Wed Feb 11 07:59:08 2009 @@ -68,6 +68,8 @@ typedef std::map<Interface, InterfaceData> ObjectData; typedef std::map<Object, ObjectData> Objects; + std::string CreateObjectIntrospection(const ObjectData &od); + Objects registered_objects; typedef std::map<std::string, DBusCaller> Clients; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55400 - in /trunk/country: package/yast2-country.changes timezone/src/Timezone.ycp timezone/src/dialogs.ycp
by jsuchome＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: jsuchome Date: Wed Feb 11 07:46:51 2009 New Revision: 55400 URL: http://svn.opensuse.org/viewcvs/yast?rev=55400&view=rev Log: - changed order of Date and Time strings (date first, bnc#445670) Modified: trunk/country/package/yast2-country.changes trunk/country/timezone/src/Timezone.ycp trunk/country/timezone/src/dialogs.ycp Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Wed Feb 11 07:46:51 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 11 07:45:37 CET 2009 - jsuchome(a)suse.cz + +- changed order of Date and Time strings (date first, bnc#445670) + +------------------------------------------------------------------- Tue Jan 6 20:28:15 CET 2009 - jsuchome(a)suse.cz - correct widget name from NTP proposal (bnc#463796) Modified: trunk/country/timezone/src/Timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/Timezone.yc… ============================================================================== --- trunk/country/timezone/src/Timezone.ycp (original) +++ trunk/country/timezone/src/Timezone.ycp Wed Feb 11 07:46:51 2009 @@ -501,7 +501,7 @@ string cmd = ""; string date_format = (locale_format && Mode::normal ()) - ? "+%c" : "+%H:%M:%S - %Y-%m-%d"; + ? "+%c" : "+%Y-%m-%d - %H:%M:%S"; y2milestone( "GetDateTime hwclock %1 real:%2", hwclock, real_time ); if (!real_time && !Mode::config ()) Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp… ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Wed Feb 11 07:46:51 2009 @@ -537,9 +537,9 @@ string time_frame_label = // frame label - ntp_used ? _("Time and Date (NTP is configured)") : + ntp_used ? _("Date and Time (NTP is configured)") : // frame label - _("Time and Date"); + _("Date and Time"); // Read system date and time. string date = Timezone::GetDateTime(true, false); @@ -792,9 +792,9 @@ // adapt frame label, NTP status may be changed time_frame_label = // frame label - ntp_used ? _("Time and Date (NTP is configured)") : + ntp_used ? _("Date and Time (NTP is configured)") : // frame label - _("Time and Date"); + _("Date and Time"); UI::ChangeWidget (`id (`time_fr), `Label, time_frame_label); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55399 - in /branches/tmp/lslezak/core/dbus/namespace_service: Makefile.am Yast_dbus_server.cc modules_dbus_server.cc org.opensuse.yast.modules.service.in
by lslezak＠svn.opensuse.org 11 Feb '09

11 Feb '09

Author: lslezak Date: Wed Feb 11 06:55:08 2009 New Revision: 55399 URL: http://svn.opensuse.org/viewcvs/yast?rev=55399&view=rev Log: - DBuse service - renamed the executable to Yast_dbus_server Added: branches/tmp/lslezak/core/dbus/namespace_service/Yast_dbus_server.cc (props changed) - copied unchanged from r55398, branches/tmp/lslezak/core/dbus/namespace_service/modules_dbus_server.cc Removed: branches/tmp/lslezak/core/dbus/namespace_service/modules_dbus_server.cc Modified: branches/tmp/lslezak/core/dbus/namespace_service/Makefile.am branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.yast.modules.service.in Modified: branches/tmp/lslezak/core/dbus/namespace_service/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/Makefile.am (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/Makefile.am Wed Feb 11 06:55:08 2009 @@ -8,13 +8,13 @@ INCLUDES = ${AGENT_INCLUDES} -ybin_PROGRAMS = modules_dbus_server +ybin_PROGRAMS = Yast_dbus_server -modules_dbus_server_SOURCES = modules_dbus_server.cc DBusModulesServer.cc DBusModulesServer.h +Yast_dbus_server_SOURCES = Yast_dbus_server.cc DBusModulesServer.cc DBusModulesServer.h -modules_dbus_server_CPPFLAGS = $(AM_CPPFLAGS) $(DBUS_CFLAGS) $(POLKIT_CFLAGS) -I$(top_builddir)/liby2dbus/src -I$(srcdir)/../../scr/src -I$(top_builddir)/libscr/src/include -I$(top_builddir)/wfm/src +Yast_dbus_server_CPPFLAGS = $(AM_CPPFLAGS) $(DBUS_CFLAGS) $(POLKIT_CFLAGS) -I$(top_builddir)/liby2dbus/src -I$(srcdir)/../../scr/src -I$(top_builddir)/libscr/src/include -I$(top_builddir)/wfm/src -modules_dbus_server_LDADD = ${AGENT_LIBADD} $(top_builddir)/liby2dbus/src/liby2dbus.la $(top_builddir)/scr/src/libpy2scr.la $(top_builddir)/wfm/src/libpy2wfm.la +Yast_dbus_server_LDADD = ${AGENT_LIBADD} $(top_builddir)/liby2dbus/src/liby2dbus.la $(top_builddir)/scr/src/libpy2scr.la $(top_builddir)/wfm/src/libpy2wfm.la # service activation config Modified: branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.yast.modules.service.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.yast.modules.service.in (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.yast.modules.service.in Wed Feb 11 06:55:08 2009 @@ -1,5 +1,5 @@ # DBus service activation config [D-BUS Service] Name=org.opensuse.yast.modules -Exec=@YBINDIR@/modules_dbus_server +Exec=@YBINDIR@/Yast_dbus_server User=root -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55398 - in /branches/tmp/lslezak/core: dbus/namespace_service/DBusModulesServer.cc dbus/namespace_service/DBusModulesServer.h dbus/namespace_service/modules_dbus_server.cc liby2dbus/src/DBusMsg.cc
by lslezak＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: lslezak Date: Tue Feb 10 20:35:15 2009 New Revision: 55398 URL: http://svn.opensuse.org/viewcvs/yast?rev=55398&view=rev Log: - DBus service - added /ModuleManager object for explicit import Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h branches/tmp/lslezak/core/dbus/namespace_service/modules_dbus_server.cc branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Tue Feb 10 20:35:15 2009 @@ -50,123 +50,179 @@ } } -DBusModulesServer::DBusModulesServer(const NameSpaceList &name_spaces) : e(this), wfm(NULL) +bool DBusModulesServer::importNamespace(const std::string &nspace) { - init_wfm(); + NameSpaceMap::const_iterator nsiter = nsmap.find(nspace); - for (NameSpaceList::const_iterator it = name_spaces.begin(); - it != name_spaces.end(); - ++it) + if (nsiter != nsmap.end()) { - Import import(*it); // has an iternal static cache + y2internal("Namespace %s has already been imported", nspace.c_str()); + return true; + } - Y2Namespace *ns = import.nameSpace(); + Import import(nspace); // has an iternal static cache - if (ns == NULL) - { - y2error("Import name space %s failed", it->c_str()); - } - else - { - ns->initialize(); - std::string objname(*it); - MakeValidObjectName(objname); + Y2Namespace *ns = import.nameSpace(); + + if (ns == NULL) + { + y2error("Import name space %s failed", nspace.c_str()); + return false; + } + else + { + ns->initialize(); + std::string objname(nspace); + MakeValidObjectName(objname); - y2milestone("Imported name space: %s, using object name: %s", it->c_str(), objname.c_str()); + y2milestone("Imported name space: %s, using object name: %s", nspace.c_str(), objname.c_str()); - nsmap[objname] = ns; - } + nsmap[objname] = ns; + + return registerNamespace(ns); } } -DBusModulesServer::~DBusModulesServer() +bool DBusModulesServer::registerFunction(const std::string &nspace, const char *fname, constFunctionTypePtr fptr) { - if (wfm != NULL) + if (fptr) { - y2milestone("Deleting WFM component"); - delete wfm; - wfm = NULL; + constTypePtr rettype = fptr->returnType(); + + DBusSignature sig_marshalled; + DBusSignature sig_raw; + + // add return type + std::string rett(Y2Dtype(rettype)); + + if (!rett.empty()) + { + sig_raw.retval = DBusArgument("ret", rett); + } + + // TODO FIXME void() ? + sig_marshalled.retval = DBusArgument("ret", "(bsv)"); + + // add parameter types + int params = fptr->parameterCount(); + int parindex = 0; + DBusSignature::Params p_marshalled; + DBusSignature::Params p_raw; + + bool params_ok_raw = true; + + while(parindex < params) + { + std::string partype_raw(Y2Dtype(fptr->parameterType(parindex))); + + if (!partype_raw.empty()) + { + DBusArgument param("param", partype_raw); + p_raw.push_back(param); + } + else + { + y2warning("Function %s is not exported due to an unsupported parameter type", fname); + params_ok_raw = false; + } + + DBusArgument param("param", "(bsv)"); + p_marshalled.push_back(param); + + parindex++; + } + + if (params_ok_raw) + { + sig_raw.params = p_raw; + // register the function: register_function(object, interface, method, signature, handler) + register_method(nspace, "org.opensuse.yast.modules.Values", fname, sig_raw, e); + } + + sig_marshalled.params = p_marshalled; + register_method(nspace, "org.opensuse.yast.modules.YCPValues", fname, sig_marshalled, e); + + return true; } + + return false; } -void DBusModulesServer::registerFunctions(const std::string &interface_prefix, bool do_marshalling) + +bool DBusModulesServer::registerNamespace(const Y2Namespace *ns) { - for (NameSpaceMap::const_iterator it = nsmap.begin(); - it != nsmap.end(); - ++it) + if (ns) { - Y2Namespace *ns = it->second; + unsigned symbols = ns->symbolCount(); + unsigned index = 0; - if (ns) + while(index < symbols) { - unsigned symbols = ns->symbolCount(); - unsigned index = 0; + SymbolEntryPtr symbol = ns->symbolEntry(index); - while(index < symbols) + if (symbol) { - SymbolEntryPtr symbol = ns->symbolEntry(index); + // name of the method + const char *name = symbol->name(); + // type + constTypePtr type = symbol->type(); - if (symbol) + if (type->isFunction()) { - // name of the method - const char *name = symbol->name(); - // type - constTypePtr type = symbol->type(); - - if (type->isFunction()) - { - constFunctionTypePtr fptr = constFunctionTypePtr(type); + constFunctionTypePtr fptr = constFunctionTypePtr(type); - constTypePtr rettype = fptr->returnType(); + registerFunction(ns->name(), name, fptr); + } + else + { + y2debug("Symbol %s::%s is not a function", ns->name().c_str(), name); + } + } - DBusSignature sig; + index++; + } - // add return type - std::string rett(do_marshalling ? "(bsv)" : Y2Dtype(rettype)); + return true; + } - if (!rett.empty()) - { - sig.retval = DBusArgument("ret", rett); - } + return false; +} - // add parameter types - int params = fptr->parameterCount(); - int parindex = 0; - DBusSignature::Params p; - bool params_ok = true; - while(parindex < params) - { - std::string partype(do_marshalling ? "(bsv)" : Y2Dtype(fptr->parameterType(parindex))); +DBusModulesServer::DBusModulesServer(const NameSpaceList &name_spaces) : e(this), manager_callback(this), wfm(NULL) +{ + init_wfm(); - if (!partype.empty()) - { - DBusArgument param("param", partype); - p.push_back(param); - } - else - { - y2warning("Function %s is not exported due to an unsupported parameter type", name); - params_ok = false; - break; - } + for (NameSpaceList::const_iterator it = name_spaces.begin(); + it != name_spaces.end(); + ++it) + { + importNamespace(*it); + } +} - parindex++; - } +DBusModulesServer::~DBusModulesServer() +{ + if (wfm != NULL) + { + y2milestone("Deleting WFM component"); + delete wfm; + wfm = NULL; + } +} - if (params_ok) - { - sig.params = p; - // register the function: register_function(object, interface, method, signature, handler) - register_method(it->first, interface_prefix, name, sig, e); - } - } - } +void DBusModulesServer::registerManager() +{ + DBusSignature::Params p; + DBusArgument param("module_name", DBUS_TYPE_STRING_AS_STRING); + p.push_back(param); + + DBusSignature sig; + sig.retval = DBusArgument("ret", DBUS_TYPE_BOOLEAN_AS_STRING); + sig.params = p; - index++; - } - } - } + // register the manager object: register_function(object, interface, method, signature, handler) + register_method("ModuleManager", "org.opensuse.yast.modules.ModuleManager", "Import", sig, manager_callback); } std::string DBusModulesServer::Y2Dtype(constTypePtr type) const @@ -233,8 +289,7 @@ bool DBusModulesServer::connect() { - registerFunctions("org.opensuse.yast.modules.YCPValues", true); - registerFunctions("org.opensuse.yast.modules.Values", false); + registerManager(); return DBusServerBase::connect(SYSTEM, "org.opensuse.yast.modules"); } @@ -454,6 +509,77 @@ return reply; } +DBusMsg DBusModulesServer::managerHandler(const DBusMsg &request) +{ + DBusMsg reply; + + std::string method(request.method()); + std::string object(request.path()); + std::string interface(request.interface()); + + y2internal("ModuleManager request: object: %s, method: %s, interface: %s", + object.c_str(), method.c_str(), interface.c_str()); + + YCPValue ret; + + if (object == "/ModuleManager") + { + if (interface == "org.opensuse.yast.modules.ModuleManager") + { + if (method == "Import") + { + if (request.arguments() == 1) + { + YCPValue arg = request.getYCPValue(0); + + if (arg.isNull()) + { + y2error("NULL parameter"); + } + else + { + if (arg->isString()) + { + std::string required_namespace(arg->asString()->value()); + + NameSpaceMap::const_iterator nsiter = nsmap.find(required_namespace); + if (nsiter != nsmap.end()) + { + ret = YCPBoolean(true); + } + else + { + bool retval = importNamespace(arg->asString()->value()); + + ret = YCPBoolean(retval); + } + } + else + { + y2error("Expecting 'string' parameter, got '%s'", Type::vt2type(arg->valuetype())->toString().c_str()); + } + } + + } + else + { + y2error("ModuleManager function %s got %d parameters instead of 1", method.c_str(), request.arguments()); + } + } + } + } + + reply.createReply(request); + + if (!ret.isNull()) + { + y2milestone("Result: %s", ret->toString().c_str()); + reply.addValue(ret); + } + + return reply; +} + std::string DBusModulesServer::createActionId(const DBusMsg &msg) { // actionId: <prefix>.<namespace>.<method> Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h Tue Feb 10 20:35:15 2009 @@ -48,8 +48,12 @@ // try to cast from a DBus value to the expected YCPValue YCPValue AutoCast(const YCPValue &value, constTypePtr requested_type); - // register the functions from the namespace to DBus service - void registerFunctions(const std::string &interface_prefix, bool do_marshalling); + // import a Yast namespace + bool importNamespace(const std::string &nspace); + bool registerFunction(const std::string &nspace, const char *fname, constFunctionTypePtr fptr); + bool registerNamespace(const Y2Namespace *ns); + + void registerManager(); DBusMsg handler(const DBusMsg &request); @@ -68,6 +72,24 @@ Callback e; + DBusMsg managerHandler(const DBusMsg &request); + + class ManagerCallback : public std::function<DBusMsg (const DBusMsg &request)> + { + DBusModulesServer *ms; + + public: + + ManagerCallback(DBusModulesServer *s) : ms(s) {} + ~ManagerCallback() {} + + DBusMsg operator()(const DBusMsg &request) + { return ms ? ms->managerHandler(request) : DBusMsg(); } + }; + + ManagerCallback manager_callback; + + Y2Component *wfm; void init_wfm(); Modified: branches/tmp/lslezak/core/dbus/namespace_service/modules_dbus_server.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/modules_dbus_server.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/modules_dbus_server.cc Tue Feb 10 20:35:15 2009 @@ -39,7 +39,7 @@ else badopts = true; - if (badopts || modules.empty()) + if (badopts) { y2error ("Usage: %s [--disable-timer] namespace <namespace> <namespace>....", argv[0]); std::cerr << "Usage: " << argv[0] << " [--disable-timer] namespace <namespace> <namespace>..." << std::endl; Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc Tue Feb 10 20:35:15 2009 @@ -853,7 +853,7 @@ ret = YCPVoid(); } - y2warning("Using RAW dbus value '%s' instead of YCPValue structure", ret->toString().c_str()); + y2milestone("Using RAW dbus value '%s' instead of (bsv) YCPValue structure", ret->toString().c_str()); return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55397 - /trunk/apparmor/src/include/subdomain/reporting_dialogues.ycp
by kmachalkova＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: kmachalkova Date: Tue Feb 10 17:54:02 2009 New Revision: 55397 URL: http://svn.opensuse.org/viewcvs/yast?rev=55397&view=rev Log: Make also report types translatable (bnc#371072) These bugs are driving me crazy. Too much work and too little gain. Grrr :( Modified: trunk/apparmor/src/include/subdomain/reporting_dialogues.ycp Modified: trunk/apparmor/src/include/subdomain/reporting_dialogues.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/r… ============================================================================== --- trunk/apparmor/src/include/subdomain/reporting_dialogues.ycp (original) +++ trunk/apparmor/src/include/subdomain/reporting_dialogues.ycp Tue Feb 10 17:54:02 2009 @@ -47,6 +47,43 @@ return ( hs == _("All")) ? "All" : hs ; } +string typeToHumanString( string type ) { + string ret = ""; + + switch ( type ) + { + case "Security.Incident.Report": + ret = _("Security Incident Report"); + break; + case "Applications.Audit": + ret = _("Applications Audit Report"); + break; + case "Executive.Security.Summary": + ret = _("Executive Security Summary"); + break; + default: + ret = type; + break; + } + + return ret; +} + +string humanStringToType( string hs ) { + string ret = ""; + + if( hs == _("Security Incident Report")) + ret = "Security.Incident.Report"; + else if ( hs == _("Applications Audit Report")) + ret = "Applications.Audit"; + else if ( hs == _("Executive Security Summary")) + ret = "Executive.Security.Summary"; + else + ret = hs; + + return ret; +} + // Grey out inappropriate paging buttons define void setPageButtons(integer curPage, integer lastPage) { @@ -1418,7 +1455,7 @@ define symbol displayRunForm() { integer itemselected = ((integer) UI::QueryWidget(`id(`table), `CurrentItem) ); - string name = (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 1, ""); + string name = humanStringToType( (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 1, "")); string type = ""; @@ -1895,7 +1932,7 @@ define void editSchedForm() { integer itemselected = ((integer) UI::QueryWidget(`id(`table), `CurrentItem) ); - string name = (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 1, ""); + string name = humanStringToType( (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 1, "")); map<string,string> Settings = $[ ]; string readSched = "1"; @@ -2024,7 +2061,7 @@ } - string edLabel = _("Edit Report Schedule for ") + sname; + string edLabel = _("Edit Report Schedule for ") + typeToHumanString(sname); UI::OpenDialog( @@ -2257,7 +2294,7 @@ define void delSchedForm() { integer itemselected = ((integer) UI::QueryWidget(`id(`table), `CurrentItem) ); - string name = (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 1, ""); + string name = humanStringToType( (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 1, "")); map<string,string> Settings = $[ ]; Settings["del"] = "1"; @@ -2316,7 +2353,7 @@ list <map> db = (list <map>) SCR::Read (.reports_sched, Settings); foreach ( map record, db, { - itemList = add( itemList, `item( `id(key), record["name"]:nil, record["mday"]:nil, record["wday"]:nil, + itemList = add( itemList, `item( `id(key), typeToHumanString( record["name"]:"" ), record["mday"]:nil, record["wday"]:nil, record["hour"]:nil, record["mins"]:nil )); key = key + 1; }); @@ -2365,7 +2402,7 @@ list <map> db = (list <map>) SCR::Read (.reports_sched, Settings); foreach ( map record, db, { - itemList = add( itemList, `item( `id(key), record["name"]:nil, record["mday"]:nil, record["wday"]:nil, + itemList = add( itemList, `item( `id(key), typeToHumanString( record["name"]:""), record["mday"]:nil, record["wday"]:nil, record["hour"]:nil, record["mins"]:nil )); key = key + 1; }); @@ -2435,7 +2472,8 @@ } else if ( id == `delete ) { integer itemselected = ((integer) UI::QueryWidget(`id(`table), `CurrentItem) ); - string repName = (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 1, ""); + string repName = humanStringToType( (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 1, "")); + y2milestone("makak vepri %1", repName); if ( repName == "Executive.Security.Summary" || repName == "Applications.Audit" || repName == "Security.Incident.Report" ) { Popup::Error( _("Cannot delete a stock report.") ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55396 - /branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc
by lslezak＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: lslezak Date: Tue Feb 10 16:34:17 2009 New Revision: 55396 URL: http://svn.opensuse.org/viewcvs/yast?rev=55396&view=rev Log: - DBus service - better error logging Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Tue Feb 10 16:34:17 2009 @@ -407,24 +407,24 @@ } else { - y2error("Wrong parameters to function %s", method.c_str()); + y2error("Wrong parameters to function %s::%s", object.c_str(), method.c_str()); } } } } else { - y2error("Function %s got %d parameters instead of %d", method.c_str(), request.arguments(), fptr->parameterCount()); + y2error("Function %s::%s got %d parameters instead of %d", object.c_str(), method.c_str(), request.arguments(), fptr->parameterCount()); } } else { - y2internal("Function %s was not found although it was registered", method.c_str()); + y2internal("Function %s::%s was not found although it was registered", object.c_str(), method.c_str()); } } else { - y2internal("Function %s was not found although it was registered", method.c_str()); + y2internal("Function %s::%s was not found although it was registered", object.c_str(), method.c_str()); } reply.createReply(request); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0