X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/b6700f77dd8e07fdab0d40ea4bc91f8d0c03ae70..49b07b3c5c94ccf17fd335de2c0506070ecd31ee:/src/main.cpp diff --git a/src/main.cpp b/src/main.cpp index 802e64d25..8b3121d22 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,23 +1,10 @@ -/*************************************************************************** - * Copyright (C) 2006 by Peter Penz * - * Copyright (C) 2006 by Stefan Monov * - * Copyright (C) 2015 by Mathieu Tarral * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2006 Peter Penz + * SPDX-FileCopyrightText: 2006 Stefan Monov + * SPDX-FileCopyrightText: 2015 Mathieu Tarral + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "dbusinterface.h" #include "dolphin_generalsettings.h" @@ -178,6 +165,9 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) mainWindow->show(); + KDBusService dolphinDBusService; + DBusInterface interface; + if (!app.isSessionRestored()) { KConfigGui::setSessionConfig(QStringLiteral("dolphin"), QStringLiteral("dolphin")); } @@ -200,8 +190,5 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) } } - KDBusService dolphinDBusService; - DBusInterface interface; - return app.exec(); // krazy:exclude=crash; }