1
0
forked from aniani/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.
This commit is contained in:
Bram Moolenaar
2010-06-13 02:35:46 +02:00
parent 9ea339d58c
commit 31c8f28cca
3 changed files with 6 additions and 2 deletions

View File

@@ -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);

View File

@@ -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();

View File

@@ -681,6 +681,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
444,
/**/
443,
/**/