qulogic/libgnt

propagate from branch 'im.pidgin.pidgin' (head c58578ec3710d164555a820660f90bf6f39217fe)
to branch 'im.pidgin.pidgin.next.minor' (head 4c5f39541c809d847bac17db86351ad630851237)
--- a/gntinternal.h Fri Dec 25 21:33:50 2009 +0000
+++ b/gntinternal.h Sat Jan 09 04:03:53 2010 +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);
--- a/gntline.c Fri Dec 25 21:33:50 2009 +0000
+++ b/gntline.c Sat Jan 09 04:03:53 2010 +0000
@@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+#include "gntinternal.h"
#include "gntline.h"
enum
--- a/gntmenuitem.c Fri Dec 25 21:33:50 2009 +0000
+++ b/gntmenuitem.c Sat Jan 09 04:03:53 2010 +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"
--- a/gntmenuitemcheck.c Fri Dec 25 21:33:50 2009 +0000
+++ b/gntmenuitemcheck.c Sat Jan 09 04:03:53 2010 +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;
--- a/gntprogressbar.c Fri Dec 25 21:33:50 2009 +0000
+++ b/gntprogressbar.c Sat Jan 09 04:03:53 2010 +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"
--- a/gntslider.c Fri Dec 25 21:33:50 2009 +0000
+++ b/gntslider.c Sat Jan 09 04:03:53 2010 +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"
--- a/gntwidget.c Fri Dec 25 21:33:50 2009 +0000
+++ b/gntwidget.c Sat Jan 09 04:03:53 2010 +0000
@@ -22,6 +22,7 @@
/* Stuff brutally ripped from Gflib */
+#include "gntinternal.h"
#include "gntwidget.h"
#include "gntstyle.h"
#include "gntmarshal.h"
--- a/gntwindow.c Fri Dec 25 21:33:50 2009 +0000
+++ b/gntwindow.c Sat Jan 09 04:03:53 2010 +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"
--- a/wms/irssi.c Fri Dec 25 21:33:50 2009 +0000
+++ b/wms/irssi.c Sat Jan 09 04:03:53 2010 +0000
@@ -33,6 +33,8 @@
#include <string.h>
#include <sys/types.h>
+#include "gntinternal.h"
+
#include "gnt.h"
#include "gntbox.h"
#include "gntmenu.h"