soc.2008.masterpassword: 8b028116: These plugin versions should be the same...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 8b028116f18a48b4ef3385d09d5d114026811358
Parent:   f9ac6592622723042a51c80e1ef32c11ab55250a
Author:   qulogic at pidgin.im
Date:     01/28/12 00:13:24
Branch:   im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/8b028116f18a48b4ef3385d09d5d114026811358

Changelog: 

These plugin versions should be the same as Pidgin.

Changes against parent f9ac6592622723042a51c80e1ef32c11ab55250a

  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	44de73c9c334f808724f2c57981204183f476543
+++ libpurple/plugins/keyrings/gnomekeyring.c	9cec2f6be740b3dff0bc3328b521620a32917d9f
@@ -38,7 +38,6 @@
 #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.")
 #define GNOMEKEYRING_AUTHOR      "Scrouaf (scrouaf[at]soc.pidgin.im)"
 #define GNOMEKEYRING_ID          "keyring-gnomekeyring"
@@ -364,7 +363,7 @@ PurplePluginInfo plugininfo =
 	PURPLE_PRIORITY_DEFAULT,	/* priority */
 	GNOMEKEYRING_ID,			/* id */
 	GNOMEKEYRING_NAME,			/* name */
-	GNOMEKEYRING_VERSION,		/* version */
+	DISPLAY_VERSION,			/* version */
 	"GNOME Keyring Plugin",		/* summary */
 	GNOMEKEYRING_DESCRIPTION,	/* description */
 	GNOMEKEYRING_AUTHOR,		/* author */
============================================================
--- libpurple/plugins/keyrings/internalkeyring.c	2b80af7a4651ea6aab4055356adedb005dbb3556
+++ libpurple/plugins/keyrings/internalkeyring.c	bda04c3a49c1a0843a927ae132d54deb18862528
@@ -35,7 +35,6 @@
 #include "version.h"
 
 #define INTERNALKEYRING_NAME        N_("Internal keyring")
-#define INTERNALKEYRING_VERSION     "0.8b"
 #define INTERNALKEYRING_DESCRIPTION N_("This plugin provides the default password storage behaviour for libpurple. Password will be stored unencrypted.")
 #define INTERNALKEYRING_AUTHOR      "Scrouaf (scrouaf[at]soc.pidgin.im)"
 #define INTERNALKEYRING_ID          PURPLE_DEFAULT_KEYRING
@@ -232,7 +231,7 @@ PurplePluginInfo plugininfo =
 	PURPLE_PRIORITY_DEFAULT,			/* priority */
 	INTERNALKEYRING_ID,					/* id */
 	INTERNALKEYRING_NAME,				/* name */
-	INTERNALKEYRING_VERSION,			/* version */
+	DISPLAY_VERSION,					/* version */
 	"Internal Keyring Plugin",			/* summary */
 	INTERNALKEYRING_DESCRIPTION,		/* description */
 	INTERNALKEYRING_AUTHOR,				/* author */
============================================================
--- libpurple/plugins/keyrings/kwallet.cpp	5f52a95a94f613f4caccad2b15d718de50ce22c6
+++ libpurple/plugins/keyrings/kwallet.cpp	132f1bbe6bce9a6952efbd290e67d23da2728920
@@ -40,7 +40,6 @@
 #include <kwallet.h>
 
 #define KWALLET_NAME        N_("KWallet")
-#define KWALLET_VERSION     "0.3b"
 #define KWALLET_DESCRIPTION N_("This plugin will store passwords in KWallet.")
 #define KWALLET_AUTHOR      "QuLogic (qulogic[at]pidgin.im)"
 #define KWALLET_ID          "keyring-kwallet"
@@ -367,7 +366,7 @@ PurplePluginInfo plugininfo =
 	PURPLE_PRIORITY_DEFAULT,			/* priority */
 	KWALLET_ID,							/* id */
 	KWALLET_NAME,						/* name */
-	KWALLET_VERSION,					/* version */
+	DISPLAY_VERSION,					/* version */
 	"KWallet Keyring Plugin",			/* summary */
 	KWALLET_DESCRIPTION,				/* description */
 	KWALLET_AUTHOR,						/* author */