Author: rpmcruz
Date: Fri Mar 5 00:42:17 2010
New Revision: 61159
URL: http://svn.opensuse.org/viewcvs/yast?rev=61159&view=rev
Log:
* src/pkg/ygtkpkgfilterview.cc & src/pkg/yzyppwrapper.cc:
enable multi-version code.
Modified:
trunk/gtk/ChangeLog
trunk/gtk/src/pkg/ygtkpkgfilterview.cc
trunk/gtk/src/pkg/yzyppwrapper.cc
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=61159&r1=61158&r2=61159&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Fri Mar 5 00:42:17 2010
@@ -3,6 +3,9 @@
* src/YGWidget.cc: bug fix 583228: misplacing colon
when using English text on Arabic layout.
+ * src/pkg/ygtkpkgfilterview.cc & src/pkg/yzyppwrapper.cc:
+ enable multi-version code.
+
2010-03-03 Ricardo Cruz
* src/YGUI.cc: bug fix 582148: a few strings should be
Modified: trunk/gtk/src/pkg/ygtkpkgfilterview.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgfilterview.cc?rev=61159&r1=61158&r2=61159&view=diff
==============================================================================
--- trunk/gtk/src/pkg/ygtkpkgfilterview.cc (original)
+++ trunk/gtk/src/pkg/ygtkpkgfilterview.cc Fri Mar 5 00:42:17 2010
@@ -278,7 +278,11 @@
addRow (it->icon, it->name, true, GINT_TO_POINTER (((int)it->id)+1));
for (int i = YPKG_GROUP_UNKNOWN; i < YPKG_GROUP_TOTAL; i++) {
- if (i == YPKG_GROUP_MULTIVERSION /* && zypp::sat::Pool::instance().multiversionEmpty() */)
+#if ZYPP_VERSION >= 6030004
+ if (i == YPKG_GROUP_MULTIVERSION && zypp::sat::Pool::instance().multiversionEmpty())
+#else
+ if (i == YPKG_GROUP_MULTIVERSION)
+#endif
continue;
if (i == YPKG_GROUP_ORPHANED) continue;
std::string name = zypp_tag_group_enum_to_localised_text ((YPkgGroupEnum) i);
Modified: trunk/gtk/src/pkg/yzyppwrapper.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzyppwrapper.cc?rev=61159&r1=61158&r2=61159&view=diff
==============================================================================
--- trunk/gtk/src/pkg/yzyppwrapper.cc (original)
+++ trunk/gtk/src/pkg/yzyppwrapper.cc Fri Mar 5 00:42:17 2010
@@ -915,7 +915,7 @@
return delta <= 7;
}
return false;
-#if 0
+#if ZYPP_VERSION >= 6030004
case YPKG_GROUP_MULTIVERSION: return sel.zyppSel()->multiversionInstall();
#endif
default: return Package (sel).group() == m_group;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
rpmcruz＠svn.opensuse.org