Author: michael_meeks
Date: Mon Jul 23 11:56:25 2007
New Revision: 39587
URL: http://svn.opensuse.org/viewcvs/yast?rev=39587&view=rev
Log:
2007-07-23 Michael Meeks
* src/YGPackageSelector.cc: handle 0 size partitions,
also don't warn for "out of space" errors on < 1Mb partitions:
discarding the annoying warning dialog.
(PROGRESS): guard against divide-by-zero too.
Modified:
trunk/gtk/ChangeLog
trunk/gtk/src/YGPackageSelector.cc
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=39587&r1=39586&r2=39587&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Mon Jul 23 11:56:25 2007
@@ -1,3 +1,10 @@
+2007-07-23 Michael Meeks
+
+ * src/YGPackageSelector.cc: handle 0 size partitions,
+ also don't warn for "out of space" errors on < 1Mb partitions:
+ discarding the annoying warning dialog.
+ (PROGRESS): guard against divide-by-zero too.
+
2007-07-19 Ricardo Cruz
* src/YGPackageSelector.cc: Jiri has added gettext support (not sure
Modified: trunk/gtk/src/YGPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev=39587&r1=39586&r2=39587&view=diff
==============================================================================
--- trunk/gtk/src/YGPackageSelector.cc (original)
+++ trunk/gtk/src/YGPackageSelector.cc Mon Jul 23 11:56:25 2007
@@ -766,14 +766,15 @@
GtkTreeIter iter;
gtk_list_store_append (store, &iter);
- int usage = (partition.pkg_size * 100) / partition.total_size;
+ long usage = (partition.pkg_size * 100) / (partition.total_size + 1);
string usage_str = sizeToString (partition.pkg_size) + " (of " +
sizeToString (partition.total_size) + ")";
gtk_list_store_set (store, &iter, 0, partition.dir.c_str(),
1, usage, 2, usage_str.c_str(), -1);
warning = warning ||
- (partition.total_size - partition.pkg_size < MIN_FREE_MB_WARN);
+ (partition.total_size > 1024 &&
+ partition.total_size - partition.pkg_size < MIN_FREE_MB_WARN);
}
}
if (warning)
@@ -1339,7 +1340,7 @@
#define SET_PROGRESS(_steps, _jump) int steps = _steps, step = 0, jump = _jump;
#define PROGRESS() \
if (progress && ((step++) % jump == 0)) { \
- gdouble fraction = ((gdouble) step) / steps; \
+ gdouble fraction = steps > 0 ? ((gdouble) step) / steps : 0; \
gtk_progress_bar_set_fraction (progress, fraction); \
while (gtk_events_pending()) gtk_main_iteration(); }
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org