rpms/kdebase-workspace/devel kdebase-workspace-4.0.2-kmenuedit-crash.patch, NONE, 1.1 kdebase-workspace.spec, 1.51, 1.52

Than Ngo (than) fedora-extras-commits at redhat.com
Thu Mar 13 14:44:17 UTC 2008


Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7221

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.0.2-kmenuedit-crash.patch 
Log Message:
- backport upstream patch to fix crash in kmenuedit when users
  delete entry and save it


kdebase-workspace-4.0.2-kmenuedit-crash.patch:

--- NEW FILE kdebase-workspace-4.0.2-kmenuedit-crash.patch ---
Index: workspace/kmenuedit/menufile.cpp
===================================================================
--- workspace/kmenuedit/menufile.cpp	(Revision 785164)
+++ workspace/kmenuedit/menufile.cpp	(Revision 785165)
@@ -354,7 +354,6 @@
 void MenuFile::removeEntry(const QString &menuName, const QString &menuId)
 {
    m_bDirty = true;
-
    m_removedEntries.append(menuId);
 
    QDomElement elem = findMenu(m_doc.documentElement(), menuName, true);
@@ -369,7 +368,6 @@
       excludeNode = m_doc.createElement(MF_EXCLUDE);
       elem.appendChild(excludeNode);
    }
-
    QDomElement fileNode = m_doc.createElement(MF_FILENAME);
    fileNode.appendChild(m_doc.createTextNode(menuId));
    excludeNode.appendChild(fileNode);
@@ -522,7 +520,7 @@
 
 bool MenuFile::performAllActions()
 {
-   for(ActionAtom *atom; (atom = m_actionList.getFirst()); m_actionList.removeFirst())
+   for(ActionAtom *atom; !m_actionList.isEmpty() && (atom = m_actionList.getFirst()); m_actionList.removeFirst())
    {
       performAction(atom);
       delete atom;


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kdebase-workspace.spec	13 Mar 2008 12:32:32 -0000	1.51
+++ kdebase-workspace.spec	13 Mar 2008 14:43:41 -0000	1.52
@@ -6,7 +6,7 @@
 Name: kdebase-workspace
 Version: 4.0.2
 
-Release: 7%{?dist}
+Release: 8%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -24,6 +24,7 @@
 Patch101: kdebase-workspace-4.0.x-kcontrol-crash.patch
 Patch102: kdebase-workspace-4.0.2-wallpaper-desktop.patch
 Patch103: kdebase-workspace-4.0.2-systemtray.patch
+Patch104: kdebase-workspace-4.0.2-kmenuedit-crash.patch
 
 # upgrade path for former kde-redhat'ers
 Obsoletes: kdebase-kdm < 6:%{version}-%{release}
@@ -117,6 +118,7 @@
 %patch101 -p1 -b .kcontrol-crash
 %patch102 -p1 -b .wallpaper-desktop
 %patch103 -p1 -b .systemtray
+%patch104 -p1 -b .kmenuedit-crash
 
 %build
 
@@ -229,6 +231,10 @@
 
 
 %changelog
+* Thu Mar 13 2008 Than Ngo <than at redhat.com> 4.0.2-8
+- backport upstream patch to fix crash in kmenuedit when users
+  delete entry and save it
+
 * Wed Mar 12 2008 Than Ngo <than at redhat.com> 4.0.2-7
 - apply upstream patch to fix changing wallpaper causes desktop to go white
 - apply upstream patch to check whether the to-be-embedded window has been destroyed, (bz#437058)




More information about the fedora-extras-commits mailing list