diff options
| author | Bram Moolenaar <bram@vim.org> | 2010-06-13 02:35:46 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2010-06-13 02:35:46 +0200 |
| commit | 75b4246bb0a4310424230099bf9f57d2c5191f88 (patch) | |
| tree | d62634395570f0d00ceb3eb2849c34e1738300e5 | |
| parent | 6d5bcdaac6703f560164032270e4ab5fe37a51ec (diff) | |
| download | vim-75b4246bb0a4310424230099bf9f57d2c5191f88.tar.gz | |
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.
| -rw-r--r-- | src/gui_gtk_x11.c | 4 | ||||
| -rw-r--r-- | src/option.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 991d2a03..81ce63c0 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 06560a74..be4bf61b 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 89adc48c..c5a029bd 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 444, +/**/ 443, /**/ 442, |