rpms/kdebase/F-10 kdebase-4.3.2-konsolemenus.patch, NONE, 1.1 kdebase.spec, 1.369, 1.370
Lukas Tinkl
ltinkl at fedoraproject.org
Wed Sep 2 11:46:18 UTC 2009
Author: ltinkl
Update of /cvs/extras/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19447/F-10
Modified Files:
kdebase.spec
Added Files:
kdebase-4.3.2-konsolemenus.patch
Log Message:
Correct KPart issue where the wrong context menu was used and invalid menus
were created.
kdebase-4.3.2-konsolemenus.patch:
SessionController.cpp | 19 +++++++++++++------
SessionController.h | 3 +++
2 files changed, 16 insertions(+), 6 deletions(-)
--- NEW FILE kdebase-4.3.2-konsolemenus.patch ---
Index: apps/konsole/src/SessionController.cpp
===================================================================
--- apps/konsole/src/SessionController.cpp (revision 1017602)
+++ apps/konsole/src/SessionController.cpp (revision 1017603)
@@ -95,13 +95,11 @@
Q_ASSERT( view );
// handle user interface related to session (menus etc.)
+ if (isKonsolePart())
+ setXMLFile("konsole/partui.rc");
+ else
+ setXMLFile("konsole/sessionui.rc");
-#ifdef KONSOLE_PART
- setXMLFile("konsole/partui.rc");
-#else
- setXMLFile("konsole/sessionui.rc");
-#endif
-
setupActions();
actionCollection()->addAssociatedWidget(view);
foreach (QAction* action, actionCollection()->actions())
@@ -1041,6 +1039,15 @@
}
}
+bool SessionController::isKonsolePart() const
+{
+ // Check to see if we are being called from Konsole or a KPart
+ if (QString(kapp->metaObject()->className()) == "Konsole::Application")
+ return false;
+ else
+ return true;
+}
+
SessionTask::SessionTask(QObject* parent)
: QObject(parent)
, _autoDelete(false)
Index: apps/konsole/src/SessionController.h
===================================================================
--- apps/konsole/src/SessionController.h (revision 1017602)
+++ apps/konsole/src/SessionController.h (revision 1017603)
@@ -209,6 +209,9 @@
void updateSearchFilter();
+ /* Returns true if called within a KPart; false if called within Konsole. */
+ bool isKonsolePart() const;
+
private:
// begins the search
// text - pattern to search for
Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -p -r1.369 -r1.370
--- kdebase.spec 1 Sep 2009 12:55:11 -0000 1.369
+++ kdebase.spec 2 Sep 2009 11:46:18 -0000 1.370
@@ -1,8 +1,7 @@
-
Name: kdebase
Summary: K Desktop Environment 4 - Core Files
Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 6
License: GPLv2
@@ -15,6 +14,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
Patch0: kdebase-4.1.80-nsplugins-paths.patch
Patch1: kdebase-4.1.70-konsole-session.patch
Patch2: kdebase-4.2.1-home-icon.patch
+Patch3: kdebase-4.3.2-konsolemenus.patch
%ifnarch s390 s390x
Requires: eject
@@ -57,11 +57,7 @@ BuildRequires: pcre-devel
BuildRequires: pkgconfig
BuildRequires: qimageblitz-devel
# samba support
-%if 0%{?fedora} > 6 || 0%{?rhel} > 5
BuildRequires: libsmbclient-devel
-%else
-BuildRequires: samba
-%endif
BuildRequires: soprano-devel >= 2.0.97
BuildRequires: strigi-devel >= 0.5.7
# needed?
@@ -107,6 +103,7 @@ Requires: kdelibs4-devel kdepimlibs4-dev
%patch0 -p1 -b .nsplugins-paths
%patch1 -p1 -b .konsole-session
%patch2 -p1 -b .home-icon
+%patch3 -p0 -b .konsolemenus
# fix incorrect assumption that we're building in a combined kdebase tree
sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -218,6 +215,9 @@ fi
%changelog
+* Wed Sep 2 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.1-2
+- fix context menus in Konsole (kdebug:186745)
+
* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
- 4.3.1
- drop/revert kde-plasma-folderview subpkg
More information about the fedora-extras-commits
mailing list