rpms/konq-plugins/F-9 konq-plugins-4.0.3-searchbar-crash.patch, 1.1, 1.2 konq-plugins.spec, 1.4, 1.5

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/konq-plugins/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5255/F-9

Modified Files:
	konq-plugins-4.0.3-searchbar-crash.patch konq-plugins.spec 
Log Message:
Make the patch actually apply (tabs vs. spaces).

konq-plugins-4.0.3-searchbar-crash.patch:

Index: konq-plugins-4.0.3-searchbar-crash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/konq-plugins/F-9/konq-plugins-4.0.3-searchbar-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- konq-plugins-4.0.3-searchbar-crash.patch	4 May 2008 19:21:42 -0000	1.1
+++ konq-plugins-4.0.3-searchbar-crash.patch	4 May 2008 19:32:15 -0000	1.2
@@ -1,8 +1,7 @@
-Index: searchbar/searchbar.cpp
-===================================================================
---- searchbar/searchbar.cpp	(revision 794424)
-+++ searchbar/searchbar.cpp	(revision 794423)
-@@ -36,6 +36,7 @@
+diff -ur konq-plugins-4.0.3/searchbar/searchbar.cpp konq-plugins-4.0.3-searchbar-crash/searchbar/searchbar.cpp
+--- konq-plugins-4.0.3/searchbar/searchbar.cpp	2008-04-09 10:28:01.000000000 +0200
++++ konq-plugins-4.0.3-searchbar-crash/searchbar/searchbar.cpp	2008-05-04 21:30:44.000000000 +0200
+@@ -38,6 +38,7 @@
  #include <kurifilter.h>
  #include <kservice.h>
  #include <kparts/mainwindow.h>
@@ -10,26 +9,26 @@
  #include <kactioncollection.h>
  
  #include <qpainter.h>
-@@ -89,8 +90,16 @@
+@@ -81,8 +82,16 @@
  
- 	configurationChanged();
+     configurationChanged();
  
--        // parent is the KonqMainWindow and we want to listen to PartActivateEvent events.
--        parent->installEventFilter(this);
-+	KParts::MainWindow *mainWin = static_cast<KParts::MainWindow*>(parent);
+-    // parent is the KonqMainWindow and we want to listen to PartActivateEvent events.
+-    parent->installEventFilter(this);
++    KParts::MainWindow *mainWin = static_cast<KParts::MainWindow*>(parent);
 +
-+	//Grab the part manager. Don't know of any other way, and neither does Tronical, so..
-+	KParts::PartManager *partMan = qFindChild<KParts::PartManager*>(mainWin, QString());
-+	if (partMan)
-+	{
-+		connect(partMan, SIGNAL(activePartChanged(KParts::Part*)),
-+		                 SLOT  (partChanged      (KParts::Part*)));
-+		partChanged(partMan->activePart());
-+	}
++    //Grab the part manager. Don't know of any other way, and neither does Tronical, so..
++    KParts::PartManager *partMan = qFindChild<KParts::PartManager*>(mainWin, QString());
++    if (partMan)
++    {
++        connect(partMan, SIGNAL(activePartChanged(KParts::Part*)),
++                         SLOT  (partChanged      (KParts::Part*)));
++        partChanged(partMan->activePart());
++    }
  }
  
  SearchBarPlugin::~SearchBarPlugin()
-@@ -114,11 +123,8 @@
+@@ -110,11 +119,7 @@
  
  bool SearchBarPlugin::eventFilter(QObject *o, QEvent *e)
  {
@@ -37,9 +36,8 @@
 -        KParts::PartActivateEvent* partEvent = static_cast<KParts::PartActivateEvent *>(e);
 -        m_part = qobject_cast<KParts::ReadOnlyPart *>(partEvent->part());
 -    }
--    else if(o == m_searchCombo->lineEdit() && e->type() == QEvent::KeyPress) {
-+	if( o==m_searchCombo->lineEdit() && e->type() == QEvent::KeyPress )
-+	{
- 		QKeyEvent *k = (QKeyEvent *)e;
- 		if(k->modifiers() & Qt::ControlModifier)
- 		{
+-    else if (o == m_searchCombo->lineEdit() && e->type() == QEvent::KeyPress) {
++    if (o == m_searchCombo->lineEdit() && e->type() == QEvent::KeyPress) {
+         QKeyEvent *k = (QKeyEvent *)e;
+         if (k->modifiers() & Qt::ControlModifier) {
+             if (k->key()==Qt::Key_Down) {


Index: konq-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konq-plugins/F-9/konq-plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- konq-plugins.spec	4 May 2008 19:21:42 -0000	1.4
+++ konq-plugins.spec	4 May 2008 19:32:15 -0000	1.5
@@ -72,7 +72,7 @@
 
 %patch0 -p1 -b .cmakelists
 %patch1 -p1 -b .docsdir
-%patch2 -p0 -b .searchbar-crash
+%patch2 -p1 -b .searchbar-crash
 
 %build
 mkdir -p %{_target_platform}