← Back to branch summary

~ubuntu-branches/ubuntu/lucid/kde4libs/lucid-updates

« back to all changes in this revision

Viewing changes to plasma/applet.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas
  • Date: 2010-01-19 20:32:41 UTC
  • mfrom: (1.1.42 upstream)
  • Revision ID: james.westby@ubuntu.com-20100119203241-6qlz4p6emiawose6
Tags: 4:4.3.95-0ubuntu1
* New upstream release candidate:
  - Remove kubuntu_71_knewstuff_crashes.diff, applied upstream
  - Remove kubuntu_72_popupapplet_crash_fix.diff, applied upstream
  - Refresh kubuntu_70_dbusmenu.diff
  - Bump RUNTIME_DEPS value in debian/rules to 4.3.90
  - Update .install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
plasma/applet.cpp
1832
1832
 
1833
1833
    //TODO: Apply button does not correctly work for now, so do not show it
1834
1834
    dialog->showButton(KDialog::Apply, false);
1835
 
    QObject::connect(dialog, SIGNAL(applyClicked()), q, SLOT(configDialogFinished()));
1836
 
    QObject::connect(dialog, SIGNAL(okClicked()), q, SLOT(configDialogFinished()));
 
1835
    QObject::connect(dialog, SIGNAL(applyClicked()), q, SLOT(configDialogFinished()), Qt::UniqueConnection);
 
1836
    QObject::connect(dialog, SIGNAL(okClicked()), q, SLOT(configDialogFinished()), Qt::UniqueConnection);
1837
1837
}
1838
1838
 
1839
1839
void AppletPrivate::addPublishPage(KConfigDialog *dialog)
2749
2749
    } else {
2750
2750
        KConfigGroup appletConfig;
2751
2751
 
2752
 
        if (Containment *c = q->containment()) {
2753
 
            Plasma::Applet *parentApplet = qobject_cast<Applet *>(q->parent());
2754
 
            if (parentApplet && parentApplet != static_cast<Applet *>(c)) {
2755
 
                // this applet is nested inside another applet! use it's config
2756
 
                // as the parent group in the config
2757
 
                appletConfig = parentApplet->config();
2758
 
            } else {
2759
 
                // applet directly in a Containment, as usual
2760
 
                appletConfig = c->config();
2761
 
            }
2762
 
 
 
2752
        Containment *c = q->containment();
 
2753
        Applet *parentApplet = qobject_cast<Applet *>(q->parent());
 
2754
        if (parentApplet && parentApplet != static_cast<Applet *>(c)) {
 
2755
            // this applet is nested inside another applet! use it's config
 
2756
            // as the parent group in the config
 
2757
            appletConfig = parentApplet->config();
 
2758
            appletConfig = KConfigGroup(&appletConfig, "Applets");
 
2759
        } else if (c) {
 
2760
            // applet directly in a Containment, as usual
 
2761
            appletConfig = c->config();
2763
2762
            appletConfig = KConfigGroup(&appletConfig, "Applets");
2764
2763
        } else {
2765
2764
            kWarning() << "requesting config for" << q->name() << "without a containment!";