4.5.4
This commit is contained in:
parent
5a87919bad
commit
739924aa3b
@ -1,46 +0,0 @@
|
||||
--- branches/KDE/4.5/kdelibs/kdeui/xmlgui/kxmlguiclient.cpp 2010/11/16 00:37:04 1197481
|
||||
+++ branches/KDE/4.5/kdelibs/kdeui/xmlgui/kxmlguiclient.cpp 2010/11/16 00:37:17 1197482
|
||||
@@ -97,10 +97,12 @@
|
||||
}
|
||||
|
||||
if ( d->m_factory ) {
|
||||
- d->m_factory->removeClient ( this );
|
||||
+ d->m_factory->forgetClient(this);
|
||||
}
|
||||
-
|
||||
+
|
||||
foreach (KXMLGUIClient* client, d->m_children) {
|
||||
+ if (d->m_factory)
|
||||
+ d->m_factory->forgetClient(client);
|
||||
assert( client->d->m_parent == this );
|
||||
client->d->m_parent = 0;
|
||||
}
|
||||
--- branches/KDE/4.5/kdelibs/kdeui/xmlgui/kxmlguifactory.cpp 2010/11/16 00:37:04 1197481
|
||||
+++ branches/KDE/4.5/kdelibs/kdeui/xmlgui/kxmlguifactory.cpp 2010/11/16 00:37:17 1197482
|
||||
@@ -388,6 +388,11 @@
|
||||
refreshActionProperties();
|
||||
}
|
||||
|
||||
+void KXMLGUIFactory::forgetClient( KXMLGUIClient *client )
|
||||
+{
|
||||
+ d->m_clients.removeAll( client );
|
||||
+}
|
||||
+
|
||||
void KXMLGUIFactory::removeClient( KXMLGUIClient *client )
|
||||
{
|
||||
//kDebug(260) << client;
|
||||
--- branches/KDE/4.5/kdelibs/kdeui/xmlgui/kxmlguifactory.h 2010/11/16 00:37:04 1197481
|
||||
+++ branches/KDE/4.5/kdelibs/kdeui/xmlgui/kxmlguifactory.h 2010/11/16 00:37:17 1197482
|
||||
@@ -216,7 +216,11 @@
|
||||
void makingChanges(bool);
|
||||
|
||||
private:
|
||||
- KXMLGUIFactoryPrivate *const d;
|
||||
+ friend class KXMLGUIClient;
|
||||
+ /// Internal, called by KXMLGUIClient destructor
|
||||
+ void forgetClient(KXMLGUIClient *client);
|
||||
+
|
||||
+ KXMLGUIFactoryPrivate *const d;
|
||||
};
|
||||
|
||||
#endif
|
@ -101,9 +101,7 @@ Patch27: kdelibs-4.4.80-no_rpath.patch
|
||||
# TODO: try to use either gpg or gpg2, whichever is available
|
||||
Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
|
||||
|
||||
## 4.5 upstream
|
||||
# http://websvn.kde.org/?view=revision&revision=1197482
|
||||
Patch100: kdelibs-4.5.3-kde246652.patch
|
||||
## 4.5 upstream, stable branch
|
||||
|
||||
## trunk upstream
|
||||
# http://websvn.kde.org/?view=revision&revision=1185912
|
||||
@ -272,7 +270,6 @@ format for use with the Qt 4 Assistant or KDevelop 4.
|
||||
%patch50 -p1 -b .knewstuff_gpg2
|
||||
|
||||
# upstream patches, stable branch
|
||||
%patch100 -p4 -b .kde246652
|
||||
|
||||
# upstream patches, trunk
|
||||
%patch151 -p3 -b .plasma_wallpaper_configchanged
|
||||
|
Loading…
Reference in New Issue
Block a user