pidgin: 4a47d72c: pidgin: Fix building on GTK+ less than 2...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Sun Jul 17 00:13:38 EDT 2011


----------------------------------------------------------------------
Revision: 4a47d72cd1aa75a89a42a0bd8d47964cf2c86ca7
Parent:   48d1e64c856480f47bfe6d27d67f4901f3ae3177
Author:   darkrain42 at pidgin.im
Date:     07/17/11 00:03:42
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4a47d72cd1aa75a89a42a0bd8d47964cf2c86ca7

Changelog: 

pidgin: Fix building on GTK+ less than 2.14.

Closes #14261

Changes against parent 48d1e64c856480f47bfe6d27d67f4901f3ae3177

  patched  ChangeLog
  patched  pidgin/gtkmedia.c

-------------- next part --------------
============================================================
--- ChangeLog	af181061596987df03bd27b7ba9e0ee6dde15a95
+++ ChangeLog	5c88c92ef46f821cd1c727bdf5bc6d827fa5dae1
@@ -3,9 +3,11 @@ version 2.10.0 (MM/DD/YYYY):
 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)
============================================================
--- pidgin/gtkmedia.c	2dfb8b4535e7163815545f472eef8db5a39c8d70
+++ pidgin/gtkmedia.c	09c75e00d9aa5b679f9eaf66ec1e11f1baaba9cf
@@ -538,12 +538,20 @@ realize_cb_cb(PidginMediaRealizeData *da
 	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) {


More information about the Commits mailing list