Mercurial > vim
changeset 2187:dc8ee74574f8 v7.2.444
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.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sun, 13 Jun 2010 02:35:46 +0200 |
| parents | 0c1e413c32f1 |
| children | cb94c42c0e1a |
| files | src/gui_gtk_x11.c src/option.c src/version.c |
| diffstat | 3 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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();