| 1 |
wired 09/09/02 17:37:12 |
| 2 |
|
| 3 |
Added: konsole-4.3.1-kpart-backport-fix.patch |
| 4 |
Log: |
| 5 |
backported kpart fix, http://bugs.kde.org/show_bug.cgi?id=186745 |
| 6 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 kde-base/konsole/files/konsole-4.3.1-kpart-backport-fix.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/konsole/files/konsole-4.3.1-kpart-backport-fix.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/konsole/files/konsole-4.3.1-kpart-backport-fix.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: konsole-4.3.1-kpart-backport-fix.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur kdebase-4.3.1-orig/apps/konsole/src/SessionController.cpp kdebase-4.3.1/apps/konsole/src/SessionController.cpp |
| 17 |
--- kdebase-4.3.1-orig/apps/konsole/src/SessionController.cpp 2009-04-28 16:46:08.000000000 +0300 |
| 18 |
+++ kdebase-4.3.1/apps/konsole/src/SessionController.cpp 2009-09-02 20:16:47.393341281 +0300 |
| 19 |
@@ -95,12 +95,10 @@ |
| 20 |
Q_ASSERT( view ); |
| 21 |
|
| 22 |
// handle user interface related to session (menus etc.) |
| 23 |
- |
| 24 |
-#ifdef KONSOLE_PART |
| 25 |
- setXMLFile("konsole/partui.rc"); |
| 26 |
-#else |
| 27 |
- setXMLFile("konsole/sessionui.rc"); |
| 28 |
-#endif |
| 29 |
+ if (isKonsolePart()) |
| 30 |
+ setXMLFile("konsole/partui.rc"); |
| 31 |
+ else |
| 32 |
+ setXMLFile("konsole/sessionui.rc"); |
| 33 |
|
| 34 |
setupActions(); |
| 35 |
actionCollection()->addAssociatedWidget(view); |
| 36 |
@@ -1041,6 +1039,15 @@ |
| 37 |
} |
| 38 |
} |
| 39 |
|
| 40 |
+bool SessionController::isKonsolePart() const |
| 41 |
+{ |
| 42 |
+ // Check to see if we are being called from Konsole or a KPart |
| 43 |
+ if (QString(kapp->metaObject()->className()) == "Konsole::Application") |
| 44 |
+ return false; |
| 45 |
+ else |
| 46 |
+ return true; |
| 47 |
+} |
| 48 |
+ |
| 49 |
SessionTask::SessionTask(QObject* parent) |
| 50 |
: QObject(parent) |
| 51 |
, _autoDelete(false) |
| 52 |
diff -ur kdebase-4.3.1-orig/apps/konsole/src/SessionController.h kdebase-4.3.1/apps/konsole/src/SessionController.h |
| 53 |
--- kdebase-4.3.1-orig/apps/konsole/src/SessionController.h 2009-04-15 13:25:25.000000000 +0300 |
| 54 |
+++ kdebase-4.3.1/apps/konsole/src/SessionController.h 2009-09-02 20:16:50.539589477 +0300 |
| 55 |
@@ -209,6 +209,9 @@ |
| 56 |
|
| 57 |
void updateSearchFilter(); |
| 58 |
|
| 59 |
+ /* Returns true if called within a KPart; false if called within Konsole. */ |
| 60 |
+ bool isKonsolePart() const; |
| 61 |
+ |
| 62 |
private: |
| 63 |
// begins the search |
| 64 |
// text - pattern to search for |
Archives