# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1176821975 0
# Node ID c4818bf183a64e8f0f51318face8ce69fd3b2d77
# Parent  7d1847ba34845c76a96d6c9cacbc2ef41205f0a0# Parent  e8173e12182a7166879f4c16220b9e536e8666bb
merge of '3956f53331764e51ab7d79a8de4310cb6a4c0e58'
     and '68c52efea68c3ebbba53da9c5b95a4c9ee9c1754'

diff -r 7d1847ba3484 -r c4818bf183a6 pidgin/Makefile.mingw
--- a/pidgin/Makefile.mingw	Tue Apr 17 12:12:05 2007 +0000
+++ b/pidgin/Makefile.mingw	Tue Apr 17 14:59:35 2007 +0000
@@ -39,6 +39,7 @@
 			-I$(GTK_TOP)/include/gtk-2.0 \
 			-I$(GTK_TOP)/include/pango-1.0 \
 			-I$(GTK_TOP)/include/atk-1.0 \
+			-I$(GTK_TOP)/include/cairo \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(GTKSPELL_TOP) \
 			-I$(ASPELL_TOP)/include
diff -r 7d1847ba3484 -r c4818bf183a6 pidgin/plugins/Makefile.mingw
--- a/pidgin/plugins/Makefile.mingw	Tue Apr 17 12:12:05 2007 +0000
+++ b/pidgin/plugins/Makefile.mingw	Tue Apr 17 14:59:35 2007 +0000
@@ -24,6 +24,7 @@
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/include/pango-1.0 \
 			-I$(GTK_TOP)/include/atk-1.0 \
+			-I$(GTK_TOP)/include/cairo \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(PIDGIN_TREE_TOP) \
diff -r 7d1847ba3484 -r c4818bf183a6 pidgin/plugins/ticker/Makefile.mingw
--- a/pidgin/plugins/ticker/Makefile.mingw	Tue Apr 17 12:12:05 2007 +0000
+++ b/pidgin/plugins/ticker/Makefile.mingw	Tue Apr 17 14:59:35 2007 +0000
@@ -18,6 +18,7 @@
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/include/pango-1.0 \
 			-I$(GTK_TOP)/include/atk-1.0 \
+			-I$(GTK_TOP)/include/cairo \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(PURPLE_TOP) \
diff -r 7d1847ba3484 -r c4818bf183a6 pidgin/plugins/win32/transparency/Makefile.mingw
--- a/pidgin/plugins/win32/transparency/Makefile.mingw	Tue Apr 17 12:12:05 2007 +0000
+++ b/pidgin/plugins/win32/transparency/Makefile.mingw	Tue Apr 17 14:59:35 2007 +0000
@@ -19,6 +19,7 @@
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/include/pango-1.0 \
 			-I$(GTK_TOP)/include/atk-1.0 \
+			-I$(GTK_TOP)/include/cairo \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(PURPLE_TOP) \
diff -r 7d1847ba3484 -r c4818bf183a6 pidgin/plugins/win32/winprefs/Makefile.mingw
--- a/pidgin/plugins/win32/winprefs/Makefile.mingw	Tue Apr 17 12:12:05 2007 +0000
+++ b/pidgin/plugins/win32/winprefs/Makefile.mingw	Tue Apr 17 14:59:35 2007 +0000
@@ -19,6 +19,7 @@
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/include/pango-1.0 \
 			-I$(GTK_TOP)/include/atk-1.0 \
+			-I$(GTK_TOP)/include/cairo \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(PURPLE_TOP) \