Permalink
Browse files

[Maemo] Bug fixes

  • Loading branch information...
1 parent 1c02e12 commit 5034becb828c3bbfb5dc3e0a8cc47b1ab998437d @degtep degtep committed Apr 13, 2012
@@ -2,7 +2,7 @@ Source: qutim
Section: user/network
Priority: extra
Maintainer: Eugene Degtyarev <degtep@gmail.com>
-Build-Depends: debhelper (>= 5),locales,cmake,mce-dev,libgconf2-6,libssl-dev,libxext-dev,libqt4-dev,libqca-cyrus-sasl(>=2.0.0beta3-5),libqca2-dev,libqca2-plugin-ossl,pidgin-dev,libidn11-dev,libhunspell-dev,maemo-optify, libqtm-dev,lconvert
+Build-Depends: debhelper (>= 5),locales,cmake,mce-dev,libgconf2-6,libssl-dev,libxext-dev,libqt4-dev,libqca-cyrus-sasl(>=2.0.0beta3-5),libqca2-dev,libqca2-plugin-ossl,pidgin-dev,libidn11-dev,libhunspell-dev,maemo-optify, libqtm-dev,lconvert,libotr2-dev
Standards-Version: 3.7.2
Package: qutim
@@ -239,7 +239,7 @@ XB-Maemo-Icon-26:
Package: qutim-extra-plugins
Section: user/network
Architecture: any
-Depends: qutim,libhunspell-1.2-0,hunspell-en-ru(>=0.1.2), libqca2-plugin-gnupg
+Depends: qutim,libhunspell-1.2-0,hunspell-en-ru(>=0.1.2), libqca2-plugin-gnupg,libotr2
Description: WebKit Chat, QML Chat, Mass messaging, Chat spell checker with hunspell, Dbus-api, OpenPGP for pgp crypt, Yandex-narod for uploading files, URLPreview, Weather and others
XSBC-Maemo-Display-Name: qutIM extra plugins
XSBC-Bugtracker: https://launchpad.net/qutim
@@ -1,3 +1,4 @@
+opt/qutim/lib/qutim/plugins/libadiumwebview.so
opt/qutim/lib/qutim/plugins/libbirthdayreminder.so
opt/qutim/lib/qutim/plugins/libblogimprover.so
opt/qutim/lib/qutim/plugins/libchatspellchecker.so
@@ -6,7 +7,6 @@ opt/qutim/lib/qutim/plugins/libhunspeller.so
opt/qutim/lib/qutim/plugins/libmassmessaging.so
opt/qutim/lib/qutim/plugins/libofftherecord.so
opt/qutim/lib/qutim/plugins/libyandexnarod.so
-opt/qutim/lib/qutim/plugins/libwebkitchat.so
opt/qutim/lib/qutim/plugins/libqmlchat.so
opt/qutim/lib/qutim/plugins/liburlpreview.so
opt/qutim/lib/qutim/plugins/libweather.so
@@ -1,6 +1,8 @@
opt/qutim/bin/qutim
opt/qutim/lib/lib*
-opt/qutim/lib/qutim/plugins/liba*
+opt/qutim/lib/qutim/plugins/libadiumchat.so
+opt/qutim/lib/qutim/plugins/libaccountcreator.so
+opt/qutim/lib/qutim/plugins/libaddcontactdlg.so
opt/qutim/lib/qutim/plugins/libbearer*
opt/qutim/lib/qutim/plugins/libchatnotificationsbackend.so
opt/qutim/lib/qutim/plugins/libclconf.so
@@ -29,6 +29,9 @@
#include <qutim/servicemanager.h>
#include <QWebFrame>
#include <QApplication>
+#ifdef Q_WS_MAEMO_5
+#include <QMouseEvent>
+#endif
namespace Adium {
@@ -41,6 +44,10 @@ WebViewWidget::WebViewWidget(QWidget *parent)
QMetaObject::invokeMethod(scroller,
"enableScrolling",
Q_ARG(QObject*, this));
+#ifdef Q_WS_MAEMO_5
+ mousePressed = false;
+ installEventFilter(this);
+#endif
}
void WebViewWidget::setViewController(QObject* object)
@@ -61,5 +68,28 @@ void WebViewWidget::setViewController(QObject* object)
setPage(new QWebPage(this));
}
+#ifdef Q_WS_MAEMO_5
+bool WebViewWidget::eventFilter(QObject *, QEvent *e)
+{
+ switch (e->type()) {
+ case QEvent::MouseButtonPress:
+ if (static_cast<QMouseEvent *>(e)->button() == Qt::LeftButton)
+ mousePressed = true;
+ break;
+ case QEvent::MouseButtonRelease:
+ if (static_cast<QMouseEvent *>(e)->button() == Qt::LeftButton)
+ mousePressed = false;
+ break;
+ case QEvent::MouseMove:
+ if (mousePressed)
+ return true;
+ break;
+ default:
+ break;
+ }
+ return false;
+}
+#endif
+
} // namespace Adium
@@ -43,6 +43,10 @@ class WebViewWidget : public QWebView, public Core::AdiumChat::ChatViewWidget
virtual void setViewController(QObject* controller);
private:
QWeakPointer<WebViewController> m_controller;
+#ifdef Q_WS_MAEMO_5
+ bool mousePressed;
+ virtual bool eventFilter(QObject *, QEvent *e);
+#endif
};
} // namespace Adium
@@ -48,7 +48,7 @@ Maemo5Idle::Maemo5Idle()
void Maemo5Idle::doCheck()
{
- emit secondsIdle(idleMinutes);
+ emit secondsIdle(idleMinutes*60);
}
void Maemo5Idle::setDisplayState(const QString &state)

0 comments on commit 5034bec

Please sign in to comment.