soc.2008.masterpassword: ff3938ec: Fix signal handling. On this side, it's ...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: ff3938ecddd48f838889d612e40f8b94e2843b1d
Parent:   555d1d9bed1dc533d70ced4dc6bb5083b7bf2a00
Author:   qulogic at pidgin.im
Date:     11/20/11 03:57:53
Branch:   im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/ff3938ecddd48f838889d612e40f8b94e2843b1d

Changelog: 

Fix signal handling. On this side, it's a slot, not a signal.
And for QObjects that implement signals/slots, we need to also
run moc over the source.

Changes against parent 555d1d9bed1dc533d70ced4dc6bb5083b7bf2a00

  patched  configure.ac
  patched  libpurple/plugins/keyrings/Makefile.am
  patched  libpurple/plugins/keyrings/kwallet.cpp

-------------- next part --------------
============================================================
--- configure.ac	1611addd94a1a492def59f86085662e2cbde2150
+++ configure.ac	a36d6d9482ddb6560e0b250955fe15ca9907c311
@@ -1399,6 +1399,11 @@ Use --disable-kwallet if you do not need
 ])
 		])
 
+	AC_MSG_CHECKING([for metaobject compiler])
+	MOC=`$PKG_CONFIG --variable=moc_location QtCore`
+	AC_SUBST(MOC)
+	AC_MSG_RESULT([$MOC])
+
 	dnl Check for kwallet.h; if we don't have it, oh well
 	if test "$ac_kwallet_includes" != "no"; then
 		KWALLET_CXXFLAGS="-I$ac_kwallet_includes"
============================================================
--- libpurple/plugins/keyrings/Makefile.am	c9e4485e741e784c5e49e7a84806e3ab1a0a2e42
+++ libpurple/plugins/keyrings/Makefile.am	6637c34a33ac705993c0e5860c67801fa75f72d9
@@ -22,8 +22,12 @@ kwallet_la_SOURCES = kwallet.cpp
 kwallet_la_CXXFLAGS  = $(KWALLET_CXXFLAGS) $(QT4_CFLAGS)
 kwallet_la_LDFLAGS = -module -avoid-version
 kwallet_la_SOURCES = kwallet.cpp
+kwallet_la_BUILTSOURCES = kwallet.moc
 kwallet_la_LIBADD  = $(GLIB_LIBS) $(KWALLET_LIBS) $(QT4_LIBS)
 
+kwallet.moc: kwallet.cpp
+	$(AM_V_GEN)$(MOC) $(kwallet_la_CXXFLAGS) -i $< -o $@
+
 endif
 
 if PLUGINS
============================================================
--- libpurple/plugins/keyrings/kwallet.cpp	55f9dd61752f899811704544ba3dc2ffbb379eee
+++ libpurple/plugins/keyrings/kwallet.cpp	8ce517d5fbb123563ce5a8dd21fc8b2cc7ce0ebe
@@ -64,13 +64,15 @@ class engine : private QObject, private 
 
 class engine : private QObject, private QQueue<request*>
 {
+	Q_OBJECT
+
 	public:
 		engine();
 		~engine();
 		void queue(request *req);
 		static engine *Instance();
 
-	signals:
+	private slots:
 		void walletOpened(bool opened);
 
 	private:
@@ -122,7 +124,7 @@ KWalletPlugin::engine::engine()
 
 	connected = FALSE;
 	wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Asynchronous);
-	QObject::connect(wallet, SIGNAL(KWallet::Wallet::walletOpened(bool)), SLOT(walletOpened(bool)));
+	connect(wallet, SIGNAL(walletOpened(bool)), SLOT(walletOpened(bool)));
 }
 
 KWalletPlugin::engine::~engine()
@@ -374,3 +376,5 @@ PURPLE_INIT_PLUGIN(kwallet_keyring, init
 
 } /* extern "C" */
 
+#include "kwallet.moc"
+