/cpw/tomkiewicz/masterpassword: c915903f6e43: Get rid of warnings

[Tomasz Wasilczyk]

Changeset: c915903f6e43725d43ba244406e2e00ea412e6c7
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2013-03-18 19:38 +0100
Branch:	 soc.2008.masterpassword
URL: https://hg.pidgin.im/cpw/tomkiewicz/masterpassword/rev/c915903f6e43

Description:

Get rid of warnings

diffstat:

 configure.ac                           |   2 +-
 libpurple/plugins/keyrings/kwallet.cpp |  19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diffs (55 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1476,7 +1476,7 @@ if test "x$GCC" = "xyes"; then
 	DEBUG_CFLAGS="-Wall $DEBUG_CFLAGS"
 	CFLAGS="-g $CFLAGS"
 fi
-DEBUG_CPPFLAGS=`echo "$DEBUG_CFLAGS" | $sedpath 's/-Wdeclaration-after-statement//' | $sedpath 's/-Wmissing-prototypes//'`
+DEBUG_CPPFLAGS=`echo "$DEBUG_CFLAGS" | $sedpath 's/-Wdeclaration-after-statement//' | $sedpath 's/-Wmissing-prototypes//' | $sedpath 's/-Waggregate-return//'`
 
 if test "x$SUNCC" = "xyes"; then
         CFLAGS="$CFLAGS -features=extensions" 
diff --git a/libpurple/plugins/keyrings/kwallet.cpp b/libpurple/plugins/keyrings/kwallet.cpp
--- a/libpurple/plugins/keyrings/kwallet.cpp
+++ b/libpurple/plugins/keyrings/kwallet.cpp
@@ -52,6 +52,7 @@ namespace KWalletPlugin {
 class request
 {
 	public:
+		virtual ~request();
 		virtual void abort() = 0;
 		virtual void execute(KWallet::Wallet *wallet) = 0;
 
@@ -119,6 +120,10 @@ kwallet_plugin_error_domain(void)
 
 KWalletPlugin::engine *KWalletPlugin::engine::pinstance = NULL;
 
+KWalletPlugin::request::~request()
+{
+}
+
 KWalletPlugin::engine::engine()
 {
 	int argc = 0;
@@ -397,13 +402,13 @@ PurplePluginInfo plugininfo =
 	PURPLE_PLUGIN_FLAG_INVISIBLE|PURPLE_PLUGIN_FLAG_AUTOLOAD,	/* flags */
 	NULL,								/* dependencies */
 	PURPLE_PRIORITY_DEFAULT,			/* priority */
-	KWALLET_ID,							/* id */
-	KWALLET_NAME,						/* name */
-	DISPLAY_VERSION,					/* version */
-	"KWallet Keyring Plugin",			/* summary */
-	KWALLET_DESCRIPTION,				/* description */
-	KWALLET_AUTHOR,						/* author */
-	PURPLE_WEBSITE,						/* homepage */
+	(char*)KWALLET_ID,							/* id */
+	(char*)KWALLET_NAME,						/* name */
+	(char*)DISPLAY_VERSION,					/* version */
+	(char*)"KWallet Keyring Plugin",			/* summary */
+	(char*)KWALLET_DESCRIPTION,				/* description */
+	(char*)KWALLET_AUTHOR,						/* author */
+	(char*)PURPLE_WEBSITE,						/* homepage */
 	kwallet_load,						/* load */
 	kwallet_unload,						/* unload */
 	NULL,								/* destroy */