pidgin: ea18c8ce: Fix building finch & libgnt using older ..

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: ea18c8ce78c0229a5b968aab268f38e9bcae0aee
Ancestor: 2f5e5c51b0c4ca200f12170167cf0b2c40e41dfd
Author: nosnilmot at pidgin.im
Date: 2009-12-31T17:33:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ea18c8ce78c0229a5b968aab268f38e9bcae0aee

Modified files:
        finch/gntidle.c finch/gntrequest.c finch/gntstatus.c
        finch/libgnt/gntinternal.h finch/libgnt/gntline.c
        finch/libgnt/gntmenuitem.c finch/libgnt/gntmenuitemcheck.c
        finch/libgnt/gntprogressbar.c finch/libgnt/gntslider.c
        finch/libgnt/gntwidget.c finch/libgnt/gntwindow.c
        finch/libgnt/wms/irssi.c

ChangeLog: 

Fix building finch & libgnt using older gcc or non-gcc compilers that do
not understand G_GNUC_NULL_TERMINATED

-------------- next part --------------
============================================================
--- finch/gntidle.c	8eff361f271a8ca5b22909334f13a0d2666679a8
+++ finch/gntidle.c	3b3854b330e90800cdf5e8f9d7def6a9796cc8cc
@@ -21,6 +21,8 @@
  *
  */
 
+#include <internal.h>
+
 #include "finch.h"
 #include "gntidle.h"
 #include "gntwm.h"
============================================================
--- finch/gntrequest.c	7222ef615809645e9b34d0bbb38eeecdd981dec0
+++ finch/gntrequest.c	f18d02933e988a7afc44b078d45e7a2f3fbceae3
@@ -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"
============================================================
--- finch/gntstatus.c	0f7b880158001930fe560f89774b3a1b0584b846
+++ finch/gntstatus.c	26ff1916749d19a3688851b030844191d1547cf3
@@ -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>
============================================================
--- finch/libgnt/gntinternal.h	05baa71b9741ebe3fe9715212ca5ec4f5fe7b955
+++ finch/libgnt/gntinternal.h	77f663536ce5994d7a911e723779531968df25f3
@@ -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);
 
============================================================
--- finch/libgnt/gntline.c	c0a1fcae1d58d9eb3e8047b505e341ea0a5ccb8f
+++ finch/libgnt/gntline.c	9b9ac222d20e20b2ebf3f28c26c77bf6dbdad5f5
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "gntinternal.h"
 #include "gntline.h"
 
 enum
============================================================
--- finch/libgnt/gntmenuitem.c	9480410c5eb485a343e59f825af742affde56d03
+++ finch/libgnt/gntmenuitem.c	9042a272bbfc297bc6dd717c18a96014bfd2a42c
@@ -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"
 
============================================================
--- finch/libgnt/gntmenuitemcheck.c	a88a84c57bee500f1101039abe8a556af247607d
+++ finch/libgnt/gntmenuitemcheck.c	ed5e44766db1d8befffedf25b248deacd589f25b
@@ -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;
============================================================
--- finch/libgnt/gntprogressbar.c	ddb5aa54f2174731fd535a009e44138fb64e481b
+++ finch/libgnt/gntprogressbar.c	9a456a3eacaba063425899b910e8f7e0234dc411
@@ -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"
 
============================================================
--- finch/libgnt/gntslider.c	84297380ffcee7a81fc5f1260a881b4669625bad
+++ finch/libgnt/gntslider.c	1db1b051ffd1a2cee8f571fa89857ebfb676a35d
@@ -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"
============================================================
--- finch/libgnt/gntwidget.c	69bbe8a9a31ac27dfaedb8ca1a46e696eb966e23
+++ finch/libgnt/gntwidget.c	648d60b0afde13e95913edce727a09c02de3bb33
@@ -22,6 +22,7 @@
 
 /* Stuff brutally ripped from Gflib */
 
+#include "gntinternal.h"
 #include "gntwidget.h"
 #include "gntstyle.h"
 #include "gntmarshal.h"
============================================================
--- finch/libgnt/gntwindow.c	756cd9ebdc490c0343ab2f3fccb2d5a55d33d960
+++ finch/libgnt/gntwindow.c	187fc78d28a7e074db7799df93a0f52851a96de6
@@ -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"
 
============================================================
--- finch/libgnt/wms/irssi.c	a4b1b96ad8f786552b29b0a0061ad0f9b1b45312
+++ finch/libgnt/wms/irssi.c	8ba9f0b34833441224bce2496f3356f68273d8b0
@@ -33,6 +33,8 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include "gntinternal.h"
+
 #include "gnt.h"
 #include "gntbox.h"
 #include "gntmenu.h"