rpms/kdelibs/F-12 kdelibs-4.4.0-plasma-crash-kde#226823.patch, NONE, 1.1 kdelibs.spec, 1.541, 1.542
Than Ngo
than at fedoraproject.org
Tue Feb 16 11:28:52 UTC 2010
Author: than
Update of /cvs/extras/rpms/kdelibs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26325
Modified Files:
kdelibs.spec
Added Files:
kdelibs-4.4.0-plasma-crash-kde#226823.patch
Log Message:
- plasma crashe patch (kde#226823)
kdelibs-4.4.0-plasma-crash-kde#226823.patch:
applet.cpp | 41 ++++++++++++++++++++++-------------------
1 file changed, 22 insertions(+), 19 deletions(-)
--- NEW FILE kdelibs-4.4.0-plasma-crash-kde#226823.patch ---
Index: plasma/applet.cpp
===================================================================
--- plasma/applet.cpp (Revision 1090827)
+++ plasma/applet.cpp (Revision 1090828)
@@ -1712,6 +1712,7 @@
return;
}
+ d->publishUI.publishCheckbox = 0;
if (d->package && d->configLoader) {
KConfigDialog *dialog = 0;
@@ -1878,29 +1879,31 @@
}
#ifdef ENABLE_REMOTE_WIDGETS
- q->config().writeEntry("Share", publishUI.publishCheckbox->isChecked());
+ if (publishUI.publishCheckbox) {
+ q->config().writeEntry("Share", publishUI.publishCheckbox->isChecked());
- if (publishUI.publishCheckbox->isChecked()) {
- QString resourceName =
- i18nc("%1 is the name of a plasmoid, %2 the name of the machine that plasmoid is published on",
- "%1 on %2", q->name(), QHostInfo::localHostName());
- q->publish(Plasma::ZeroconfAnnouncement, resourceName);
- if (publishUI.allUsersCheckbox->isChecked()) {
- if (!AuthorizationManager::self()->d->matchingRule(resourceName, Credentials())) {
- AuthorizationRule *rule = new AuthorizationRule(resourceName, "");
- rule->setPolicy(AuthorizationRule::Allow);
- rule->setTargets(AuthorizationRule::AllUsers);
- AuthorizationManager::self()->d->rules.append(rule);
+ if (publishUI.publishCheckbox->isChecked()) {
+ QString resourceName =
+ i18nc("%1 is the name of a plasmoid, %2 the name of the machine that plasmoid is published on",
+ "%1 on %2", q->name(), QHostInfo::localHostName());
+ q->publish(Plasma::ZeroconfAnnouncement, resourceName);
+ if (publishUI.allUsersCheckbox->isChecked()) {
+ if (!AuthorizationManager::self()->d->matchingRule(resourceName, Credentials())) {
+ AuthorizationRule *rule = new AuthorizationRule(resourceName, "");
+ rule->setPolicy(AuthorizationRule::Allow);
+ rule->setTargets(AuthorizationRule::AllUsers);
+ AuthorizationManager::self()->d->rules.append(rule);
+ }
+ } else {
+ AuthorizationRule *matchingRule =
+ AuthorizationManager::self()->d->matchingRule(resourceName, Credentials());
+ if (matchingRule) {
+ AuthorizationManager::self()->d->rules.removeAll(matchingRule);
+ }
}
} else {
- AuthorizationRule *matchingRule =
- AuthorizationManager::self()->d->matchingRule(resourceName, Credentials());
- if (matchingRule) {
- AuthorizationManager::self()->d->rules.removeAll(matchingRule);
- }
+ q->unpublish();
}
- } else {
- q->unpublish();
}
#endif
Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-12/kdelibs.spec,v
retrieving revision 1.541
retrieving revision 1.542
diff -u -p -r1.541 -r1.542
--- kdelibs.spec 16 Feb 2010 11:20:20 -0000 1.541
+++ kdelibs.spec 16 Feb 2010 11:28:51 -0000 1.542
@@ -93,6 +93,7 @@ Patch27: kdelibs-4.3.98-no_rpath.patch
Patch100: kdelibs-4.4.0-khtml_scrolling.patch
Patch101: kdelibs-4.4.0-nepomuk_memleak.patch
patch102: kdelibs-4.4.0-krunner-crash-kde#227118.patch
+Patch103: kdelibs-4.4.0-plasma-crash-kde#226823.patch
# security fix
## Not Upstreamed? why not ? -- Rex
@@ -246,6 +247,7 @@ format for easy browsing.
%patch100 -p4 -b .khtml_scrolling
%patch101 -p4 -b .nepomuk_memleak
%patch102 -p0 -b .krunner-crash-kde#227118
+%patch103 -p0 -b .plasma-crash-kde#226823
# security fix
%patch200 -p1 -b .CVE-2009-2702
@@ -439,6 +441,7 @@ rm -rf %{buildroot}
%changelog
* Tue Feb 16 2010 Than Ngo <than at redhat.com> - 6:4.4.0-8
- krunner crash patch (kde#227118)
+- plasma crashe patch (kde#226823)
* Sat Feb 13 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.0-7
- rebuild for new kde-filesystem in F13, fixes kde4-config --libsuffix (#564712)
More information about the scm-commits
mailing list