January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60621 - in /branches/SuSE-Code-11-SP1-Branch/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp
by locilka＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: locilka Date: Fri Jan 29 16:37:11 2010 New Revision: 60621 URL: http://svn.opensuse.org/viewcvs/yast?rev=60621&view=rev Log: - Raising a blocker in case of removing any product (except migration ones) by solver in proposal (BNC #575117). Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Fri Jan 29 16:37:11 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 29 16:35:00 CET 2010 - locilka(a)suse.cz + +- Raising a blocker in case of removing any product (except + migration ones) by solver in proposal (BNC #575117). + +------------------------------------------------------------------- Thu Jan 28 11:45:12 CET 2010 - locilka(a)suse.cz - Updated RPM dependencies (BNC #573482). Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Fri Jan 29 16:37:11 2010 @@ -308,8 +308,9 @@ return sformat (_("%1 (%2)"), display_name, name); } - string GetDistributionUpgradeSummary () { + global map <string, any> ProposalSummary () { string ret = ""; + string warning = ""; list <map <string,any> > products = sort ( map <string,any> x, map <string,any> y, Pkg::ResolvableProperties ("", `product, ""), @@ -322,6 +323,7 @@ string display_name = nil; string name = nil; + symbol transact_by = nil; // list of all products that will be installed (are selected) list <string> products_to_be_installed = []; @@ -334,6 +336,8 @@ // list of all products that will be upgraded list <string> products_to_be_upgraded = []; + integer products_removed_by_solver = 0; + // Products that are going to be removed foreach (map <string,any> product, products, { if (product["status"]:`unknown != `removed) return; @@ -341,6 +345,7 @@ product = MinimizeProductMap (product); display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined"); name = product["name"]:_("No short name defined"); + transact_by = product["transact_by"]:`unknown; // Removing product and installing the same one (name) means -> upgrade if (contains (products_to_be_installed, name)) { @@ -358,12 +363,22 @@ GetDisplayName (display_name, name) ) + "</li>\n"; // Removing another product might be an issue + // (nevertheless selected by user or directly by YaST) + } else if (transact_by == `user || transact_by == `app_high) { + y2warning ("Product will be removed: %1 (%2)", product, transact_by); + ret = ret + "<li>" + sformat ( + _("Warning: Product %1 will be removed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + // Not selected by user + // @see BNC #575117 } else { - y2warning ("Product will be removed: %1", product); + y2warning ("Product will be removed: %1 (%2)", product, transact_by); ret = ret + "<li>" + sformat ( - _("Warning: Product %1 will be removed"), + _("Error: Product %1 will be automatically removed"), GetDisplayName (display_name, name) ) + "</li>\n"; + products_removed_by_solver = products_removed_by_solver + 1; } }); @@ -407,19 +422,30 @@ ) + "</li>\n"; }); - return "<ul>\n" + ret + "</ul>\n"; - } - - global map <string, any> ProposalSummary () { - map <string, any> ret = $[]; + ret = "<ul>\n" + ret + "</ul>\n"; - ret = $[ - "preformatted_proposal" : GetDistributionUpgradeSummary(), + map <string, any> summary = $[ + "preformatted_proposal" : ret, // help text - "help" : _("To change update settings go to Software Proposal section."), + "help" : _("To change the update settings, go to Packages Proposal section."), ]; - return ret; + // Product removal MUST be confirmed by user, otherwise migration will not continue. + if (products_removed_by_solver > 0) { + summary["warning_level"] = `blocker; + summary["warning"] = "<ul>" + ( + products_removed_by_solver > 1 ? + sformat(_("<li>%1 products are going to be removed. +Go to packages proposal and solve the issue manually. +It it also safe to abort the migration now.</li>"), products_removed_by_solver) + : + _("<li>One product is going to be removed. +Go to packages proposal and solve the issue manually. +It it also safe to abort the migration now.</li>") + ) + "</ul>"; + } + + return summary; } global list <map <string, string> > ReadProductsBeforeMigration () { -- 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] r60620 - in /trunk/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp
by locilka＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: locilka Date: Fri Jan 29 16:36:52 2010 New Revision: 60620 URL: http://svn.opensuse.org/viewcvs/yast?rev=60620&view=rev Log: - Raising a blocker in case of removing any product (except migration ones) by solver in proposal (BNC #575117). Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/modules/Wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Fri Jan 29 16:36:52 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 29 16:35:00 CET 2010 - locilka(a)suse.cz + +- Raising a blocker in case of removing any product (except + migration ones) by solver in proposal (BNC #575117). + +------------------------------------------------------------------- Thu Jan 28 11:45:12 CET 2010 - locilka(a)suse.cz - Fixed reset-packager functionality (BNC #573575). Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Fri Jan 29 16:36:52 2010 @@ -308,8 +308,9 @@ return sformat (_("%1 (%2)"), display_name, name); } - string GetDistributionUpgradeSummary () { + global map <string, any> ProposalSummary () { string ret = ""; + string warning = ""; list <map <string,any> > products = sort ( map <string,any> x, map <string,any> y, Pkg::ResolvableProperties ("", `product, ""), @@ -322,6 +323,7 @@ string display_name = nil; string name = nil; + symbol transact_by = nil; // list of all products that will be installed (are selected) list <string> products_to_be_installed = []; @@ -334,6 +336,8 @@ // list of all products that will be upgraded list <string> products_to_be_upgraded = []; + integer products_removed_by_solver = 0; + // Products that are going to be removed foreach (map <string,any> product, products, { if (product["status"]:`unknown != `removed) return; @@ -341,6 +345,7 @@ product = MinimizeProductMap (product); display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined"); name = product["name"]:_("No short name defined"); + transact_by = product["transact_by"]:`unknown; // Removing product and installing the same one (name) means -> upgrade if (contains (products_to_be_installed, name)) { @@ -358,12 +363,22 @@ GetDisplayName (display_name, name) ) + "</li>\n"; // Removing another product might be an issue + // (nevertheless selected by user or directly by YaST) + } else if (transact_by == `user || transact_by == `app_high) { + y2warning ("Product will be removed: %1 (%2)", product, transact_by); + ret = ret + "<li>" + sformat ( + _("Warning: Product %1 will be removed"), + GetDisplayName (display_name, name) + ) + "</li>\n"; + // Not selected by user + // @see BNC #575117 } else { - y2warning ("Product will be removed: %1", product); + y2warning ("Product will be removed: %1 (%2)", product, transact_by); ret = ret + "<li>" + sformat ( - _("Warning: Product %1 will be removed"), + _("Error: Product %1 will be automatically removed"), GetDisplayName (display_name, name) ) + "</li>\n"; + products_removed_by_solver = products_removed_by_solver + 1; } }); @@ -407,19 +422,30 @@ ) + "</li>\n"; }); - return "<ul>\n" + ret + "</ul>\n"; - } - - global map <string, any> ProposalSummary () { - map <string, any> ret = $[]; + ret = "<ul>\n" + ret + "</ul>\n"; - ret = $[ - "preformatted_proposal" : GetDistributionUpgradeSummary(), + map <string, any> summary = $[ + "preformatted_proposal" : ret, // help text - "help" : _("To change update settings go to Software Proposal section."), + "help" : _("To change the update settings, go to Packages Proposal section."), ]; - return ret; + // Product removal MUST be confirmed by user, otherwise migration will not continue. + if (products_removed_by_solver > 0) { + summary["warning_level"] = `blocker; + summary["warning"] = "<ul>" + ( + products_removed_by_solver > 1 ? + sformat(_("<li>%1 products are going to be removed. +Go to packages proposal and solve the issue manually. +It it also safe to abort the migration now.</li>"), products_removed_by_solver) + : + _("<li>One product is going to be removed. +Go to packages proposal and solve the issue manually. +It it also safe to abort the migration now.</li>") + ) + "</ul>"; + } + + return summary; } global list <map <string, string> > ReadProductsBeforeMigration () { -- 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] r60619 - in /branches/tmp/bubli/qt: CMakeLists.txt RPMNAME
by kmachalkova＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: kmachalkova Date: Fri Jan 29 15:21:40 2010 New Revision: 60619 URL: http://svn.opensuse.org/viewcvs/yast?rev=60619&view=rev Log: Rename Modified: branches/tmp/bubli/qt/CMakeLists.txt branches/tmp/bubli/qt/RPMNAME Modified: branches/tmp/bubli/qt/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/qt/CMakeLists.txt?r… ============================================================================== --- branches/tmp/bubli/qt/CMakeLists.txt (original) +++ branches/tmp/bubli/qt/CMakeLists.txt Fri Jan 29 15:21:40 2010 @@ -8,13 +8,13 @@ SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall" ) set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG -DNDEBUG") -SET( RPMNAME "yast2-qt" ) +SET( RPMNAME "libyui-qt" ) FIND_PACKAGE(Qt4 REQUIRED) FIND_PACKAGE(Libyui REQUIRED) SET(CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/share/YaST2/data/devtools/cmake/modules" ${CMAKE_MODULE_PATH}) INCLUDE(YastCommon) -SET(YAST_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/YaST2) +SET(YAST_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/yui) SET(Y2QT_ICONDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/theme/current) SET(Y2QT_LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/locale) Modified: branches/tmp/bubli/qt/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/qt/RPMNAME?rev=6061… ============================================================================== --- branches/tmp/bubli/qt/RPMNAME (original) +++ branches/tmp/bubli/qt/RPMNAME Fri Jan 29 15:21:40 2010 @@ -1 +1 @@ -yast2-qt +libyui-qt -- 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] r60618 - in /branches/tmp/bubli/libyui: cmake/FindLibyui.cmake configure.in libyui.spec.in
by kmachalkova＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: kmachalkova Date: Fri Jan 29 15:21:06 2010 New Revision: 60618 URL: http://svn.opensuse.org/viewcvs/yast?rev=60618&view=rev Log: new includedir, new plugindir Modified: branches/tmp/bubli/libyui/cmake/FindLibyui.cmake branches/tmp/bubli/libyui/configure.in branches/tmp/bubli/libyui/libyui.spec.in Modified: branches/tmp/bubli/libyui/cmake/FindLibyui.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/cmake/FindLi… ============================================================================== --- branches/tmp/bubli/libyui/cmake/FindLibyui.cmake (original) +++ branches/tmp/bubli/libyui/cmake/FindLibyui.cmake Fri Jan 29 15:21:06 2010 @@ -24,12 +24,12 @@ ENDIF ( DEFINED LIB ) MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" ) -SET(UI_PLUGIN_DIR ${LIB_INSTALL_DIR}/YaST2/plugin) +SET(UI_PLUGIN_DIR ${LIB_INSTALL_DIR}/yui) FIND_PATH(LIBYUI_INCLUDE_DIR YWidget.h - ${CMAKE_INSTALL_PREFIX}/include/YaST2/yui - /usr/include/YaST2/yui - /usr/local/include/YaST2/yui + ${CMAKE_INSTALL_PREFIX}/include/yui + /usr/include/yui + /usr/local/include/yui ) FIND_LIBRARY(LIBYUI_LIBRARY NAMES yui Modified: branches/tmp/bubli/libyui/configure.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/configure.in… ============================================================================== --- branches/tmp/bubli/libyui/configure.in (original) +++ branches/tmp/bubli/libyui/configure.in Fri Jan 29 15:21:06 2010 @@ -19,9 +19,9 @@ CXXFLAGS="${CXXFLAGS} -std=gnu++0x -DHAVE_CXX0X -Wall -Wformat=2 -Wnon-virtual-dtor" docdir=\${prefix}/share/doc/packages/libyui -includedir=\${prefix}/include/YaST2 +includedir=\${prefix}/include/ pkgconfigdir=\${libdir}/pkgconfig -plugindir=\${libdir}/YaST2/plugin +plugindir=\${libdir}/yui/ themedir=\${prefix}/share/YaST2/theme/ AC_SUBST(VERSION) Modified: branches/tmp/bubli/libyui/libyui.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/libyui.spec.… ============================================================================== --- branches/tmp/bubli/libyui/libyui.spec.in (original) +++ branches/tmp/bubli/libyui/libyui.spec.in Fri Jan 29 15:21:06 2010 @@ -92,7 +92,7 @@ %defattr(-,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la -%{_prefix}/include/YaST2 +%{_prefix}/include/yui %{_libdir}/pkgconfig/libyui.pc %dir %{_datadir}/cmake %dir %{_datadir}/cmake/Modules -- 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] r60617 - /trunk/printer/tools/
by jsmeix＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: jsmeix Date: Fri Jan 29 14:50:42 2010 New Revision: 60617 URL: http://svn.opensuse.org/viewcvs/yast?rev=60617&view=rev Log: In none of the bash scripts for yast2-printer bash globbing is needed. Actually in all those scripts no bash globbing should happen. Therefore I added to all those scripts a "set -f" line (bnc #575056). Modified: trunk/printer/tools/autodetect_print_queues trunk/printer/tools/autodetect_printers trunk/printer/tools/create_printer_ppd_database trunk/printer/tools/cups_client_only trunk/printer/tools/determine_printer_driver_options trunk/printer/tools/modify_cupsd_conf trunk/printer/tools/test_device trunk/printer/tools/test_remote_ipp trunk/printer/tools/test_remote_lpd trunk/printer/tools/test_remote_novell trunk/printer/tools/test_remote_smb trunk/printer/tools/test_remote_socket Modified: trunk/printer/tools/autodetect_print_queues URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/autodetect_print_q… ============================================================================== --- trunk/printer/tools/autodetect_print_queues (original) +++ trunk/printer/tools/autodetect_print_queues Fri Jan 29 14:50:42 2010 @@ -1,13 +1,16 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010 #set -x +# Make sure to have a clean environment: export PATH="/sbin:/usr/sbin:/usr/bin:/bin" export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f MY_NAME=${0##*/} Modified: trunk/printer/tools/autodetect_printers URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/autodetect_printer… ============================================================================== --- trunk/printer/tools/autodetect_printers (original) +++ trunk/printer/tools/autodetect_printers Fri Jan 29 14:50:42 2010 @@ -1,13 +1,16 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010 #set -x +# Make sure to have a clean environment: export PATH="/sbin:/usr/sbin:/usr/bin:/bin" export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f # This file name for a progress indicator is also used in Printer.ycp: test -z "$PROGRESS" && PROGRESS="/var/lib/YaST2/autodetect_printers.progress" Modified: trunk/printer/tools/create_printer_ppd_database URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/create_printer_ppd… ============================================================================== --- trunk/printer/tools/create_printer_ppd_database (original) +++ trunk/printer/tools/create_printer_ppd_database Fri Jan 29 14:50:42 2010 @@ -1,13 +1,16 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010 #set -x +# Make sure to have a clean environment: export PATH="/sbin:/usr/sbin:/usr/bin:/bin" export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f # This file name for a progress indicator is also used in Printer.ycp: test -z "$PROGRESS" && PROGRESS="/var/lib/YaST2/create_printer_ppd_database.progress" Modified: trunk/printer/tools/cups_client_only URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/cups_client_only?r… ============================================================================== --- trunk/printer/tools/cups_client_only (original) +++ trunk/printer/tools/cups_client_only Fri Jan 29 14:50:42 2010 @@ -1,13 +1,16 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010 #set -x +# Make sure to have a clean environment: export PATH="/sbin:/usr/sbin:/usr/bin:/bin" export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f # When 'localhost' or its IP-address is to be set, # it is unified so that only 'localhost' or '127.0.0.1' are set Modified: trunk/printer/tools/determine_printer_driver_options URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/determine_printer_… ============================================================================== --- trunk/printer/tools/determine_printer_driver_options (original) +++ trunk/printer/tools/determine_printer_driver_options Fri Jan 29 14:50:42 2010 @@ -1,13 +1,16 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010 #set -x +# Make sure to have a clean environment: export PATH="/sbin:/usr/sbin:/usr/bin:/bin" export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f MY_NAME=${0##*/} QUEUE="$1" Modified: trunk/printer/tools/modify_cupsd_conf URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/modify_cupsd_conf?… ============================================================================== --- trunk/printer/tools/modify_cupsd_conf (original) +++ trunk/printer/tools/modify_cupsd_conf Fri Jan 29 14:50:42 2010 @@ -1,13 +1,16 @@ #! /bin/bash # -# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2007, 2008, 2009, 2010 #set -x +# Make sure to have a clean environment: export PATH="/sbin:/usr/sbin:/usr/bin:/bin" export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f MY_NAME=${0##*/} CUPSDCONF="/etc/cups/cupsd.conf" Modified: trunk/printer/tools/test_device URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_device?rev=60… ============================================================================== --- trunk/printer/tools/test_device (original) +++ trunk/printer/tools/test_device Fri Jan 29 14:50:42 2010 @@ -6,15 +6,18 @@ # 2 problems while writing to $2 # # Jan Holesovsky <kendy(a)suse.cz>, 2000 -# Johannes Meixner <jsmeix(a)suse.de>, 2008 +# Johannes Meixner <jsmeix(a)suse.de>, 2008, 2010 # $Id: test_device 2928 2002-06-27 08:53:17Z jsrain $ #set -x +# Make sure to have a clean environment: export PATH="/sbin:/usr/sbin:/usr/bin:/bin" export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f EXITCODE=2 trap "EXITCODE=0" 10 Modified: trunk/printer/tools/test_remote_ipp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_ipp?re… ============================================================================== --- trunk/printer/tools/test_remote_ipp (original) +++ trunk/printer/tools/test_remote_ipp Fri Jan 29 14:50:42 2010 @@ -13,7 +13,7 @@ # 15 lp not executable (no cups-client RPM installed?) # The program head is in the coreutils RPM and therefore assumed to exist. # -# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009, 2010 # Jan Holesovsky <kendy(a)suse.cz>, 2000 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id: test_remote_ipp 43943 2008-01-28 13:38:58Z mzugec $ @@ -25,6 +25,8 @@ export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f # Use the binaries of the operating system (no aliases, functions, /usr/local/): export PING=$( type -ap ping | head -n 1 ) Modified: trunk/printer/tools/test_remote_lpd URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_lpd?re… ============================================================================== --- trunk/printer/tools/test_remote_lpd (original) +++ trunk/printer/tools/test_remote_lpd Fri Jan 29 14:50:42 2010 @@ -18,7 +18,7 @@ # since Suse Linux 11.0 /bin/mktemp is in the coreutils RPM which is required by YaST # The programs head, mkfifo, sleep, tr, rm are in the coreutils RPM and therefore assumed to exist. # -# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009, 2010 # Jan Holesovsky <kendy(a)suse.cz>, 2000 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id: test_remote_lpd 43943 2008-01-28 13:38:58Z mzugec $ @@ -30,6 +30,8 @@ export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f # Use the binaries of the operating system (no aliases, functions, /usr/local/): export PING=$( type -ap ping | head -n 1 ) Modified: trunk/printer/tools/test_remote_novell URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_novell… ============================================================================== --- trunk/printer/tools/test_remote_novell (original) +++ trunk/printer/tools/test_remote_novell Fri Jan 29 14:50:42 2010 @@ -8,7 +8,7 @@ # (10=ping,11=netcat,12=fuser,13=mktemp,14=sed,15=lp,16=smbclient: see test_remote_smb) # 17 nprint not executable (no ncpfs RPM installed?) # -# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009, 2010 # Jan Holesovsky <kendy(a)suse.cz>, 2000 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id: test_remote_novell 43943 2008-01-28 13:38:58Z mzugec $ @@ -20,6 +20,8 @@ export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f # Use the binaries of the operating system (no aliases, functions, /usr/local/): export NPRINT=$( type -ap nprint | head -n 1 ) Modified: trunk/printer/tools/test_remote_smb URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_smb?re… ============================================================================== --- trunk/printer/tools/test_remote_smb (original) +++ trunk/printer/tools/test_remote_smb Fri Jan 29 14:50:42 2010 @@ -11,7 +11,7 @@ # 16 smbclient not executable (no samba-client RPM installed?) # The programs head, mkfifo, sleep, tr, rm are in the coreutils RPM and therefore assumed to exist. # -# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007, 2008, 2009, 2010 # Jan Holesovsky <kendy(a)suse.cz>, 2000 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id: test_remote_smb 43943 2008-01-28 13:38:58Z mzugec $ @@ -23,6 +23,8 @@ export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f # Use the binaries of the operating system (no aliases, functions, /usr/local/): export PING=$( type -ap ping | head -n 1 ) Modified: trunk/printer/tools/test_remote_socket URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_socket… ============================================================================== --- trunk/printer/tools/test_remote_socket (original) +++ trunk/printer/tools/test_remote_socket Fri Jan 29 14:50:42 2010 @@ -11,7 +11,7 @@ # 11 netcat not executable (no netcat RPM installed?) # The program head is in the coreutils RPM and therefore assumed to exist. # -# Johannes Meixner <jsmeix(a)suse.de> 2002, 2007, 2008, 2009 +# Johannes Meixner <jsmeix(a)suse.de> 2002, 2007, 2008, 2009, 2010 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id: test_remote_socket 43943 2008-01-28 13:38:58Z mzugec $ @@ -22,6 +22,8 @@ export LC_ALL="POSIX" export LANG="POSIX" umask 022 +# Disable bash file name globbing: +set -f # Use the binaries of the operating system (no aliases, functions, /usr/local/): export PING=$( type -ap ping | head -n 1 ) -- 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] r60616 - /branches/tmp/bubli/qt/
by kmachalkova＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: kmachalkova Date: Fri Jan 29 13:33:07 2010 New Revision: 60616 URL: http://svn.opensuse.org/viewcvs/yast?rev=60616&view=rev Log: de-yastify qt Added: branches/tmp/bubli/qt/ (props changed) - copied from r60615, trunk/qt/ -- 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] r60615 - in /trunk/gtk: ChangeLog src/YGTable.cc src/YGUI.cc
by rpmcruz＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: rpmcruz Date: Fri Jan 29 13:17:42 2010 New Revision: 60615 URL: http://svn.opensuse.org/viewcvs/yast?rev=60615&view=rev Log: * src/YGTable.cc: bug fix 567505: crash when cell is unset: see firewall tool. * src/YGUI.cc: bug fix 547261: work around broken metacity icon by defaulting to the generic yast2 icon. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGTable.cc trunk/gtk/src/YGUI.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60615&r1=60614… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Jan 29 13:17:42 2010 @@ -1,3 +1,11 @@ +2010-01-29 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGTable.cc: bug fix 567505: crash when cell is + unset: see firewall tool. + + * src/YGUI.cc: bug fix 547261: work around broken metacity + icon by defaulting to the generic yast2 icon. + 2010-01-27 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/YGPackageSelector.cc: added --embold-installed-row Modified: trunk/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTable.cc?rev=60615&r1=… ============================================================================== --- trunk/gtk/src/YGTable.cc (original) +++ trunk/gtk/src/YGTable.cc Fri Jan 29 13:17:42 2010 @@ -295,16 +295,20 @@ { GtkTreeIter iter; if (getIter (cell->parent(), &iter)) - setCell (&iter, cell); + setCell (&iter, cell->column(), cell); } - void setCell (GtkTreeIter *iter, const YTableCell *cell) + void setCell (GtkTreeIter *iter, int column, const YTableCell *cell) { - int index = cell->column() * 2; - setCellIcon (iter, index, cell->iconName()); - std::string label (cell->label()); - if (label == "X") - label = YUI::app()->glyph (YUIGlyph_CheckMark); + int index = column * 2; + std::string icon, label; + if (cell) { + icon = cell->iconName(); + label = cell->label(); + if (label == "X") + label = YUI::app()->glyph (YUIGlyph_CheckMark); + } + setCellIcon (iter, index, icon); setCellLabel (iter, index+1, label); } @@ -350,7 +354,7 @@ GtkTreeIter iter; addRow (&iter, _item, true); for (int i = 0; i < columns(); i++) - setCell (&iter, item->cell (i)); + setCell (&iter, i, item->cell (i)); } else yuiError() << "Can only add YTableItems to a YTable.\n"; Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=60615&r1=606… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Fri Jan 29 13:17:42 2010 @@ -153,6 +153,12 @@ g_log_set_always_fatal (GLogLevelFlags (G_LOG_LEVEL_ERROR|G_LOG_LEVEL_CRITICAL| G_LOG_LEVEL_WARNING| G_LOG_LEVEL_MESSAGE|G_LOG_LEVEL_INFO|G_LOG_LEVEL_DEBUG)); #endif + + GdkPixbuf *pixbuf = YGUtils::loadPixbuf (THEMEDIR "/icons/32x32/apps/yast.png"); + if (pixbuf) { // default window icon + gtk_window_set_default_icon (pixbuf); + g_object_unref (G_OBJECT (pixbuf)); + } } static gboolean ycp_wakeup_fn (GIOChannel *source, GIOCondition condition, -- 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] r60614 - in /branches/SuSE-Code-11-SP1-Branch/gtk: VERSION package/yast2-gtk.changes
by rpmcruz＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: rpmcruz Date: Fri Jan 29 13:04:38 2010 New Revision: 60614 URL: http://svn.opensuse.org/viewcvs/yast?rev=60614&view=rev Log: Package coming! Modified: branches/SuSE-Code-11-SP1-Branch/gtk/VERSION branches/SuSE-Code-11-SP1-Branch/gtk/package/yast2-gtk.changes Modified: branches/SuSE-Code-11-SP1-Branch/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/V… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/gtk/VERSION Fri Jan 29 13:04:38 2010 @@ -1 +1 @@ -2.17.15 +2.17.16 Modified: branches/SuSE-Code-11-SP1-Branch/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/p… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/package/yast2-gtk.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/gtk/package/yast2-gtk.changes Fri Jan 29 13:04:38 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 29 13:00:00 CET 2009 - mkudlvasr(a)novell.com + +- crash on firewall tool (bnc#567505) +- Version 2.17.16 + + +------------------------------------------------------------------- Wed Nov 11 14:45:12 CET 2009 - mkudlvasr(a)novell.com - backport PackageSelector and zyppwrapper changes from 11.2 -- 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] r60613 - in /branches/SuSE-Code-11-Branch/gtk: ChangeLog src/YGTable.cc
by rpmcruz＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: rpmcruz Date: Fri Jan 29 13:00:08 2010 New Revision: 60613 URL: http://svn.opensuse.org/viewcvs/yast?rev=60613&view=rev Log: * src/YGTable.cc: bug fix 567505: crash when cell is unset: see firewall tool. Modified: branches/SuSE-Code-11-Branch/gtk/ChangeLog branches/SuSE-Code-11-Branch/gtk/src/YGTable.cc Modified: branches/SuSE-Code-11-Branch/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/Chang… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/ChangeLog (original) +++ branches/SuSE-Code-11-Branch/gtk/ChangeLog Fri Jan 29 13:00:08 2010 @@ -1,3 +1,8 @@ +2010-01-29 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGTable.cc: bug fix 567505: crash when cell is + unset: see firewall tool. + 2009-07-18 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/yzyppwrapper.cc: bug fix 504424: don't crash on empty Modified: branches/SuSE-Code-11-Branch/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/gtk/src/Y… ============================================================================== --- branches/SuSE-Code-11-Branch/gtk/src/YGTable.cc (original) +++ branches/SuSE-Code-11-Branch/gtk/src/YGTable.cc Fri Jan 29 13:00:08 2010 @@ -2,22 +2,22 @@ * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ -#include <config.h> -#include <YGUI.h> +#define YUILogComponent "gtk" +#include "config.h" +#include "YGUI.h" #include "YGUtils.h" #include "YGWidget.h" #include "YSelectionWidget.h" #include "YGSelectionModel.h" #include "ygtkcellrenderertextpixbuf.h" #include "ygtkscrolledwindow.h" -#include <time.h> /* A generic widget for table related widgets. */ class YGTableView : public YGScrolledWidget, public YGSelectionModel { protected: int m_colsNb; - time_t m_blockTime; // GtkTreeSelection signals act weird + guint m_blockTimeout; public: YGTableView (YWidget *ywidget, YWidget *parent, const string &label, @@ -26,8 +26,6 @@ YGTK_TYPE_TREE_VIEW, NULL) , YGSelectionModel ((YSelectionWidget *) ywidget, ordinaryModel, isTree) { - IMPL - m_blockTime = time (NULL); if (ordinaryModel) { appendIconTextColumn ("", YAlignUnchanged, YGSelectionModel::ICON_COLUMN, YGSelectionModel::LABEL_COLUMN); @@ -41,6 +39,14 @@ gtk_tree_selection_set_mode (getSelection(), GTK_SELECTION_BROWSE); // let the derivates do the event hooks. They have subtile differences. + + m_blockTimeout = 0; // GtkTreeSelection idiotically fires when showing widget + g_signal_connect (getWidget(), "map", G_CALLBACK (block_init_cb), this); + } + + virtual ~YGTableView() + { + if (m_blockTimeout) g_source_remove (m_blockTimeout); } inline GtkTreeView *getView() @@ -50,7 +56,6 @@ void appendIconTextColumn (string header, YAlignmentType align, int icon_col, int text_col) { - IMPL GtkTreeViewColumn *column; GtkCellRenderer *renderer; @@ -108,12 +113,24 @@ virtual bool immediateEvent() { return true; } - // YGSelectionModel + static gboolean block_selected_timeout_cb (gpointer data) + { + YGTableView *pThis = (YGTableView *) data; + pThis->m_blockTimeout = 0; + return FALSE; + } + + void blockSelected() + { // GtkTreeSelection only fires when idle; so set a timeout + if (m_blockTimeout) g_source_remove (m_blockTimeout); + m_blockTimeout = g_timeout_add_full (G_PRIORITY_LOW, 250, block_selected_timeout_cb, this, NULL); + } + // YGSelectionModel virtual void doSelectItem (GtkTreeIter *iter) { if (!gtk_tree_selection_iter_is_selected (getSelection(), iter)) { - m_blockTime = time (NULL); + blockSelected(); GtkTreePath *path = gtk_tree_model_get_path (getModel(), iter); gtk_tree_view_expand_to_path (getView(), path); @@ -128,7 +145,7 @@ virtual void doUnselectAll() { if (gtk_tree_selection_count_selected_rows (getSelection())) { - m_blockTime = time (NULL); + blockSelected(); gtk_tree_selection_unselect_all (getSelection()); } } @@ -156,11 +173,13 @@ return 80; } -protected: + // GTK callbacks + static void block_init_cb (GtkWidget *widget, YGTableView *pThis) + { pThis->blockSelected(); } + // toggled by user (through clicking on the renderer or some other action) void toggle (GtkTreePath *path, gint column) { - IMPL GtkTreeIter iter; if (!gtk_tree_model_get_iter (getModel(), &iter, path)) return; @@ -175,7 +194,7 @@ static void selection_changed_cb (GtkTreeSelection *selection, YGTableView *pThis) { - if (time (NULL) - pThis->m_blockTime <= 2) + if (pThis->m_blockTimeout) return; if (!pThis->toggleMode()) { GtkTreeSelection *selection = pThis->getSelection(); @@ -200,17 +219,24 @@ static void toggled_cb (GtkCellRendererToggle *renderer, gchar *path_str, YGTableView *pThis) { - IMPL GtkTreePath *path = gtk_tree_path_new_from_string (path_str); gint column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (renderer), "column")); pThis->toggle (path, column); gtk_tree_path_free (path); } + +#if YAST2_VERSION > 2018003 + static void right_click_cb (YGtkTreeView *view, gboolean outreach, YGTableView *pThis) + { + pThis->emitEvent (YEvent::ContextMenuActivated); + } +#endif }; #include "YTable.h" #include "YGDialog.h" #include <gdk/gdkkeysyms.h> +#include <string.h> class YGTable : public YTable, public YGTableView { @@ -224,7 +250,6 @@ #endif , YGTableView (this, parent, string(), false, false) { - IMPL gtk_tree_view_set_headers_visible (getView(), TRUE); gtk_tree_view_set_rules_hint (getView(), columns() > 1); #if YAST2_VERSION >= 2017005 @@ -251,7 +276,7 @@ connect (getWidget(), "row-activated", G_CALLBACK (activated_cb), (YGTableView *) this); connect (getSelection(), "changed", G_CALLBACK (selection_changed_cb), (YGTableView *) this); - connect (getWidget(), "right-click", G_CALLBACK (right_click_cb), this); + connect (getWidget(), "right-click", G_CALLBACK (hack_right_click_cb), this); connect (getWidget(), "key-press-event", G_CALLBACK (key_press_event_cb), this); } @@ -270,22 +295,25 @@ { GtkTreeIter iter; if (getIter (cell->parent(), &iter)) - setCell (&iter, cell); + setCell (&iter, cell->column(), cell); } - void setCell (GtkTreeIter *iter, const YTableCell *cell) + void setCell (GtkTreeIter *iter, int column, const YTableCell *cell) { - int index = cell->column() * 2; - setCellIcon (iter, index, cell->iconName()); - std::string label (cell->label()); - if (label == "X") - label = YUI::app()->glyph (YUIGlyph_CheckMark); + int index = column * 2; + std::string icon, label; + if (cell) { + icon = cell->iconName(); + label = cell->label(); + if (label == "X") + label = YUI::app()->glyph (YUIGlyph_CheckMark); + } + setCellIcon (iter, index, icon); setCellLabel (iter, index+1, label); } void setSortable (bool sortable) { - IMPL if (!sortable && !GTK_WIDGET_REALIZED (getWidget())) return; int n = 0; @@ -298,6 +326,9 @@ int index = (n*2)+1; if (!sortable) index = -1; + gtk_tree_sortable_set_sort_func ( + GTK_TREE_SORTABLE (getModel()), index, tree_sort_cb, + GINT_TO_POINTER (index), NULL); gtk_tree_view_column_set_sort_column_id (column, index); } else @@ -314,8 +345,6 @@ virtual unsigned int getMinSize (YUIDimension dim) { return 30; } - YGWIDGET_IMPL_COMMON (YTable) - // YGSelectionModel virtual void doAddItem (YItem *_item) @@ -325,14 +354,12 @@ GtkTreeIter iter; addRow (&iter, _item, true); for (int i = 0; i < columns(); i++) - setCell (&iter, item->cell (i)); + setCell (&iter, i, item->cell (i)); } else yuiError() << "Can only add YTableItems to a YTable.\n"; } - YGSELECTION_WIDGET_IMPL (YTable) - // callbacks // hack up a popup menu and honor the delete key as suggested at: @@ -343,8 +370,12 @@ YGUI::ui()->sendEvent (event); } - static void right_click_cb (YGtkTreeView *view, gboolean outreach, YGTable *pThis) + static void hack_right_click_cb (YGtkTreeView *view, gboolean outreach, YGTable *pThis) { +#if YAST2_VERSION > 2018003 + if (pThis->notifyContextMenu()) + return YGTableView::right_click_cb (view, outreach, pThis); +#endif if (!YGDialog::currentDialog()->getFunctionWidget (5) || // undetermined case -- more than one table exists YGDialog::currentDialog()->getClassWidgets ("YTable").size() > 1) { @@ -391,6 +422,21 @@ return FALSE; } + static gint tree_sort_cb (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, + gpointer _index) + { + int index = GPOINTER_TO_INT (_index); + gchar *str_a, *str_b; + gtk_tree_model_get (model, a, index, &str_a, -1); + gtk_tree_model_get (model, b, index, &str_b, -1); + int ret = strcmp (str_a, str_b); + g_free (str_a); + g_free (str_b); + return ret; + } + + YGLABEL_WIDGET_IMPL (YTable) + YGSELECTION_WIDGET_IMPL (YTable) }; #if YAST2_VERSION >= 2017005 @@ -417,19 +463,19 @@ { connect (getWidget(), "row-activated", G_CALLBACK (activated_cb), (YGTableView *) this); connect (getSelection(), "changed", G_CALLBACK (selection_changed_cb), (YGTableView *) this); +#if YAST2_VERSION > 2018003 + connect (getWidget(), "right-click", G_CALLBACK (right_click_cb), this); +#endif } virtual bool isShrinkable() { return shrinkable(); } - YGWIDGET_IMPL_COMMON (YSelectionBox) + YGLABEL_WIDGET_IMPL (YSelectionBox) YGSELECTION_WIDGET_IMPL (YSelectionBox) }; YSelectionBox *YGWidgetFactory::createSelectionBox (YWidget *parent, const string &label) -{ - IMPL - return new YGSelectionBox (parent, label); -} +{ return new YGSelectionBox (parent, label); } #include "YMultiSelectionBox.h" @@ -447,11 +493,15 @@ createModel (types); appendCheckColumn ("", 0); appendIconTextColumn ("", YAlignUnchanged, 1, 2); + gtk_tree_view_set_search_column (getView(), 2); setModel(); connect (getSelection(), "changed", G_CALLBACK (selection_changed_cb), (YGTableView *) this); // Let the user toggle, using space/enter or double click (not an event). connect (getWidget(), "row-activated", G_CALLBACK (multi_activated_cb), this); +#if YAST2_VERSION > 2018003 + connect (getWidget(), "right-click", G_CALLBACK (right_click_cb), this); +#endif } // YMultiSelectionBox @@ -484,7 +534,6 @@ { pThis->toggle (path, 0); } // YGSelectionModel - virtual void doSelectItem (GtkTreeIter *iter) { setCellToggle (iter, 0, true); @@ -501,18 +550,14 @@ } // YGWidget - virtual bool isShrinkable() { return shrinkable(); } - YGWIDGET_IMPL_COMMON (YMultiSelectionBox) + + YGLABEL_WIDGET_IMPL (YMultiSelectionBox) YGSELECTION_WIDGET_IMPL (YMultiSelectionBox) }; -YMultiSelectionBox *YGWidgetFactory::createMultiSelectionBox (YWidget *parent, - const string &label) -{ - IMPL - return new YGMultiSelectionBox (parent, label); -} +YMultiSelectionBox *YGWidgetFactory::createMultiSelectionBox (YWidget *parent, const string &label) +{ return new YGMultiSelectionBox (parent, label); } #include "YTree.h" #include "YTreeItem.h" @@ -528,6 +573,9 @@ connect (getWidget(), "row-expanded", G_CALLBACK (row_expanded_cb), this); connect (getWidget(), "cursor-changed", G_CALLBACK (row_selected_cb), this); connect (getWidget(), "row-activated", G_CALLBACK (activated_cb), (YGTableView *) this); +#if YAST2_VERSION > 2018003 + connect (getWidget(), "right-click", G_CALLBACK (right_click_cb), this); +#endif } // YTree -- 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] r60612 - in /branches/SuSE-Code-11-SP1-Branch/gtk: ChangeLog src/YGTable.cc
by rpmcruz＠svn.opensuse.org 29 Jan '10

29 Jan '10

Author: rpmcruz Date: Fri Jan 29 12:59:42 2010 New Revision: 60612 URL: http://svn.opensuse.org/viewcvs/yast?rev=60612&view=rev Log: * src/YGTable.cc: bug fix 567505: crash when cell is unset: see firewall tool. Modified: branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog branches/SuSE-Code-11-SP1-Branch/gtk/src/YGTable.cc Modified: branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/C… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog (original) +++ branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog Fri Jan 29 12:59:42 2010 @@ -1,3 +1,7 @@ +2010-01-29 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGTable.cc: bug fix 567505: definite fix. + 2010-01-19 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGTable.cc: bug fix 567505: simply backported SVN code. Modified: branches/SuSE-Code-11-SP1-Branch/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/src/YGTable.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/gtk/src/YGTable.cc Fri Jan 29 12:59:42 2010 @@ -295,16 +295,20 @@ { GtkTreeIter iter; if (getIter (cell->parent(), &iter)) - setCell (&iter, cell); + setCell (&iter, cell->column(), cell); } - void setCell (GtkTreeIter *iter, const YTableCell *cell) + void setCell (GtkTreeIter *iter, int column, const YTableCell *cell) { - int index = cell->column() * 2; - setCellIcon (iter, index, cell->iconName()); - std::string label (cell->label()); - if (label == "X") - label = YUI::app()->glyph (YUIGlyph_CheckMark); + int index = column * 2; + std::string icon, label; + if (cell) { + icon = cell->iconName(); + label = cell->label(); + if (label == "X") + label = YUI::app()->glyph (YUIGlyph_CheckMark); + } + setCellIcon (iter, index, icon); setCellLabel (iter, index+1, label); } @@ -350,7 +354,7 @@ GtkTreeIter iter; addRow (&iter, _item, true); for (int i = 0; i < columns(); i++) - setCell (&iter, item->cell (i)); + setCell (&iter, i, item->cell (i)); } else yuiError() << "Can only add YTableItems to a YTable.\n"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0