From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 13 Jun 2010 00:35:46 +0000 (+0200)
Subject: updated for version 7.2.444
X-Git-Tag: v7.2.444
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31c8f28cca343438be9b679f2fb3e7ee06e0a4a5;p=vim

updated for version 7.2.444
Problem:    Can't build with GTK 1, gtk_selection_clear_targets() is not
            available. (Patrick Texier)
Solution:   Don't change the targets for GTK 1, set them once.
---

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 991d2a03e..81ce63c08 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -3478,7 +3478,7 @@ gui_gtk_set_selection_targets(void)
 
     for (i = 0; i < (int)N_SELECTION_TARGETS; ++i)
     {
-#ifdef FEAT_MBYTE
+#if defined(FEAT_MBYTE) && defined(HAVE_GTK2)
 	/* OpenOffice tries to use TARGET_HTML and fails when it doesn't
 	 * return something, instead of trying another target. Therefore only
 	 * offer TARGET_HTML when it works. */
@@ -3489,8 +3489,10 @@ gui_gtk_set_selection_targets(void)
 	    targets[j++] = selection_targets[i];
     }
 
+#ifdef HAVE_GTK2  /* GTK 1 doesn't have this function */
     gtk_selection_clear_targets(gui.drawarea, (GdkAtom)GDK_SELECTION_PRIMARY);
     gtk_selection_clear_targets(gui.drawarea, (GdkAtom)clip_plus.gtk_sel_atom);
+#endif
     gtk_selection_add_targets(gui.drawarea,
 			      (GdkAtom)GDK_SELECTION_PRIMARY,
 			      targets, n_targets);
diff --git a/src/option.c b/src/option.c
index 06560a74e..be4bf61b7 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7112,7 +7112,7 @@ check_clipboard_option()
 	clip_html = new_html;
 	vim_free(clip_exclude_prog);
 	clip_exclude_prog = new_exclude_prog;
-#ifdef FEAT_GUI_GTK
+#ifdef HAVE_GTK2  /* for GTK 1 we can't change the list of targets */
 	if (gui.in_use)
 	{
 	    gui_gtk_set_selection_targets();
diff --git a/src/version.c b/src/version.c
index 89adc48c5..c5a029bde 100644
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    444,
 /**/
     443,
 /**/