# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1262282605 0
# Node ID 111a0a420ac7c4ae798b63d6925f9f2b890a7321
# Parent  2b9983e5cb8d75147f8760c2cd4ee574287c537d# Parent  88d889b54df44248dbc358e51e0846bdff0db2c5
merge of '48c771eeb88cbd5496d0886b95e8bbe1079d9f92'
     and 'ea18c8ce78c0229a5b968aab268f38e9bcae0aee'

diff -r 2b9983e5cb8d -r 111a0a420ac7 finch/gntidle.c
--- a/finch/gntidle.c	Thu Dec 31 18:02:58 2009 +0000
+++ b/finch/gntidle.c	Thu Dec 31 18:03:25 2009 +0000
@@ -21,6 +21,8 @@
  *
  */
 
+#include <internal.h>
+
 #include "finch.h"
 #include "gntidle.h"
 #include "gntwm.h"
diff -r 2b9983e5cb8d -r 111a0a420ac7 finch/gntrequest.c
--- a/finch/gntrequest.c	Thu Dec 31 18:02:58 2009 +0000
+++ b/finch/gntrequest.c	Thu Dec 31 18:03:25 2009 +0000
@@ -23,6 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -35,7 +37,6 @@
 #include <gnttree.h>
 
 #include "finch.h"
-#include <internal.h>
 #include "gntrequest.h"
 #include "debug.h"
 #include "util.h"
diff -r 2b9983e5cb8d -r 111a0a420ac7 finch/gntstatus.c
--- a/finch/gntstatus.c	Thu Dec 31 18:02:58 2009 +0000
+++ b/finch/gntstatus.c	Thu Dec 31 18:03:25 2009 +0000
@@ -23,6 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -34,7 +36,6 @@
 #include <gntutils.h>
 
 #include "finch.h"
-#include <internal.h>
 
 #include <notify.h>
 #include <request.h>
diff -r 2b9983e5cb8d -r 111a0a420ac7 finch/libgnt/gntinternal.h
--- a/finch/libgnt/gntinternal.h	Thu Dec 31 18:02:58 2009 +0000
+++ b/finch/libgnt/gntinternal.h	Thu Dec 31 18:03:25 2009 +0000
@@ -32,6 +32,14 @@
 # define gnt_warning g_warning
 #endif
 
+#ifndef G_GNUC_NULL_TERMINATED
+#	if defined(__GNUC__) && __GNUC__ >= 4
+#		define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
+#	else
+#		define G_GNUC_NULL_TERMINATED
+#	endif
+#endif
+
 extern int gnt_need_conversation_to_locale;
 extern const char *C_(const char *x);
 
diff -r 2b9983e5cb8d -r 111a0a420ac7 finch/libgnt/gntline.c
--- a/finch/libgnt/gntline.c	Thu Dec 31 18:02:58 2009 +0000
+++ b/finch/libgnt/gntline.c	Thu Dec 31 18:03:25 2009 +0000
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "gntinternal.h"
 #include "gntline.h"
 
 enum
diff -r 2b9983e5cb8d -r 111a0a420ac7 finch/libgnt/gntmenuitem.c
--- a/finch/libgnt/gntmenuitem.c	Thu Dec 31 18:02:58 2009 +0000
+++ b/finch/libgnt/gntmenuitem.c	Thu Dec 31 18:03:25 2009 +0000
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "gntinternal.h"
 #include "gntmenu.h"
 #include "gntmenuitem.h"
 
diff -r 2b9983e5cb8d -r 111a0a420ac7 finch/libgnt/gntmenuitemcheck.c
--- a/finch/libgnt/gntmenuitemcheck.c	Thu Dec 31 18:02:58 2009 +0000
+++ b/finch/libgnt/gntmenuitemcheck.c	Thu Dec 31 18:03:25 2009 +0000
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "gntinternal.h"
 #include "gntmenuitemcheck.h"
 
 static GntMenuItemClass *parent_class = NULL;
diff -r 2b9983e5cb8d -r 111a0a420ac7 finch/libgnt/gntprogressbar.c
--- a/finch/libgnt/gntprogressbar.c	Thu Dec 31 18:02:58 2009 +0000
+++ b/finch/libgnt/gntprogressbar.c	Thu Dec 31 18:03:25 2009 +0000
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  **/
 
+#include "gntinternal.h"
 #include "gntprogressbar.h"
 #include "gntutils.h"
 
diff -r 2b9983e5cb8d -r 111a0a420ac7 finch/libgnt/gntslider.c
--- a/finch/libgnt/gntslider.c	Thu Dec 31 18:02:58 2009 +0000
+++ b/finch/libgnt/gntslider.c	Thu Dec 31 18:03:25 2009 +0000
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "gntinternal.h"
 #include "gntcolors.h"
 #include "gntkeys.h"
 #include "gntslider.h"
diff -r 2b9983e5cb8d -r 111a0a420ac7 finch/libgnt/gntwidget.c
--- a/finch/libgnt/gntwidget.c	Thu Dec 31 18:02:58 2009 +0000
+++ b/finch/libgnt/gntwidget.c	Thu Dec 31 18:03:25 2009 +0000
@@ -22,6 +22,7 @@
 
 /* Stuff brutally ripped from Gflib */
 
+#include "gntinternal.h"
 #include "gntwidget.h"
 #include "gntstyle.h"
 #include "gntmarshal.h"
diff -r 2b9983e5cb8d -r 111a0a420ac7 finch/libgnt/gntwindow.c
--- a/finch/libgnt/gntwindow.c	Thu Dec 31 18:02:58 2009 +0000
+++ b/finch/libgnt/gntwindow.c	Thu Dec 31 18:03:25 2009 +0000
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "gntinternal.h"
 #include "gntstyle.h"
 #include "gntwindow.h"
 
diff -r 2b9983e5cb8d -r 111a0a420ac7 finch/libgnt/wms/irssi.c
--- a/finch/libgnt/wms/irssi.c	Thu Dec 31 18:02:58 2009 +0000
+++ b/finch/libgnt/wms/irssi.c	Thu Dec 31 18:03:25 2009 +0000
@@ -33,6 +33,8 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include "gntinternal.h"
+
 #include "gnt.h"
 #include "gntbox.h"
 #include "gntmenu.h"
diff -r 2b9983e5cb8d -r 111a0a420ac7 libpurple/protocols/mxit/splashscreen.c
--- a/libpurple/protocols/mxit/splashscreen.c	Thu Dec 31 18:02:58 2009 +0000
+++ b/libpurple/protocols/mxit/splashscreen.c	Thu Dec 31 18:03:25 2009 +0000
@@ -24,7 +24,6 @@
  */
 
 #include "internal.h"
-#include <glib/gstdio.h>
 
 #include "purple.h"
 #include "imgstore.h"