|
 |
f713292 |
diff -up setools-3.3.7/libqpol/swig/java/Makefile.am.seaudit setools-3.3.7/libqpol/swig/java/Makefile.am
|
|
|
f713292 |
--- setools-3.3.7/libqpol/swig/java/Makefile.am.seaudit 2010-05-03 12:37:54.000000000 -0400
|
|
|
f713292 |
+++ setools-3.3.7/libqpol/swig/java/Makefile.am 2012-09-28 10:15:56.408912525 -0400
|
|
|
f713292 |
@@ -48,7 +48,6 @@ BUILT_SOURCES = qpol_wrap.c \
|
|
|
f713292 |
qpol_type_t.java \
|
|
|
f713292 |
qpol_user_t.java \
|
|
|
f713292 |
qpol_validatetrans_t.java \
|
|
|
f713292 |
- SWIGTYPE_p_int.java \
|
|
|
f713292 |
SWIGTYPE_p_unsigned_int.java \
|
|
|
f713292 |
SWIGTYPE_p_void.java
|
|
|
f713292 |
|
|
|
f713292 |
diff -up setools-3.3.7/seaudit/progress.c.seaudit setools-3.3.7/seaudit/progress.c
|
|
|
f713292 |
--- setools-3.3.7/seaudit/progress.c.seaudit 2007-08-02 17:16:33.000000000 -0400
|
|
|
f713292 |
+++ setools-3.3.7/seaudit/progress.c 2012-09-28 10:15:56.407912521 -0400
|
|
|
f713292 |
@@ -99,10 +99,11 @@ void progress_hide(progress_t * progress
|
|
|
f713292 |
|
|
|
f713292 |
int progress_wait(progress_t * progress)
|
|
|
f713292 |
{
|
|
|
f713292 |
- GTimeVal wait_time = { 0, 50000 };
|
|
|
f713292 |
+ gint64 end_time;
|
|
|
f713292 |
g_mutex_lock(progress->mutex);
|
|
|
f713292 |
while (!progress->done) {
|
|
|
f713292 |
- g_cond_timed_wait(progress->cond, progress->mutex, &wait_time);
|
|
|
f713292 |
+ end_time = g_get_monotonic_time () + 50000; // need to be set before each wait
|
|
|
f713292 |
+ g_cond_wait_until(progress->cond, progress->mutex,end_time);
|
|
|
f713292 |
if (progress->s != NULL) {
|
|
|
f713292 |
gtk_label_set_text(GTK_LABEL(progress->label2), progress->s);
|
|
|
f713292 |
free(progress->s);
|