Mercurial > pidgin.yaz
changeset 32197:6f503dcd843e
pidgin: Fix building on GTK+ less than 2.14.
Closes #14261
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 17 Jul 2011 04:03:42 +0000 |
| parents | 15c227a35207 |
| children | bcf0b8ba1a79 |
| files | ChangeLog pidgin/gtkmedia.c |
| diffstat | 2 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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) {