File kde#89156.patch of Package digikam.openSUSE_13.2_Update

Overview Repositories Revisions Requests Users Attributes Meta

File kde#89156.patch of Package digikam.openSUSE_13.2_Update

From: Gilles Caulier <caulier.gilles@gmail.com>
Date: Tue, 28 Oct 2014 14:58:55 +0000
Subject: apply patch #89156
X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=f0400ec7e518e753e0c4ccab4eb2b8b022f91767
---
apply patch #89156
BUGS: 337737
FIXED-IN: 4.5.0
---

--- a/core/libs/widgets/common/databasewidget.cpp
+++ b/core/libs/widgets/common/databasewidget.cpp
@@ -172,30 +172,21 @@
 "MySQL backend is a more robust solution especially for remote and shared database storage. "
 "It is also more efficient to manage huge collection sizes. "
 "Be careful: this one it is still in experimental stage."));
+
 setDatabaseInputFields(DatabaseParameters::SQLiteDatabaseType());
 
 // --------------------------------------------------------
-
- adjustSize();
-
- // --------------------------------------------------------
-
- connect(databasePathEdit, SIGNAL(urlSelected(KUrl)),
- this, SLOT(slotChangeDatabasePath(KUrl)));
-
- connect(databasePathEdit, SIGNAL(textChanged(QString)),
- this, SLOT(slotDatabasePathEditedDelayed()));
 
 connect(databaseType, SIGNAL(currentIndexChanged(int)),
 this, SLOT(slotHandleDBTypeIndexChanged(int)));
 
+ connect(checkDatabaseConnectionButton, SIGNAL(clicked()),
+ this, SLOT(checkDatabaseConnection()));
+ 
 #ifdef HAVE_INTERNALMYSQL
 connect(internalServer, SIGNAL(stateChanged(int)),
 this, SLOT(slotHandleInternalServerCheckbox(int)));
 #endif // HAVE_INTERNALMYSQL
-
- connect(checkDatabaseConnectionButton, SIGNAL(clicked()),
- this, SLOT(checkDatabaseConnection()));
 }
 
 QString DatabaseWidget::currentDatabaseType() const
@@ -261,12 +252,24 @@
 d->databasePathLabel->setVisible(true);
 databasePathEdit->setVisible(true);
 d->expertSettings->setVisible(false);
+
+ connect(databasePathEdit, SIGNAL(urlSelected(KUrl)),
+ this, SLOT(slotChangeDatabasePath(KUrl)));
+
+ connect(databasePathEdit, SIGNAL(textChanged(QString)),
+ this, SLOT(slotDatabasePathEditedDelayed()));
 }
 else
 {
 d->databasePathLabel->setVisible(false);
 databasePathEdit->setVisible(false);
 d->expertSettings->setVisible(true);
+ 
+ disconnect(databasePathEdit, SIGNAL(urlSelected(KUrl)),
+ this, SLOT(slotChangeDatabasePath(KUrl)));
+
+ disconnect(databasePathEdit, SIGNAL(textChanged(QString)),
+ this, SLOT(slotDatabasePathEditedDelayed()));
 }
 
 adjustSize();
@@ -355,9 +358,9 @@
 
 password->setText(settings->getDatabasePassword());
 
- /* Now set the type according the database type from the settings.
- * If no item is found, ignore the setting.
- */
+ // Now set the type according the database type from the settings.
+ // If no item is found, ignore the setting.
+
 for (int i=0; i<databaseType->count(); ++i)
 {
 //kDebug(50003) << "Comparing comboboxentry on index ["<itemData(i)

Places

File kde#89156.patch of Package digikam.openSUSE_13.2_Update

Places