soc.2008.masterpassword: 46052394: These checks are unnecessary because we ...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 46052394c50008d62db7ff3fe28d2e01e480c05f
Parent:   13b76367579b1022e7c8913d8ec12cff19769374
Author:   qulogic at pidgin.im
Date:     10/31/11 03:55:55
Branch:   im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/46052394c50008d62db7ff3fe28d2e01e480c05f

Changelog: 

These checks are unnecessary because we require a newer GLib.

Changes against parent 13b76367579b1022e7c8913d8ec12cff19769374

  patched  libpurple/plugins/keyrings/gnomekeyring.c
  patched  libpurple/plugins/keyrings/internalkeyring.c
  patched  libpurple/plugins/keyrings/kwallet.cpp

-------------- next part --------------
============================================================
--- libpurple/plugins/keyrings/gnomekeyring.c	74fec7544719b7ec1a42b715643662819b578de5
+++ libpurple/plugins/keyrings/gnomekeyring.c	51f8efed100c5bf6c485788b1e0b45fd7c424ee5
@@ -41,14 +41,6 @@
 #include <glib.h>
 #include <gnome-keyring.h>
 
-#ifndef G_GNUC_NULL_TERMINATED
-# if __GNUC__ >= 4
-#  define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
-# else
-#  define G_GNUC_NULL_TERMINATED
-# endif
-#endif
-
 #include "account.h"
 #include "version.h"
 #include "keyring.h"
============================================================
--- libpurple/plugins/keyrings/internalkeyring.c	26c9aa38f3164760426cfdcfbff731bbb98b670f
+++ libpurple/plugins/keyrings/internalkeyring.c	6c61cff77f63010a9978d31a851e6ce81cd1c6a6
@@ -37,14 +37,6 @@
 
 #include <glib.h>
 
-#ifndef G_GNUC_NULL_TERMINATED
-# if __GNUC__ >= 4
-#  define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
-# else
-#  define G_GNUC_NULL_TERMINATED
-# endif
-#endif
-
 #include "account.h"
 #include "version.h"
 #include "keyring.h"
============================================================
--- libpurple/plugins/keyrings/kwallet.cpp	87cb5b1f272cb0139d376ce004a980d762d2c58f
+++ libpurple/plugins/keyrings/kwallet.cpp	cc66c69b284c68237601fd41526ff2f6a8e2a1aa
@@ -38,14 +38,6 @@
 
 #include <glib.h>
 
-#ifndef G_GNUC_NULL_TERMINATED
- #if __GNUC__ >= 4
-  #define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
- #else
-  #define G_GNUC_NULL_TERMINATED
- #endif
-#endif
-
 #include "account.h"
 #include "version.h"
 #include "keyring.h"