diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2017-11-10 10:30:26 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2017-11-10 10:04:28 -0800 |
commit | d1d4b4edb11de05294ba2502f1b87506d24c23f1 (patch) | |
tree | 096a0c2e197d1a59ebc71c9d728d567353ba5f5f | |
parent | 513f5a0230f5039ba5407562a7539a22cb20802a (diff) | |
download | subsurface-d1d4b4edb11de05294ba2502f1b87506d24c23f1.tar.gz |
Initialize Facebook page only when dialog is shown
Quick hack to avoid Facebook access on every program start. Move the initialization
of the login page from the FacebookConnectWidget constructor to the show event handler.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
-rw-r--r-- | desktop-widgets/plugins/facebook/facebookconnectwidget.cpp | 15 | ||||
-rw-r--r-- | desktop-widgets/plugins/facebook/facebookconnectwidget.h | 1 |
2 files changed, 11 insertions, 5 deletions
diff --git a/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp b/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp index b4f306609..37da1c018 100644 --- a/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp +++ b/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp @@ -300,6 +300,16 @@ void FacebookManager::uploadFinished() emit sendDiveFinished(); } +void FacebookConnectWidget::showEvent(QShowEvent *event) +{ + if (FacebookManager::instance()->loggedIn()) { + facebookLoggedIn(); + } else { + facebookDisconnect(); + } + return QDialog::showEvent(event); +} + FacebookConnectWidget::FacebookConnectWidget(QWidget *parent) : QDialog(parent), ui(new Ui::FacebookConnectWidget) { ui->setupUi(this); FacebookManager *fb = FacebookManager::instance(); @@ -309,11 +319,6 @@ FacebookConnectWidget::FacebookConnectWidget(QWidget *parent) : QDialog(parent), facebookWebView = new QWebView(this); #endif ui->fbWebviewContainer->layout()->addWidget(facebookWebView); - if (fb->loggedIn()) { - facebookLoggedIn(); - } else { - facebookDisconnect(); - } #ifdef USE_WEBENGINE connect(facebookWebView, &QWebEngineView::urlChanged, fb, &FacebookManager::tryLogin); #else diff --git a/desktop-widgets/plugins/facebook/facebookconnectwidget.h b/desktop-widgets/plugins/facebook/facebookconnectwidget.h index 3a442d4c9..ebaded04b 100644 --- a/desktop-widgets/plugins/facebook/facebookconnectwidget.h +++ b/desktop-widgets/plugins/facebook/facebookconnectwidget.h @@ -70,6 +70,7 @@ public: explicit FacebookConnectWidget(QWidget* parent = 0); void facebookLoggedIn(); void facebookDisconnect(); + void showEvent(QShowEvent *event); private: Ui::FacebookConnectWidget *ui; #ifdef USE_WEBENGINE |