mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-26 08:51:25 +02:00
55 lines
2.1 KiB
Diff
55 lines
2.1 KiB
Diff
same as http://git.xfce.org/apps/xfburn/commit/?id=e1d6bfc2 but against 0.4.3
|
|
https://bugzilla.xfce.org/show_bug.cgi?id=7103
|
|
|
|
diff -dur xfburn-0.4.3.orig/xfburn/xfburn-data-composition.c xfburn-0.4.3/xfburn/xfburn-data-composition.c
|
|
--- xfburn-0.4.3.orig/xfburn/xfburn-data-composition.c 2009-12-04 08:46:43.000000000 +0100
|
|
+++ xfburn-0.4.3/xfburn/xfburn-data-composition.c 2012-09-28 21:59:01.975954901 +0200
|
|
@@ -1075,7 +1075,9 @@
|
|
|
|
/* ensure that we can only drop on top of folders, not files */
|
|
if (insertion) {
|
|
+ gdk_threads_enter ();
|
|
gtk_tree_model_get (model, insertion, DATA_COMPOSITION_COLUMN_TYPE, &parent_type, -1);
|
|
+ gdk_threads_leave ();
|
|
|
|
if (parent_type == DATA_COMPOSITION_TYPE_FILE) {
|
|
DBG ("Parent is file, and we're dropping into %d", position);
|
|
@@ -1116,9 +1118,7 @@
|
|
} else {
|
|
tree_path = gtk_tree_path_new_first ();
|
|
}
|
|
- gdk_threads_leave ();
|
|
|
|
- gdk_threads_enter ();
|
|
if (file_exists_on_same_level (model, tree_path, FALSE, name)) {
|
|
xfce_err (_("A file with the same name is already present in the composition."));
|
|
|
|
@@ -1821,10 +1821,11 @@
|
|
|
|
if (thread_add_file_to_list (composition, model, full_path, &iter, &iter_where_insert, position)) {
|
|
if (position == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE
|
|
- || position == GTK_TREE_VIEW_DROP_INTO_OR_AFTER)
|
|
+ || position == GTK_TREE_VIEW_DROP_INTO_OR_AFTER) {
|
|
gdk_threads_enter ();
|
|
gtk_tree_view_expand_row (GTK_TREE_VIEW (widget), priv->path_where_insert, FALSE);
|
|
gdk_threads_leave ();
|
|
+ }
|
|
}
|
|
|
|
} else {
|
|
diff -dur xfburn-0.4.3.orig/xfburn/xfburn-utils.h xfburn-0.4.3/xfburn/xfburn-utils.h
|
|
--- xfburn-0.4.3.orig/xfburn/xfburn-utils.h 2009-12-04 08:30:28.000000000 +0100
|
|
+++ xfburn-0.4.3/xfburn/xfburn-utils.h 2012-09-28 21:59:01.976954907 +0200
|
|
@@ -27,6 +27,11 @@
|
|
|
|
#include "xfburn-global.h"
|
|
|
|
+/*
|
|
+#define XFBURN_GDK_ENTER() { DBG("gdk-thread-enter"); gdk_threads_enter(); }
|
|
+#define XFBURN_GDK_LEAVE() { DBG("gdk-thread-leave"); gdk_threads_leave(); }
|
|
+*/
|
|
+
|
|
void xfburn_busy_cursor (GtkWidget *);
|
|
void xfburn_default_cursor (GtkWidget *);
|
|
|