From 4f022e095812ed3ef9fab43d3452fd2538345f19 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Tue, 3 Aug 2010 21:36:48 +0000
Subject: [PATCH] removed gdk_flush() which could cause deadlock it appears and
it doesn't appear completely needed.
---
src/sview/common.c | 4 ++--
src/sview/popups.c | 2 +-
src/sview/sview.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/sview/common.c b/src/sview/common.c
index 31ec9dd0544..14bcb459e5d 100644
--- a/src/sview/common.c
+++ b/src/sview/common.c
@@ -312,7 +312,7 @@ static void *_editing_thr(gpointer arg)
msg_id = GPOINTER_TO_INT(arg);
gtk_statusbar_remove(GTK_STATUSBAR(main_statusbar),
STATUS_ADMIN_EDIT, msg_id);
- gdk_flush();
+ //gdk_flush();
gdk_threads_leave();
return NULL;
}
@@ -1428,7 +1428,7 @@ extern void *popup_thr(popup_info_t *popup_win)
//g_print("locked popup_thr\n");
gdk_threads_enter();
(specifc_info)(popup_win);
- gdk_flush();
+ //gdk_flush();
gdk_threads_leave();
g_static_mutex_unlock(&sview_mutex);
//g_print("done popup_thr\n");
diff --git a/src/sview/popups.c b/src/sview/popups.c
index 08506be446d..14bc883c99f 100644
--- a/src/sview/popups.c
+++ b/src/sview/popups.c
@@ -47,7 +47,7 @@ void *_refresh_thr(gpointer arg)
gdk_threads_enter();
gtk_statusbar_remove(GTK_STATUSBAR(main_statusbar),
STATUS_REFRESH, msg_id);
- gdk_flush();
+ //gdk_flush();
gdk_threads_leave();
return NULL;
}
diff --git a/src/sview/sview.c b/src/sview/sview.c
index 95481b9071f..ee25c62475b 100644
--- a/src/sview/sview.c
+++ b/src/sview/sview.c
@@ -182,7 +182,7 @@ void *_page_thr(void *arg)
sview_init_grid(reset_highlight);
reset_highlight=false;
(display_data->get_info)(table, display_data);
- gdk_flush();
+ //gdk_flush();
gdk_threads_leave();
// g_static_mutex_unlock(&sview_mutex);
/* END_TIMER; */
@@ -226,7 +226,7 @@ void *_grid_init_thr(void *arg)
table = GTK_TABLE(bin->child);
/* set up the main grid */
rc = get_system_stats(table);
- gdk_flush();
+ //gdk_flush();
gdk_threads_leave();
if(rc != SLURM_SUCCESS)
--
GitLab