summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2010-05-31 21:29:57 +0000
committerJason Woodward2010-05-31 21:29:57 +0000
commit567e4a3c05040a9948740fc8547c6b3212a94995 (patch)
tree3d1f4517a1e702ca0d0b53627d57e63c6f409c25
parenta28ac90670a1cd025b0e9c46d0595c40024f4c7b (diff)
downloadgslapt-567e4a3c05040a9948740fc8547c6b3212a94995.tar.gz
make sure gtk_widget_destroy calls on windows are wrapped in gdk_threads_enter|leave
-rw-r--r--src/callbacks.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/callbacks.c b/src/callbacks.c
index a532aa6..77d9446 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -1593,11 +1593,11 @@ static void lhandle_transaction (GtkWidget *w)
gdk_threads_enter();
lock_toolbar_buttons();
- gdk_threads_leave();
dl_only_checkbutton = GTK_CHECK_BUTTON(lookup_widget(w,"download_only_checkbutton"));
dl_only = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dl_only_checkbutton));
gtk_widget_destroy(w);
+ gdk_threads_leave();
/* download the pkgs */
if ( trans->install_pkgs->pkg_count > 0 || trans->upgrade_pkgs->pkg_count > 0 ) {
@@ -2264,8 +2264,8 @@ static gboolean install_packages (void)
if (slapt_remove_pkg(global_config,trans->remove_pkgs->pkgs[i]) == -1) {
gdk_threads_enter();
gslapt_clear_status(context_id);
- gdk_threads_leave();
gtk_widget_destroy(progress_window);
+ gdk_threads_leave();
return FALSE;
}
gdk_threads_enter();
@@ -2304,8 +2304,8 @@ static gboolean install_packages (void)
if (slapt_install_pkg(global_config,trans->queue->pkgs[i]->pkg.i) == -1) {
gdk_threads_enter();
gslapt_clear_status(context_id);
- gdk_threads_leave();
gtk_widget_destroy(progress_window);
+ gdk_threads_leave();
return FALSE;
}
}else if ( trans->queue->pkgs[i]->type == UPGRADE ) {
@@ -2327,8 +2327,8 @@ static gboolean install_packages (void)
trans->queue->pkgs[i]->pkg.u->upgrade) == -1) {
gdk_threads_enter();
gslapt_clear_status(context_id);
- gdk_threads_leave();
gtk_widget_destroy(progress_window);
+ gdk_threads_leave();
return FALSE;
}
}