← Back to branch summary

~ubuntu-branches/ubuntu/natty/muon/natty

« back to all changes in this revision

Viewing changes to libmuon/MuonMainWindow.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas
  • Date: 2011-01-03 14:28:31 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20110103142831-htvytta1vjsdggcg
Tags: 1.0.95-0ubuntu1
* New upstream release candidate:
  - Add a new libmuonprivate1 package for the new libmuonprivate library
    which was formerly a static library
  - Create debian/not-installed and place the development symlink for
    libmuonprivate in it, since it is a private library
* Port the packaging to the debhelper 8 standard:
  - Bump debian/compat to 8
  - Bump the build-depend version on debhelper to 8.0.0~
  - Place the debhelper options after the sequence in debian/rules
* Add a homepage field to debian/control with Muon's homepage

Show diffs side-by-side

added added

removed removed

Lines of Context:
libmuon/MuonMainWindow.cpp
168
168
}
169
169
 
170
170
bool MuonMainWindow::isConnected() {
171
 
    return (Solid::Networking::status() == Solid::Networking::Connected
172
 
         || Solid::Networking::status() == Solid::Networking::Unknown);
 
171
    int status = Solid::Networking::status();
 
172
    return status == (Solid::Networking::Connected | Solid::Networking::Unknown);
173
173
}
174
174
 
175
175
void MuonMainWindow::checkForUpdates()
207
207
                     "configuration may be broken.");
208
208
        title = i18nc("@title:window", "Initialization error");
209
209
        QString details = args["ErrorText"].toString();
 
210
        bool fromWorker = args["FromWorker"].toBool();
210
211
        KMessageBox::detailedError(this, text, details, title);
211
 
        KApplication::instance()->quit();
 
212
        if (!fromWorker) {
 
213
            KApplication::instance()->quit();
 
214
        }
212
215
        break;
213
216
    }
214
217
    case QApt::LockError:
270
273
        break;
271
274
    }
272
275
    case QApt::UserCancelError:
 
276
        break;
273
277
    case QApt::UnknownError:
274
278
    default:
 
279
        setActionsEnabled();
 
280
        m_canExit = true; // If we were committing changes, we aren't anymore
275
281
        break;
276
282
    }
277
 
    m_canExit = true; // If we were committing changes, we aren't anymore
278
283
}
279
284
 
280
285
void MuonMainWindow::warningOccurred(QApt::WarningCode warning, const QVariantMap &args)