soc.2008.masterpassword: 09618b7c: Clean up headers and stuff.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 09618b7c9a9e5e2d44608a2e70a50ab3e1b2492b
Parent:   d9dcc23e32b3e7cd5e99381a5fa9a820920dfc8c
Author:   qulogic at pidgin.im
Date:     11/19/11 19:12:57
Branch:   im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/09618b7c9a9e5e2d44608a2e70a50ab3e1b2492b

Changelog: 

Clean up headers and stuff.

We don't need to include config.h and glib.h since internal.h
already does that. Also, I don't think we really need to define
PURPLE_PLUGINS being an internal plugin.

Changes against parent d9dcc23e32b3e7cd5e99381a5fa9a820920dfc8c

  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	50bde2a87dd24d85feb1c38c6c925c6add4a741b
+++ libpurple/plugins/keyrings/gnomekeyring.c	47079de8756b0810924d20eae8c4615a1e134f33
@@ -28,26 +28,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifndef PURPLE_PLUGINS
-# define PURPLE_PLUGINS
-#endif
-
-#include <glib.h>
-#include <gnome-keyring.h>
-
+#include "internal.h"
 #include "account.h"
-#include "version.h"
+#include "debug.h"
 #include "keyring.h"
-#include "debug.h"
 #include "plugin.h"
-#include "internal.h"
+#include "version.h"
 
+#include <gnome-keyring.h>
+
 #define GNOMEKEYRING_NAME        N_("GNOME-Keyring")
 #define GNOMEKEYRING_VERSION     "0.3b"
 #define GNOMEKEYRING_DESCRIPTION N_("This plugin will store passwords in GNOME Keyring.")
============================================================
--- libpurple/plugins/keyrings/internalkeyring.c	5cf11c11ef38d59cdb61aca2479702febc9c0162
+++ libpurple/plugins/keyrings/internalkeyring.c	8a3cb73e2b7a517c58e9217404a0ca427b31d5fa
@@ -27,22 +27,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifndef PURPLE_PLUGINS
-# define PURPLE_PLUGINS
-#endif
-
-#include <glib.h>
-
+#include "internal.h"
 #include "account.h"
-#include "version.h"
+#include "debug.h"
 #include "keyring.h"
-#include "debug.h"
 #include "plugin.h"
-#include "internal.h"
+#include "version.h"
 
 #define INTERNALKEYRING_NAME        N_("Internal keyring")
 #define INTERNALKEYRING_VERSION     "0.8b"
============================================================
--- libpurple/plugins/keyrings/kwallet.cpp	d63e4f02f869d5ec83f322b8c485f02af096691b
+++ libpurple/plugins/keyrings/kwallet.cpp	df5286062e817d8de257f5f2ad32408b470b741a
@@ -28,22 +28,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
- #include <config.h>
-#endif
-
-#ifndef PURPLE_PLUGINS
- #define PURPLE_PLUGINS
-#endif
-
-#include <glib.h>
-
+#include "internal.h"
 #include "account.h"
-#include "version.h"
+#include "debug.h"
 #include "keyring.h"
-#include "debug.h"
 #include "plugin.h"
-#include "internal.h"
+#include "version.h"
+
 #include <kwallet.h>
 
 #define KWALLET_NAME        N_("KWallet")