/soc/2013/ankitkv/gobjectification: 84cfc0d40789: Simplify inclu...

[Ankit Vani]

Changeset: 84cfc0d407890351be18502aa53230c5caafdf41
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-26 23:02 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/84cfc0d40789

Description:

Simplify includes for caesarcipher*

diffstat:

 libpurple/plugins/caesarcipher.c          |   1 +
 libpurple/plugins/caesarcipher.h          |  17 -----------------
 libpurple/plugins/caesarcipher_consumer.c |   1 +
 3 files changed, 2 insertions(+), 17 deletions(-)

diffs (50 lines):

diff --git a/libpurple/plugins/caesarcipher.c b/libpurple/plugins/caesarcipher.c
--- a/libpurple/plugins/caesarcipher.c
+++ b/libpurple/plugins/caesarcipher.c
@@ -23,6 +23,7 @@
  * 02111-1301, USA.
  */
 
+#include <purple.h>
 #include "caesarcipher.h"
 
 #define CAESAR_CIPHER_GET_PRIVATE(obj) \
diff --git a/libpurple/plugins/caesarcipher.h b/libpurple/plugins/caesarcipher.h
--- a/libpurple/plugins/caesarcipher.h
+++ b/libpurple/plugins/caesarcipher.h
@@ -23,24 +23,7 @@
 #ifndef _CAESAR_CIPHER_H_
 #define _CAESAR_CIPHER_H_
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifndef G_GNUC_NULL_TERMINATED
-# if __GNUC__ >= 4
-#  define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
-# else
-#  define G_GNUC_NULL_TERMINATED
-# endif
-#endif
-
-#ifndef PURPLE_PLUGINS
-# define PURPLE_PLUGINS
-#endif
-
 #include "cipher.h"
-#include "plugins.h"
 
 #define CAESAR_TYPE_CIPHER             (caesar_cipher_get_type())
 #define CAESAR_CIPHER(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), CAESAR_TYPE_CIPHER, CaesarCipher))
diff --git a/libpurple/plugins/caesarcipher_consumer.c b/libpurple/plugins/caesarcipher_consumer.c
--- a/libpurple/plugins/caesarcipher_consumer.c
+++ b/libpurple/plugins/caesarcipher_consumer.c
@@ -23,6 +23,7 @@
  * 02111-1301, USA.
  */
 
+#include <purple.h>
 #include "caesarcipher.h"
 
 static void