pidgin/android/libpurple2

pidgin: Fix building on GTK+ less than 2.14.

2011-07-17, Paul Aurich
82265c009a63
Parents 8fadb7594280
Children 8ca00a04051e
pidgin: Fix building on GTK+ less than 2.14.

Closes #14261
2 files changed, 11 insertions(+), 1 deletions(-)
  • +3 -1
    ChangeLog
  • +8 -0
    pidgin/gtkmedia.c
    • --- a/ChangeLog Sun Jul 17 03:55:29 2011 +0000
    +++ b/ChangeLog Sun Jul 17 04:03:42 2011 +0000
    @@ -3,9 +3,11 @@
    version 2.10.0 (MM/DD/YYYY):
    Pidgin:
    * Make the max size of incoming smileys a pref instead of hardcoding it.
    - (Quentin Brandon)(#5231)
    + (Quentin Brandon) (#5231)
    * Added a plugin information dialog to show information for plugins
    that aren't otherwise visible in the plugins dialog.
    + * Fix building with GTK+ earlier than 2.14.0 (GTK+ 2.10 is still the
    + minimum supportedat least 2.10 is still required). (#14261)
    Gadu-Gadu:
    * Fixed searching for buddies in public directory. (Tomasz Wasilczyk)
    --- a/pidgin/gtkmedia.c Sun Jul 17 03:55:29 2011 +0000
    +++ b/pidgin/gtkmedia.c Sun Jul 17 04:03:42 2011 +0000
    @@ -538,12 +538,20 @@
    GdkWindow *window = NULL;
    if (data->participant == NULL)
    +#if GTK_CHECK_VERSION(2, 14, 0)
    window = gtk_widget_get_window(priv->local_video);
    +#else
    + window = (priv->local_video)->window;
    +#endif
    else {
    GtkWidget *widget = pidgin_media_get_widget(data->gtkmedia,
    data->session_id, data->participant);
    if (widget)
    +#if GTK_CHECK_VERSION(2, 14, 0)
    window = gtk_widget_get_window(widget);
    +#else
    + window = widget->window;
    +#endif
    }
    if (window) {