diff --git a/src/sip/jabber/googlewrapper/googlewrapper.cpp b/src/sip/jabber/googlewrapper/googlewrapper.cpp index 1a1865fb6..1bf736bd3 100644 --- a/src/sip/jabber/googlewrapper/googlewrapper.cpp +++ b/src/sip/jabber/googlewrapper/googlewrapper.cpp @@ -21,6 +21,7 @@ #include #include "ui_configwidget.h" +#include SipPlugin* GoogleWrapperFactory::createPlugin( const QString& pluginId ) @@ -52,6 +53,19 @@ GoogleWrapper::icon() const return QIcon( ":/gmail-logo.png" ); } +void +GoogleWrapper::showAddFriendDialog() +{ + bool ok; + QString id = QInputDialog::getText( 0, tr( "Add Friend" ), + tr( "Enter Google Address:" ), QLineEdit::Normal, + "", &ok ); + if ( !ok ) + return; + + qDebug() << "Attempting to add google contact to roster:" << id; + addContact( id ); +} #ifdef GOOGLE_WRAPPER Q_EXPORT_PLUGIN2( sipfactory, GoogleWrapperFactory ) diff --git a/src/sip/jabber/googlewrapper/googlewrapper.h b/src/sip/jabber/googlewrapper/googlewrapper.h index 09f2dc8e0..5478b882e 100644 --- a/src/sip/jabber/googlewrapper/googlewrapper.h +++ b/src/sip/jabber/googlewrapper/googlewrapper.h @@ -47,6 +47,8 @@ public: virtual const QString friendlyName() const { return "Google"; } virtual QIcon icon() const; +public slots: + void showAddFriendDialog(); }; #endif // GOOGLEWRAPPER_H diff --git a/src/sip/jabber/jabber.h b/src/sip/jabber/jabber.h index 89b067525..e361cae02 100644 --- a/src/sip/jabber/jabber.h +++ b/src/sip/jabber/jabber.h @@ -94,12 +94,12 @@ public slots: void broadcastMsg( const QString &msg ); void addContact( const QString &jid, const QString& msg = QString() ); void refreshProxy(); + void showAddFriendDialog(); protected: Ui_JabberConfig* m_ui; // so the google wrapper can change the config dialog a bit private slots: - void showAddFriendDialog(); void showXmlConsole(); void onConnect(); void onDisconnect(Jreen::Client::DisconnectReason reason); diff --git a/thirdparty/jreen b/thirdparty/jreen index 8f995f246..a231a2b38 160000 --- a/thirdparty/jreen +++ b/thirdparty/jreen @@ -1 +1 @@ -Subproject commit 8f995f246637f533feb7124744e113034a32b505 +Subproject commit a231a2b3868baf32312d65cb7e371828212d7745