diff -ur pidgin-guifications-2.14/src/gf_action.c pidgin-guifications-2.14.gnucnull/src/gf_action.c
--- pidgin-guifications-2.14/src/gf_action.c	2007-05-04 23:33:40.000000000 -0400
+++ pidgin-guifications-2.14.gnucnull/src/gf_action.c	2007-10-27 10:27:22.000000000 -0400
@@ -18,6 +18,12 @@
  */
 #include <gtk/gtk.h>
 
+#ifdef HAVE_CONFIG_H
+# include "../gf_config.h"
+#endif
+
+#include "gf_internal.h"
+
 #include <account.h>
 #include <blist.h>
 #include <debug.h>
@@ -40,7 +46,6 @@
 #include "gf_display.h"
 #include "gf_event.h"
 #include "gf_event_info.h"
-#include "gf_internal.h"
 #include "gf_notification.h"
 #include "gf_preferences.h"
 #include "gf_utils.h"
diff -ur pidgin-guifications-2.14/src/gf_blist.c pidgin-guifications-2.14.gnucnull/src/gf_blist.c
--- pidgin-guifications-2.14/src/gf_blist.c	2007-05-04 23:32:06.000000000 -0400
+++ pidgin-guifications-2.14.gnucnull/src/gf_blist.c	2007-10-27 10:27:14.000000000 -0400
@@ -20,6 +20,11 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
+#ifdef HAVE_CONFIG_H
+# include "../gf_config.h"
+#endif
+#include "gf_internal.h"
+
 #include <blist.h>
 #include <debug.h>
 #include <gtkutils.h>
@@ -28,12 +33,7 @@
 #include <version.h>
 
 
-#ifdef HAVE_CONFIG_H
-# include "../gf_config.h"
-#endif
-
 #include "gf_blist.h"
-#include "gf_internal.h"
 #include "gf_notification.h"
 #include "gf_theme.h"
 #include "gf_theme_info.h"
diff -ur pidgin-guifications-2.14/src/gf_display.c pidgin-guifications-2.14.gnucnull/src/gf_display.c
--- pidgin-guifications-2.14/src/gf_display.c	2007-04-17 22:07:31.000000000 -0400
+++ pidgin-guifications-2.14.gnucnull/src/gf_display.c	2007-10-27 10:27:27.000000000 -0400
@@ -30,6 +30,12 @@
 typedef BOOL WINAPI GF_GetMonitorInfo(HMONITOR,LPMONITORINFO);
 #endif /* _WIN32 */
 
+#ifdef HAVE_CONFIG_H
+# include "../gf_config.h"
+#endif
+
+#include "gf_internal.h"
+
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
Only in pidgin-guifications-2.14.gnucnull/src: gf_display.c.gnucnull
diff -ur pidgin-guifications-2.14/src/gf_event.c pidgin-guifications-2.14.gnucnull/src/gf_event.c
--- pidgin-guifications-2.14/src/gf_event.c	2007-04-17 22:07:31.000000000 -0400
+++ pidgin-guifications-2.14.gnucnull/src/gf_event.c	2007-10-27 10:27:33.000000000 -0400
@@ -19,6 +19,12 @@
 #include <glib.h>
 #include <string.h>
 
+#ifdef HAVE_CONFIG_H
+# include "../gf_config.h"
+#endif
+
+#include "gf_internal.h"
+
 #include <debug.h>
 #include <account.h>
 #include <blist.h>
@@ -32,14 +38,9 @@
 #include <version.h>
 
 
-#ifdef HAVE_CONFIG_H
-# include "../gf_config.h"
-#endif
-
 #include "gf_blist.h"
 #include "gf_display.h"
 #include "gf_event.h"
-#include "gf_internal.h"
 #include "gf_notification.h"
 #include "gf_preferences.h"
 
diff -ur pidgin-guifications-2.14/src/gf_event_info.c pidgin-guifications-2.14.gnucnull/src/gf_event_info.c
--- pidgin-guifications-2.14/src/gf_event_info.c	2007-04-17 22:07:31.000000000 -0400
+++ pidgin-guifications-2.14.gnucnull/src/gf_event_info.c	2007-10-27 10:27:19.000000000 -0400
@@ -18,6 +18,12 @@
  */
 #include <glib.h>
 
+#ifdef HAVE_CONFIG_H
+# include "../gf_config.h"
+#endif
+
+#include "gf_internal.h"
+
 #include <debug.h>
 #include <account.h>
 #include <blist.h>
Only in pidgin-guifications-2.14.gnucnull/src: gf_event_info.c.gnucnull
diff -ur pidgin-guifications-2.14/src/gf_gtk_utils.c pidgin-guifications-2.14.gnucnull/src/gf_gtk_utils.c
--- pidgin-guifications-2.14/src/gf_gtk_utils.c	2007-02-24 17:17:25.000000000 -0500
+++ pidgin-guifications-2.14.gnucnull/src/gf_gtk_utils.c	2007-10-27 10:27:43.000000000 -0400
@@ -18,6 +18,11 @@
  */
 #include <debug.h>
 
+#ifdef HAVE_CONFIG_H
+# include "../gf_config.h"
+#endif
+
+#include "gf_internal.h"
 #include "gf_gtk_utils.h"
 
 /******************************************************************************
Only in pidgin-guifications-2.14.gnucnull/src: gf_gtk_utils.c.gnucnull
diff -ur pidgin-guifications-2.14/src/gf_internal.h pidgin-guifications-2.14.gnucnull/src/gf_internal.h
--- pidgin-guifications-2.14/src/gf_internal.h	2007-02-24 17:17:25.000000000 -0500
+++ pidgin-guifications-2.14.gnucnull/src/gf_internal.h	2007-10-27 10:17:37.000000000 -0400
@@ -35,6 +35,16 @@
 #endif
 #endif
 
+/* This works around the lack of G_GNUC_NULL_TERMINATED in old glib and the
+ * lack of the NULL sentinel in GCC older than 4.0.0 and non-GCC compilers */
+#ifndef G_GNUC_NULL_TERMINATED
+#  if     __GNUC__ >= 4
+#    define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
+#  else
+#    define G_GNUC_NULL_TERMINATED
+#  endif
+#endif
+
 #if GLIB_CHECK_VERSION(2,6,0)
 # include <glib/gstdio.h>
 #endif /* GLIB_CHECK_VERSION(2,6,0) */
Only in pidgin-guifications-2.14.gnucnull/src: gf_internal.h.gnucnull
diff -ur pidgin-guifications-2.14/src/gf_item.c pidgin-guifications-2.14.gnucnull/src/gf_item.c
--- pidgin-guifications-2.14/src/gf_item.c	2007-04-17 22:07:31.000000000 -0400
+++ pidgin-guifications-2.14.gnucnull/src/gf_item.c	2007-10-27 10:32:43.000000000 -0400
@@ -25,9 +25,9 @@
 #ifdef HAVE_CONFIG_H
 # include "../gf_config.h"
 #endif
+#include "gf_internal.h"
 
 #include "gf_event_info.h"
-#include "gf_internal.h"
 #include "gf_item.h"
 #include "gf_item_icon.h"
 #include "gf_item_image.h"
diff -ur pidgin-guifications-2.14/src/gf_item_icon.c pidgin-guifications-2.14.gnucnull/src/gf_item_icon.c
--- pidgin-guifications-2.14/src/gf_item_icon.c	2007-05-04 23:38:28.000000000 -0400
+++ pidgin-guifications-2.14.gnucnull/src/gf_item_icon.c	2007-10-27 10:29:05.000000000 -0400
@@ -20,6 +20,11 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
+#ifdef HAVE_CONFIG_H
+# include "../gf_config.h"
+#endif
+#include "gf_internal.h"
+
 #include <account.h>
 #include <buddyicon.h>
 #include <debug.h>
@@ -28,12 +33,7 @@
 #include <gtkutils.h>
 
 
-#ifdef HAVE_CONFIG_H
-# include "../gf_config.h"
-#endif
-
 #include "gf_gtk_utils.h"
-#include "gf_internal.h"
 #include "gf_item.h"
 #include "gf_item_icon.h"
 
diff -ur pidgin-guifications-2.14/src/gf_item_image.c pidgin-guifications-2.14.gnucnull/src/gf_item_image.c
--- pidgin-guifications-2.14/src/gf_item_image.c	2007-04-17 22:07:31.000000000 -0400
+++ pidgin-guifications-2.14.gnucnull/src/gf_item_image.c	2007-10-27 10:29:13.000000000 -0400
@@ -19,6 +19,11 @@
 #include <glib.h>
 #include <gdk/gdk.h>
 
+#ifdef HAVE_CONFIG_H
+# include "../gf_config.h"
+#endif
+#include "gf_internal.h"
+
 #include <debug.h>
 #include <xmlnode.h>
 
Only in pidgin-guifications-2.14.gnucnull/src: gf_item_image.c.gnucnull
diff -ur pidgin-guifications-2.14/src/gf_item_offset.c pidgin-guifications-2.14.gnucnull/src/gf_item_offset.c
--- pidgin-guifications-2.14/src/gf_item_offset.c	2007-04-17 22:07:31.000000000 -0400
+++ pidgin-guifications-2.14.gnucnull/src/gf_item_offset.c	2007-10-27 10:29:09.000000000 -0400
@@ -20,6 +20,10 @@
 #include <string.h>
 #include <stdlib.h>
 
+#ifdef HAVE_CONFIG_H
+# include "../gf_config.h"
+#endif
+#include "gf_internal.h"
 #include <xmlnode.h>
 
 
Only in pidgin-guifications-2.14.gnucnull/src: gf_item_offset.c.gnucnull
diff -ur pidgin-guifications-2.14/src/gf_item_text.c pidgin-guifications-2.14.gnucnull/src/gf_item_text.c
--- pidgin-guifications-2.14/src/gf_item_text.c	2007-04-17 22:07:31.000000000 -0400
+++ pidgin-guifications-2.14.gnucnull/src/gf_item_text.c	2007-10-27 10:29:58.000000000 -0400
@@ -38,6 +38,8 @@
 #include <string.h>
 #include <time.h>
 
+#include "gf_internal.h"
+
 #include <account.h>
 #include <conversation.h>
 #include <debug.h>
@@ -57,7 +59,6 @@
 #include "gf_event_info.h"
 #include "gf_gtk_utils.h"
 #include "gf_item.h"
-#include "gf_internal.h"
 #include "gf_item_text.h"
 #include "gf_notification.h"
 #include "gf_preferences.h"
diff -ur pidgin-guifications-2.14/src/gf_menu.c pidgin-guifications-2.14.gnucnull/src/gf_menu.c
--- pidgin-guifications-2.14/src/gf_menu.c	2007-02-24 17:17:26.000000000 -0500
+++ pidgin-guifications-2.14.gnucnull/src/gf_menu.c	2007-10-27 10:32:04.000000000 -0400
@@ -21,10 +21,10 @@
 #ifdef HAVE_CONFIG_H
 # include "../gf_config.h"
 #endif
+#include "gf_internal.h"
 
 #include "gf_action.h"
 #include "gf_display.h"
-#include "gf_internal.h"
 #include "gf_item.h"
 #include "gf_item_icon.h"
 #include "gf_item_text.h"
diff -ur pidgin-guifications-2.14/src/gf_notification.c pidgin-guifications-2.14.gnucnull/src/gf_notification.c
--- pidgin-guifications-2.14/src/gf_notification.c	2007-04-17 22:07:31.000000000 -0400
+++ pidgin-guifications-2.14.gnucnull/src/gf_notification.c	2007-10-27 10:31:49.000000000 -0400
@@ -20,6 +20,11 @@
 #include <glib.h>
 #include <gdk/gdk.h>
 
+#ifdef HAVE_CONFIG_H
+# include "../gf_config.h"
+#endif
+#include "gf_internal.h"
+
 #include <debug.h>
 #include <xmlnode.h>
 
Only in pidgin-guifications-2.14.gnucnull/src: gf_notification.c.gnucnull
diff -ur pidgin-guifications-2.14/src/gf_preferences.c pidgin-guifications-2.14.gnucnull/src/gf_preferences.c
--- pidgin-guifications-2.14/src/gf_preferences.c	2007-05-04 23:36:59.000000000 -0400
+++ pidgin-guifications-2.14.gnucnull/src/gf_preferences.c	2007-10-27 10:42:57.000000000 -0400
@@ -24,6 +24,12 @@
 #include <unistd.h>
 #include <string.h>
 
+#ifdef HAVE_CONFIG_H
+# include "../gf_config.h"
+#endif
+
+#include "gf_internal.h"
+
 #include <debug.h>
 #include <notify.h>
 #include <plugin.h>
@@ -33,16 +39,10 @@
 #include <gtkutils.h>
 #include <gtkprefs.h>
 
-
-#ifdef HAVE_CONFIG_H
-# include "../gf_config.h"
-#endif
-
 #include "gf_action.h"
 #include "gf_display.h"
 #include "gf_event.h"
 #include "gf_file.h"
-#include "gf_internal.h"
 #include "gf_menu.h"
 #include "gf_preferences.h"
 #include "gf_stock.h"
diff -ur pidgin-guifications-2.14/src/gf_theme.c pidgin-guifications-2.14.gnucnull/src/gf_theme.c
--- pidgin-guifications-2.14/src/gf_theme.c	2007-04-17 22:07:31.000000000 -0400
+++ pidgin-guifications-2.14.gnucnull/src/gf_theme.c	2007-10-27 10:33:32.000000000 -0400
@@ -23,16 +23,16 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <debug.h>
-#include <util.h>
-#include <xmlnode.h>
-
-
 #ifdef HAVE_CONFIG_H
 # include "../gf_config.h"
 #endif
 
 #include "gf_internal.h"
+
+#include <debug.h>
+#include <util.h>
+#include <xmlnode.h>
+
 #include "gf_item.h"
 #include "gf_preferences.h"
 #include "gf_theme_info.h"
diff -ur pidgin-guifications-2.14/src/gf_theme_editor.c pidgin-guifications-2.14.gnucnull/src/gf_theme_editor.c
--- pidgin-guifications-2.14/src/gf_theme_editor.c	2007-04-26 19:46:22.000000000 -0400
+++ pidgin-guifications-2.14.gnucnull/src/gf_theme_editor.c	2007-10-27 10:41:07.000000000 -0400
@@ -26,6 +26,7 @@
 #include <sys/types.h>
 #include <string.h>
 
+#include "gf_internal.h"
 #define PURPLE_PLUGINS
 
 #include <debug.h>
@@ -40,7 +41,6 @@
 
 #include "gf_event.h"
 #include "gf_file.h"
-#include "gf_internal.h"
 #include "gf_item.h"
 #include "gf_item_icon.h"
 #include "gf_item_image.h"
diff -ur pidgin-guifications-2.14/src/gf_theme_info.c pidgin-guifications-2.14.gnucnull/src/gf_theme_info.c
--- pidgin-guifications-2.14/src/gf_theme_info.c	2007-04-17 22:07:31.000000000 -0400
+++ pidgin-guifications-2.14.gnucnull/src/gf_theme_info.c	2007-10-27 10:33:38.000000000 -0400
@@ -28,6 +28,11 @@
 	gchar *website;
 };
 
+#ifdef HAVE_CONFIG_H
+# include "../gf_config.h"
+#endif
+
+#include "gf_internal.h"
 #include "gf_theme_info.h"
 
 #include <debug.h>
Only in pidgin-guifications-2.14.gnucnull/src: gf_theme_info.c.gnucnull
diff -ur pidgin-guifications-2.14/src/gf_theme_ops.c pidgin-guifications-2.14.gnucnull/src/gf_theme_ops.c
--- pidgin-guifications-2.14/src/gf_theme_ops.c	2007-04-17 22:07:31.000000000 -0400
+++ pidgin-guifications-2.14.gnucnull/src/gf_theme_ops.c	2007-10-27 10:40:12.000000000 -0400
@@ -26,6 +26,10 @@
 	gchar *ellipsis;
 };
 
+#ifdef HAVE_CONFIG_H
+# include "../gf_config.h"
+#endif
+#include "gf_internal.h"
 #include "gf_theme_ops.h"
 
 #include <debug.h>
Only in pidgin-guifications-2.14.gnucnull/src: gf_theme_ops.c.gnucnull
diff -ur pidgin-guifications-2.14/src/gf_utils.c pidgin-guifications-2.14.gnucnull/src/gf_utils.c
--- pidgin-guifications-2.14/src/gf_utils.c	2007-02-24 17:17:26.000000000 -0500
+++ pidgin-guifications-2.14.gnucnull/src/gf_utils.c	2007-10-27 10:41:18.000000000 -0400
@@ -19,6 +19,11 @@
 #include <glib.h>
 #include <string.h>
 
+#ifdef HAVE_CONFIG_H
+# include "../gf_config.h"
+#endif
+
+#include "gf_internal.h"
 #include "gf_utils.h"
 
 gint
Only in pidgin-guifications-2.14.gnucnull/src: gf_utils.c.gnucnull
diff -ur pidgin-guifications-2.14/src/guifications.c pidgin-guifications-2.14.gnucnull/src/guifications.c
--- pidgin-guifications-2.14/src/guifications.c	2007-05-04 23:36:21.000000000 -0400
+++ pidgin-guifications-2.14.gnucnull/src/guifications.c	2007-10-27 10:43:30.000000000 -0400
@@ -22,12 +22,12 @@
 
 #define PURPLE_PLUGINS
 
+#include "gf_internal.h"
 #include "gf_action.h"
 #include "gf_blist.h"
 #include "gf_display.h"
 #include "gf_event.h"
 #include "gf_gtk_utils.h"
-#include "gf_internal.h"
 #include "gf_item_text.h"
 #include "gf_preferences.h"
 #include "gf_theme.h"