Author: michael_meeks
Date: Mon Jul 23 13:43:28 2007
New Revision: 39590
URL: http://svn.opensuse.org/viewcvs/yast?rev=39590&view=rev
Log:
2007-07-23 Michael Meeks
* src/YGPackageSelector.cc (induceObjects): fix tribool related
crasher.
Modified:
trunk/gtk/ChangeLog
trunk/gtk/src/YGImage.cc
trunk/gtk/src/YGPackageSelector.cc
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=39590&r1=39589&r2=39590&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Mon Jul 23 13:43:28 2007
@@ -1,5 +1,11 @@
2007-07-23 Michael Meeks
+ * src/YGPackageSelector.cc (induceObjects): fix tribool related
+ crasher.
+
+ * src/YGImage.cc (YGImage::initOptions): set m_isScaled, m_isTiled
+ before we use them; kill valgrind uninitialized value error churn.
+
* src/YGPackageSelector.cc: handle 0 size partitions,
also don't warn for "out of space" errors on < 1Mb partitions:
discarding the annoying warning dialog.
Modified: trunk/gtk/src/YGImage.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGImage.cc?rev=39590&r1=39589&r2=39590&view=diff
==============================================================================
--- trunk/gtk/src/YGImage.cc (original)
+++ trunk/gtk/src/YGImage.cc Mon Jul 23 13:43:28 2007
@@ -31,15 +31,15 @@
m_imageLoaded = false;
m_hasZeroWidth = opt.zeroWidth.value();
m_hasZeroHeight = opt.zeroHeight.value();
+ m_isAnimation = opt.animated.value();
+ m_isScaled = opt.scaleToFit.value();
+ m_isTiled = opt.tiled.value();
if (m_hasZeroWidth || m_isScaled || m_isTiled)
setStretchable (YD_HORIZ, true);
if (m_hasZeroHeight || m_isScaled || m_isTiled)
setStretchable (YD_VERT, true);
- m_isAnimation = opt.animated.value();
- m_isScaled = opt.scaleToFit.value();
- m_isTiled = opt.tiled.value();
if (m_isScaled && m_isTiled) {
y2warning ("YImage can't be scaled and tiled at the same time");
m_isTiled = false;
Modified: trunk/gtk/src/YGPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev=39590&r1=39589&r2=39590&view=diff
==============================================================================
--- trunk/gtk/src/YGPackageSelector.cc (original)
+++ trunk/gtk/src/YGPackageSelector.cc Mon Jul 23 13:43:28 2007
@@ -1577,7 +1577,8 @@
#ifdef PRE_ZYPP_3
if (available_obj != NULL && !available_obj->source().enabled()) {
#else
- if (available_obj != NULL && !available_obj->repository().info().enabled()) {
+ // beware lurking tribool requires bool cast here.
+ if (available_obj != NULL && !(bool)(available_obj->repository().info().enabled())) {
#endif
available_obj = NULL;
for (zypp::ui::Selectable::available_iterator it = selectable->availableBegin();
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
