Merging upstream version 2.10.38.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 15 insertions, 2 deletions

diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index cde1576..67e21b5 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -35,6 +35,7 @@
 
 #include "core/gimp.h"
 #include "core/gimptemplate.h"
+#include "core/gimp-utils.h"
 
 #include "plug-in/gimppluginmanager.h"
 
@@ -74,7 +75,6 @@
 
 #include "gimp-intl.h"
 
-
 #define RESPONSE_RESET 1
 
 
@@ -3146,6 +3146,19 @@ prefs_dialog_new (Gimp       *gimp,
   vbox2 = prefs_frame_new (_("Extended Input Devices"),
                            GTK_CONTAINER (vbox), FALSE);
 
+#ifdef G_OS_WIN32
+  if (gimp_win32_have_windows_ink ())
+    {
+      GtkWidget *combo;
+
+      table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+      combo = prefs_enum_combo_box_add (object, "win32-pointer-input-api", 0, 0,
+                                        _("Pointer Input API:"),
+                                        GTK_TABLE (table), 0, NULL);
+    }
+#endif
+
   prefs_check_button_add (object, "devices-share-tool",
                           _("S_hare tool and tool options between input devices"),
                           GTK_BOX (vbox2));
diff --git a/app/dialogs/quit-dialog.c b/app/dialogs/quit-dialog.c
index 11737f9..435ea49 100644
--- a/app/dialogs/quit-dialog.c
+++ b/app/dialogs/quit-dialog.c
@@ -273,7 +273,7 @@ quit_close_all_dialog_new (Gimp     *gimp,
 
   closure = g_cclosure_new (G_CALLBACK (quit_close_all_dialog_container_changed),
                             private, NULL);
-  g_object_watch_closure (G_OBJECT (private->dialog), closure);
+  g_signal_connect_swapped (private->dialog, "destroy", G_CALLBACK (g_closure_invalidate), closure);
   g_signal_connect_closure (private->images, "add", closure, FALSE);
   g_signal_connect_closure (private->images, "remove", closure, FALSE);