git.annexia.org
/
ovirt-viewer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add assertions about which thread we are running in.
[ovirt-viewer.git]
/
main.c
diff --git
a/main.c
b/main.c
index
0545ec4
..
0425128
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-415,6
+415,7
@@
gboolean
main_connected (gpointer data)
{
DEBUG ("connected");
main_connected (gpointer data)
{
DEBUG ("connected");
+ ASSERT_IS_MAIN_THREAD ();
gtk_label_set_text (GTK_LABEL (ca_error), NULL);
gtk_label_set_text (GTK_LABEL (ca_error), NULL);
@@
-429,6
+430,8
@@
gboolean
main_disconnected (gpointer data)
{
DEBUG ("disconnected");
main_disconnected (gpointer data)
{
DEBUG ("disconnected");
+ ASSERT_IS_MAIN_THREAD ();
+
gtk_widget_show (connection_area);
gtk_widget_hide (login_area);
return FALSE;
gtk_widget_show (connection_area);
gtk_widget_hide (login_area);
return FALSE;
@@
-439,6
+442,8
@@
gboolean
main_logged_in (gpointer data)
{
DEBUG ("logged in");
main_logged_in (gpointer data)
{
DEBUG ("logged in");
+ ASSERT_IS_MAIN_THREAD ();
+
gtk_widget_hide (login_area);
return FALSE;
}
gtk_widget_hide (login_area);
return FALSE;
}
@@
-448,6
+453,8
@@
gboolean
main_logged_out (gpointer data)
{
DEBUG ("logged out");
main_logged_out (gpointer data)
{
DEBUG ("logged out");
+ ASSERT_IS_MAIN_THREAD ();
+
if (wui_thread_is_connected ())
gtk_widget_show (login_area);
return FALSE;
if (wui_thread_is_connected ())
gtk_widget_show (login_area);
return FALSE;
@@
-460,6
+467,7
@@
main_busy (gpointer data)
GdkWindow *gdk_window;
DEBUG ("busy");
GdkWindow *gdk_window;
DEBUG ("busy");
+ ASSERT_IS_MAIN_THREAD ();
gdk_window = gtk_widget_get_window (window);
if (gdk_window) {
gdk_window = gtk_widget_get_window (window);
if (gdk_window) {
@@
-477,6
+485,7
@@
main_idle (gpointer data)
GdkWindow *gdk_window;
DEBUG ("idle");
GdkWindow *gdk_window;
DEBUG ("idle");
+ ASSERT_IS_MAIN_THREAD ();
gdk_window = gtk_widget_get_window (window);
if (gdk_window) {
gdk_window = gtk_widget_get_window (window);
if (gdk_window) {
@@
-496,6
+505,7
@@
main_connection_error (gpointer _str)
char *str = (char *) _str;
DEBUG ("connection error: %s", str);
char *str = (char *) _str;
DEBUG ("connection error: %s", str);
+ ASSERT_IS_MAIN_THREAD ();
gtk_label_set_text (GTK_LABEL (ca_error), str);
g_free (str);
gtk_label_set_text (GTK_LABEL (ca_error), str);
g_free (str);
@@
-512,6
+522,7
@@
main_login_error (gpointer _str)
char *str = (char *) _str;
DEBUG ("login error: %s", str);
char *str = (char *) _str;
DEBUG ("login error: %s", str);
+ ASSERT_IS_MAIN_THREAD ();
/*
gtk_label_set_text (GTK_LABEL (ca_error), str);
/*
gtk_label_set_text (GTK_LABEL (ca_error), str);
@@
-530,6
+541,7
@@
main_status_error (gpointer _str)
char *str = (char *) _str;
DEBUG ("status error: %s", str);
char *str = (char *) _str;
DEBUG ("status error: %s", str);
+ ASSERT_IS_MAIN_THREAD ();
/*
gtk_label_set_text (GTK_LABEL (ca_error), str);
/*
gtk_label_set_text (GTK_LABEL (ca_error), str);