File 4_7_BRANCH.diff of Package kdebase4
--- a/BRANCH_STATUS
+++ b/BRANCH_STATUS
@@ -0,0 +1,2 @@
+current HEAD: ef882275a2dba6f9831cb0adc3e78fb359a2bc06
+git diff v4.7.2..origin/KDE/4.7
diff --git a/konqueror/settings/kio/policydlg.cpp b/konqueror/settings/kio/policydlg.cpp
index e066286..4f70bd4 100644
--- a/konqueror/settings/kio/policydlg.cpp
+++ b/konqueror/settings/kio/policydlg.cpp
@@ -75,8 +75,9 @@ PolicyDlg::PolicyDlg (const QString& caption, QWidget *parent,
enableButtonOk( false );
connect(m_dlgUI->leDomain, SIGNAL(textChanged(const QString&)),
- SLOT(slotTextChanged(const QString&)));
-
+ SLOT(slotTextChanged(const QString&)));
+ connect(m_dlgUI->cbPolicy,SIGNAL(currentIndexChanged(QString)),
+ SLOT(slotTextChanged(QString)));
setFixedSize (sizeHint());
m_dlgUI->leDomain->setFocus ();
}
@@ -90,8 +91,11 @@ void PolicyDlg::setEnableHostEdit( bool state, const QString& host )
void PolicyDlg::setPolicy (int policy)
{
- if ( policy > -1 && policy <= static_cast<int>(m_dlgUI->cbPolicy->count()) )
+ if ( policy > -1 && policy <= static_cast<int>(m_dlgUI->cbPolicy->count()) ) {
+ const bool blocked = m_dlgUI->cbPolicy->blockSignals(true);
m_dlgUI->cbPolicy->setCurrentIndex(policy-1);
+ m_dlgUI->cbPolicy->blockSignals(blocked);
+ }
if ( !m_dlgUI->leDomain->isEnabled() )
m_dlgUI->cbPolicy->setFocus();
diff --git a/konqueror/sidebar/test/test.desktop b/konqueror/sidebar/test/test.desktop
index 7d923c4..5dd33eb 100644
--- a/konqueror/sidebar/test/test.desktop
+++ b/konqueror/sidebar/test/test.desktop
@@ -85,7 +85,7 @@ Name[te]=పరీక్ష
Name[tg]=Санҷиш
Name[th]=ทดสอบ
Name[tr]=Test
-Name[ug]=سىنا
+Name[ug]=سىناق
Name[uk]=Тест
Name[uz]=Sinov
Name[uz@cyrillic]=Синов
/space/work/OBS/kdf/kdebase4