Re: [Qemu-devel] [PATCH 1/2] ui/gtk: Support versions of gtk+-2.0 before 2.90.7

[Anthony Liguori]

Stefan Weil <address@hidden> writes:

> This is needed for current Debian stable (Squeeze).
>
> Extract from NEWS in gtk+-2.0:
>
>   Overview of Changes from GTK+ 2.90.6 to 2.90.7
>   ==============================================
>
>   * All GDK keysym names have been changed from GDK_keysym to GDK_KEY_keysym;
>     the previous names are still available in gdkkeysyms-compat.h.

Looks like this happened in 2.22 as best as I can tell.

What I would suggest doing is:

#ifndef GDK_KEY_f
#define GDK_KEY_f GDK_f
#define GDK_KEY_g GDK_g
...
#endif

Regards,

Anthony Liguori

>
> For versions before 2.90.7, the new names are now mapped to the old ones.
>
> Signed-off-by: Stefan Weil <address@hidden>
> ---
>  ui/gtk.c |   11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/ui/gtk.c b/ui/gtk.c
> index f82ced0..10bac94 100644
> --- a/ui/gtk.c
> +++ b/ui/gtk.c
> @@ -64,6 +64,17 @@
>  
>  #define MAX_VCS 10
>  
> +#if !GTK_CHECK_VERSION(2, 90, 7)
> +#define GDK_KEY_f GDK_f
> +#define GDK_KEY_g GDK_g
> +#define GDK_KEY_0 GDK_0
> +#define GDK_KEY_1 GDK_1
> +#define GDK_KEY_2 GDK_2
> +#define GDK_KEY_equal GDK_equal
> +#define GDK_KEY_minus GDK_minus
> +#define GDK_KEY_plus GDK_plus
> +#endif
> +
>  typedef struct VirtualConsole
>  {
>      GtkWidget *menu_item;
> -- 
> 1.7.10.4