/pidgin/main: ed01a53b8afc: These changes were what I needed to ...

[John Bailey]

Changeset: ed01a53b8afcef10ed0fd7ba4fe6c1fc2a594e99
Author:	 John Bailey <rekkanoryo at rekkanoryo.org>
Date:	 2012-11-04 17:57 -0500
Branch:	 release-2.x.y
URL: http://hg.pidgin.im/pidgin/main/rev/ed01a53b8afc

Description:

These changes were what I needed to be able to build on a Macbook Pro with OS
X 10.8 and MacPorts installed.  They don't appear to break anything new on a
standard X11-enabled system.

diffstat:

 ChangeLog         |  4 ++++
 pidgin/gtkconv.c  |  4 ----
 pidgin/gtkutils.c |  4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

diffs (42 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@ version 2.10.7:
 	* Don't link directly to libgcrypt when building with GnuTLS support.
 	 (Bartosz Brachaczek) (#15329)
 
+	Pidgin:
+	* Make Pidgin more friendly to non-X11 GTK+, such as MacPorts' +no_x11
+	  variant.
+
 	Gadu-Gadu:
 	* Fix a crash at startup with large contact list. Avatar support for
 	  buddies will be disabled till 3.0.0. (#15226, #14305)
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -29,10 +29,6 @@
 #include "internal.h"
 #include "pidgin.h"
 
-#ifndef _WIN32
-# include <X11/Xlib.h>
-#endif
-
 #ifdef USE_GTKSPELL
 # include <gtkspell/gtkspell.h>
 # ifdef _WIN32
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -28,9 +28,7 @@
 #include "internal.h"
 #include "pidgin.h"
 
-#ifndef _WIN32
-# include <X11/Xlib.h>
-#else
+#ifdef _WIN32
 # ifdef small
 #  undef small
 # endif