rpms/kdebase-runtime/F-10 kdebase-runtime-4.3.1-comborender.patch, NONE, 1.1 kdebase-runtime-4.3.1-kcmlocalecrash.patch, NONE, 1.1 kdebase-runtime.spec, 1.92, 1.93

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20805/F-10

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.3.1-comborender.patch 
	kdebase-runtime-4.3.1-kcmlocalecrash.patch 
Log Message:
backport 2 kdebase-runtime bugfixes from the 4.3 branch


kdebase-runtime-4.3.1-comborender.patch:
 oxygen.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE kdebase-runtime-4.3.1-comborender.patch ---
Index: kstyles/oxygen/oxygen.cpp
===================================================================
--- kstyles/oxygen/oxygen.cpp	(revision 1008049)
+++ kstyles/oxygen/oxygen.cpp	(revision 1008050)
@@ -322,6 +322,7 @@
                 p->setClipRegion(rbOpt->rect);
                 p->drawRect(rbOpt->rect.adjusted(0,0,-1,-1));
                 p->restore();
+                return;
             }
             break;
         }
@@ -354,6 +355,7 @@
                                  cb->palette, cb->state & State_Enabled, cb->currentText);
                 }
                 p->restore();
+                return;
             }
             break;
         }

kdebase-runtime-4.3.1-kcmlocalecrash.patch:
 kcmlocale.cpp |   24 +++++++++++++++++-------
 kcmlocale.h   |    1 +
 2 files changed, 18 insertions(+), 7 deletions(-)

--- NEW FILE kdebase-runtime-4.3.1-kcmlocalecrash.patch ---
Index: kcontrol/locale/kcmlocale.h
===================================================================
--- kcontrol/locale/kcmlocale.h	(revision 1008860)
+++ kcontrol/locale/kcmlocale.h	(revision 1008861)
@@ -66,6 +66,7 @@
 private:
   enum Direction {Up,Down};
   void languageMove(Direction direcition);
+  int selectedRow() const;
 
 
   // NOTE: we need to mantain our own language list instead of using KLocale's
Index: kcontrol/locale/kcmlocale.cpp
===================================================================
--- kcontrol/locale/kcmlocale.cpp	(revision 1008860)
+++ kcontrol/locale/kcmlocale.cpp	(revision 1008861)
@@ -101,9 +101,19 @@
     m_languageList = configGroup.readEntry("Language").split(':',QString::SkipEmptyParts);
 }
 
+int KLocaleConfig::selectedRow() const
+{
+    QList<QListWidgetItem *>selectedItems = m_languages->selectedItems();
+
+    if ( selectedItems.isEmpty() ) {
+        return -1;
+    }
+    return m_languages->row( selectedItems.at(0) );
+}
+
 void KLocaleConfig::slotAddLanguage(const QString & code)
 {
-  int pos = m_languages->currentRow();
+  int pos = selectedRow();
   if ( pos < 0 )
     pos = 0;
 
@@ -126,7 +136,7 @@
 
 void KLocaleConfig::slotRemoveLanguage()
 {
-  int pos = m_languages->currentRow();
+  int pos = selectedRow();
 
   if (pos != -1)
   {
@@ -142,7 +152,7 @@
 
 void KLocaleConfig::languageMove(Direction direcition)
 {
-  int pos = m_languages->currentRow();
+  int pos = selectedRow();
 
   QStringList::Iterator it1 = m_languageList.begin() + pos - 1*(direcition==Up);
   QStringList::Iterator it2 = m_languageList.begin() + pos + 1*(direcition==Down);
@@ -194,10 +204,10 @@
 
 void KLocaleConfig::slotCheckButtons()
 {
-  languageRemove->setEnabled( m_languages->currentRow() != -1 && m_languages->count() > 1 );
-  m_upButton->setEnabled( m_languages->currentRow() > 0 );
-  m_downButton->setEnabled( m_languages->currentRow() != -1 &&
-                            m_languages->currentRow() < (signed)(m_languages->count() - 1) );
+  languageRemove->setEnabled( selectedRow() != -1 && m_languages->count() > 1 );
+  m_upButton->setEnabled( selectedRow() > 0 );
+  m_downButton->setEnabled( selectedRow() != -1 &&
+                            selectedRow() < (signed)(m_languages->count() - 1) );
 }
 
 void KLocaleConfig::slotLocaleChanged()


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- kdebase-runtime.spec	5 Aug 2009 00:18:17 -0000	1.92
+++ kdebase-runtime.spec	10 Aug 2009 16:46:16 -0000	1.93
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.0
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -23,6 +23,10 @@ Patch3:        kdebase-runtime-4.1.1-ico
 Patch4:        kdebase-runtime-4.3.0-nepomuk-autostart.patch
 
 ## Upstream patches
+# http://websvn.kde.org/?view=rev&revision=1008050
+Patch5:        kdebase-runtime-4.3.1-comborender.patch
+# http://websvn.kde.org/?view=rev&revision=1008861
+Patch6:        kdebase-runtime-4.3.1-kcmlocalecrash.patch
 
 # when kdesu was removed, this is/should-be only temporary
 %if 0%{?fedora} < 11
@@ -96,6 +100,8 @@ BuildArch: noarch
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
 %patch4 -p1 -b .nepomuk-autostart
+%patch5 -p0 -b .comborender
+%patch6 -p0 -b .kcmlocalecrash
 
 %build
 mkdir -p %{_target_platform}
@@ -215,6 +221,10 @@ fi
 
 
 %changelog
+* Mon Aug 10 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.0-3
+- fix Oxygen comboboxes' text being garbled (drawn twice); fixes kdebug:202701
+- fix Locale control module crashing when dragging languages around (kdebug:201578)
+
 * Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-2
 - respin