Hello community, here is the log from the commit of package knotifications for openSUSE:Factory checked in at 2014-04-02 17:22:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knotifications (Old) and /work/SRC/openSUSE:Factory/.knotifications.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knotifications" Changes: -------- --- /work/SRC/openSUSE:Factory/knotifications/knotifications.changes 2014-03-10 12:17:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.knotifications.new/knotifications.changes 2014-04-02 17:22:29.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 29 19:47:47 UTC 2014 - [email protected] + +- Update to 4.98.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta1.php + +------------------------------------------------------------------- Old: ---- knotifications-4.97.0.tar.xz New: ---- knotifications-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knotifications.spec ++++++ --- /var/tmp/diff_new_pack.pym5Fx/_old 2014-04-02 17:22:29.000000000 +0200 +++ /var/tmp/diff_new_pack.pym5Fx/_new 2014-04-02 17:22:29.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5Notifications5 Name: knotifications -Version: 4.97.0 +Version: 4.98.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.11 +BuildRequires: extra-cmake-modules >= 0.0.12 BuildRequires: fdupes BuildRequires: kcodecs-devel >= %{_kf5_version} BuildRequires: kconfig-devel >= %{_kf5_version} ++++++ knotifications-4.97.0.tar.xz -> knotifications-4.98.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/CMakeLists.txt new/knotifications-4.98.0/CMakeLists.txt --- old/knotifications-4.97.0/CMakeLists.txt 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/CMakeLists.txt 2014-03-28 19:17:18.000000000 +0100 @@ -3,15 +3,15 @@ project(KNotifications) # ECM setup -find_package(ECM 0.0.11 REQUIRED NO_MODULE) -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +find_package(ECM 0.0.12 REQUIRED NO_MODULE) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(FeatureSummary) include(GenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "4.97.0") +set(KF5_VERSION "4.98.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KNOTIFICATIONS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/cmake/FindDBusMenuQt5.cmake new/knotifications-4.98.0/cmake/FindDBusMenuQt5.cmake --- old/knotifications-4.97.0/cmake/FindDBusMenuQt5.cmake 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/cmake/FindDBusMenuQt5.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,71 +0,0 @@ -# - Try to find dbusmenu-qt5 -# This module helps finding an installation of the DBusMenuQt library (see https://launchpad.net/libdbusmenu-qt/) -# Once done this will define -# -# DBusMenuQt5_FOUND - system has dbusmenu-qt -# DBusMenuQt5_INCLUDE_DIRS - the dbusmenu-qt include directory -# DBusMenuQt5_LIBRARIES - the libraries needed to use dbusmenu-qt -# DBusMenuQt5_DEFINITIONS - Compiler switches required for using dbusmenu-qt -# -# The minimum required version of DBusMenuQt can be specified using the -# standard syntax, e.g. find_package(DBusMenuQt5 0.6) -# - -# Copyright (c) 2009, Canonical Ltd. -# - Author: Aurélien Gâteau <[email protected]> -# -# Based on FindQCA2.cmake -# Copyright (c) 2006, Michael Larouche, <[email protected]> -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -include(FindPackageHandleStandardArgs) - -find_package(PkgConfig) -pkg_check_modules(PC_DBusMenuQt5 QUIET dbusmenu-qt5) - - -set(DBusMenuQt5_DEFINITIONS ${PC_DBusMenuQt5_CFLAGS_OTHER}) - -find_library(DBusMenuQt5_LIBRARY - NAMES dbusmenu-qt5 dbusmenu-qt5d - HINTS ${PC_DBusMenuQt5_LIBDIR} ${PC_DBusMenuQt5_LIBRARY_DIRS} - ) - -find_path(DBusMenuQt5_INCLUDE_DIR dbusmenuexporter.h - HINTS ${PC_DBusMenuQt5_INCLUDEDIR} ${PC_DBusMenuQt5_INCLUDE_DIRS} - PATH_SUFFIXES dbusmenu-qt5 dbusmenu-qt - ) - - message(STATUS "DBusMenuQt5_INCLUDE_DIR=${DBusMenuQt5_INCLUDE_DIR} DBusMenuQt5_LIBRARY=${DBusMenuQt5_LIBRARY} DBusMenuQt5_VERSION=${DBusMenuQt5_VERSION}") - -# find the version number from dbusmenu_version.h and store it in the cache -if(DBusMenuQt5_INCLUDE_DIR AND NOT DBusMenuQt5_VERSION) - # parse the version number out from dbusmenu_version: - if(EXISTS ${DBusMenuQt5_INCLUDE_DIR}/dbusmenu_version.h) - file(READ "${DBusMenuQt5_INCLUDE_DIR}/dbusmenu_version.h" DBusMenuQt5_VERSION_CONTENT) - - string(REGEX MATCH "#define +DBUSMENUQT_VERSION_MAJOR +([0-9]+)" _dummy "${DBusMenuQt5_VERSION_CONTENT}") - set(DBusMenuQt5_VERSION_MAJOR "${CMAKE_MATCH_1}") - - string(REGEX MATCH "#define +DBUSMENUQT_VERSION_MINOR +([0-9]+)" _dummy "${DBusMenuQt5_VERSION_CONTENT}") - set(DBusMenuQt5_VERSION_MINOR "${CMAKE_MATCH_1}") - - string(REGEX MATCH "#define +DBUSMENUQT_VERSION_PATCH +([0-9]+)" _dummy "${DBusMenuQt5_VERSION_CONTENT}") - set(DBusMenuQt5_VERSION_PATCH "${CMAKE_MATCH_1}") - - endif() - - set(DBusMenuQt5_VERSION "${DBusMenuQt5_VERSION_MAJOR}.${DBusMenuQt5_VERSION_MINOR}.${DBusMenuQt5_VERSION_PATCH}" CACHE STRING "Version number of DBusMenuQt5" FORCE) - message(STATUS "NOW DBusMenuQt5_VERSION=${DBusMenuQt5_VERSION}") -endif() - - -find_package_handle_standard_args(DBusMenuQt5 REQUIRED_VARS DBusMenuQt5_LIBRARY DBusMenuQt5_INCLUDE_DIR - VERSION_VAR DBusMenuQt5_VERSION FOUND_VAR DBusMenuQt5_FOUND) - -set(DBusMenuQt5_LIBRARIES ${DBusMenuQt5_LIBRARY}) -set(DBusMenuQt5_INCLUDE_DIRS ${DBusMenuQt5_INCLUDE_DIR}) - -mark_as_advanced(DBusMenuQt5_INCLUDE_DIR DBusMenuQt5_LIBRARY DBusMenuQt5_VERSION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/knotifications.yaml new/knotifications-4.98.0/knotifications.yaml --- old/knotifications-4.97.0/knotifications.yaml 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/knotifications.yaml 2014-03-28 19:17:18.000000000 +0100 @@ -1 +1 @@ -tier: 2 +tier: 3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/CMakeLists.txt new/knotifications-4.98.0/src/CMakeLists.txt --- old/knotifications-4.97.0/src/CMakeLists.txt 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/CMakeLists.txt 2014-03-28 19:17:18.000000000 +0100 @@ -19,13 +19,14 @@ notifybyaudio.cpp ) -find_package(DBusMenuQt5) -set_package_properties(DBusMenuQt5 PROPERTIES DESCRIPTION "DBusMenuQt" +find_package(dbusmenu-qt5 CONFIG) +set_package_properties(dbusmenu-qt5 PROPERTIES DESCRIPTION "DBusMenuQt" URL "https://launchpad.net/libdbusmenu-qt"; TYPE OPTIONAL PURPOSE "Support for notification area menus via the DBusMenu protocol") -if (DBusMenuQt5_FOUND) +if (dbusmenu-qt5_FOUND) + message("dbusmenu-qt5_FOUND") set(HAVE_DBUSMENUQT 1) - include_directories(${DBusMenuQt5_INCLUDE_DIRS}) + include_directories(${dbusmenu-qt5_INCLUDE_DIRS}) else() set(HAVE_DBUSMENUQT 0) endif() @@ -70,7 +71,7 @@ endif() if(HAVE_DBUSMENUQT) - target_link_libraries(KF5Notifications PRIVATE ${DBusMenuQt5_LIBRARIES}) + target_link_libraries(KF5Notifications PRIVATE dbusmenu-qt5) endif() set_target_properties(KF5Notifications PROPERTIES VERSION ${KNOTIFICATIONS_VERSION_STRING} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/Messages.sh new/knotifications-4.98.0/src/Messages.sh --- old/knotifications-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/knotifications-4.98.0/src/Messages.sh 2014-03-28 19:17:18.000000000 +0100 @@ -0,0 +1,18 @@ +#!/bin/sh + +# Invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources. +# The results are stored in a pseudo .cpp file to be picked up by xgettext. +lst=`find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` +if [ -n "$lst" ] ; then + $EXTRACTRC $lst >> rc.cpp +fi + +# If your framework contains tips-of-the-day, call preparetips as well. +if [ -f "data/tips" ] ; then + ( cd data && $PREPARETIPS > ../tips.cpp ) +fi + +# Extract strings from all source files. +# If your framework depends on KI18n, use $XGETTEXT. If it uses Qt translation +# system, use $EXTRACT_TR_STRINGS. +$EXTRACT_TR_STRINGS `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/knotifications5.pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/knotificationmanager.cpp new/knotifications-4.98.0/src/knotificationmanager.cpp --- old/knotifications-4.97.0/src/knotificationmanager.cpp 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/knotificationmanager.cpp 2014-03-28 19:17:18.000000000 +0100 @@ -106,7 +106,7 @@ void KNotificationManager::notifyPluginFinished(KNotification *notification) { - if (!d->notifications.contains(notification->id())) { + if (!notification || !d->notifications.contains(notification->id())) { return; } @@ -118,8 +118,8 @@ if (d->notifications.contains(id)) { qDebug() << id << " " << action; KNotification *n = d->notifications[id]; - d->notifications.remove(id); n->activate(action); + close(id); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/knotifyconfig.cpp new/knotifications-4.98.0/src/knotifyconfig.cpp --- old/knotifications-4.97.0/src/knotifyconfig.cpp 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/knotifyconfig.cpp 2014-03-28 19:17:18.000000000 +0100 @@ -1,20 +1,21 @@ /* Copyright (C) 2005-2009 by Olivier Goffart <ogoffart at kde.org> + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. - 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, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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. + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/knotifyconfig.h new/knotifications-4.98.0/src/knotifyconfig.h --- old/knotifications-4.97.0/src/knotifyconfig.h 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/knotifyconfig.h 2014-03-28 19:17:18.000000000 +0100 @@ -1,20 +1,21 @@ /* Copyright (C) 2005-2009 by Olivier Goffart <ogoffart at kde.org> + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. - 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, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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. + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/knotifyplugin.cpp new/knotifications-4.98.0/src/knotifyplugin.cpp --- old/knotifications-4.97.0/src/knotifyplugin.cpp 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/knotifyplugin.cpp 2014-03-28 19:17:18.000000000 +0100 @@ -1,20 +1,21 @@ /* Copyright (C) 2005-2006 by Olivier Goffart <ogoffart at kde.org> + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. - 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, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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. + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/knotifyplugin.h new/knotifications-4.98.0/src/knotifyplugin.h --- old/knotifications-4.97.0/src/knotifyplugin.h 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/knotifyplugin.h 2014-03-28 19:17:18.000000000 +0100 @@ -1,20 +1,21 @@ /* Copyright (C) 2005-2006 by Olivier Goffart <ogoffart at kde.org> + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. - 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, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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. + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/kstatusnotifieritem.cpp new/knotifications-4.98.0/src/kstatusnotifieritem.cpp --- old/knotifications-4.97.0/src/kstatusnotifieritem.cpp 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/kstatusnotifieritem.cpp 2014-03-28 19:17:18.000000000 +0100 @@ -721,7 +721,7 @@ q->setContextMenu(m); QAction *action = new QAction(q); - action->setText(q->tr("Quit")); + action->setText(KStatusNotifierItem::tr("Quit")); action->setIcon(QIcon::fromTheme("application-exit")); QObject::connect(action, SIGNAL(triggered()), q, SLOT(maybeQuit())); actionCollection.insert("quit", action); @@ -894,9 +894,9 @@ if (associatedWidget && associatedWidget != menu) { QAction *action = actionCollection.value("minimizeRestore"); if (checkVisibility(QPoint(0, 0), false)) { - action->setText(q->tr("&Restore")); + action->setText(KStatusNotifierItem::tr("&Restore")); } else { - action->setText(q->tr("&Minimize")); + action->setText(KStatusNotifierItem::tr("&Minimize")); } } } @@ -908,10 +908,10 @@ caption = QCoreApplication::applicationName(); } - QString query = q->tr("<qt>Are you sure you want to quit <b>%1</b>?</qt>", caption.toUtf8()); + QString query = KStatusNotifierItem::tr("<qt>Are you sure you want to quit <b>%1</b>?</qt>").arg(caption); if (QMessageBox::question(associatedWidget, - q->tr("Confirm Quit From System Tray"), query)) { + KStatusNotifierItem::tr("Confirm Quit From System Tray"), query)) { qApp->quit(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybyaudio.cpp new/knotifications-4.98.0/src/notifybyaudio.cpp --- old/knotifications-4.97.0/src/notifybyaudio.cpp 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/notifybyaudio.cpp 2014-03-28 19:17:18.000000000 +0100 @@ -2,20 +2,21 @@ Copyright 2014 by Martin Klapetek <[email protected]> This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License (LGPL) as published by the Free Software Foundation; - either version 2 of the License, or (at your option) any later - version. + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. This library 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 - Library General Public License for more details. + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ #include "notifybyaudio.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybyaudio.h new/knotifications-4.98.0/src/notifybyaudio.h --- old/knotifications-4.97.0/src/notifybyaudio.h 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/notifybyaudio.h 2014-03-28 19:17:18.000000000 +0100 @@ -2,20 +2,21 @@ Copyright 2014 by Martin Klapetek <[email protected]> This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License (LGPL) as published by the Free Software Foundation; - either version 2 of the License, or (at your option) any later - version. + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. This library 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 - Library General Public License for more details. + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybyexecute.cpp new/knotifications-4.98.0/src/notifybyexecute.cpp --- old/knotifications-4.97.0/src/notifybyexecute.cpp 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/notifybyexecute.cpp 2014-03-28 19:17:18.000000000 +0100 @@ -1,20 +1,21 @@ /* Copyright (C) 2005-2006 by Olivier Goffart <ogoffart at kde.org> + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. - 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, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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. + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybyexecute.h new/knotifications-4.98.0/src/notifybyexecute.h --- old/knotifications-4.97.0/src/notifybyexecute.h 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/notifybyexecute.h 2014-03-28 19:17:18.000000000 +0100 @@ -1,20 +1,21 @@ /* Copyright (C) 2005-2006 by Olivier Goffart <ogoffart at kde.org> + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. - 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, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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. + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybyktts.cpp new/knotifications-4.98.0/src/notifybyktts.cpp --- old/knotifications-4.97.0/src/notifybyktts.cpp 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/notifybyktts.cpp 2014-03-28 19:17:18.000000000 +0100 @@ -2,20 +2,21 @@ Copyright (C) 2007 by Olivier Goffart <ogoffart at kde.org> Copyright (C) 2009 by Laurent Montel <[email protected]> + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. - 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, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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. + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. */ #include "notifybyktts.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybyktts.h new/knotifications-4.98.0/src/notifybyktts.h --- old/knotifications-4.97.0/src/notifybyktts.h 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/notifybyktts.h 2014-03-28 19:17:18.000000000 +0100 @@ -2,19 +2,21 @@ Copyright (C) 2007 by Olivier Goffart <ogoffart at kde.org> Copyright (C) 2009 by Laurent Montel <[email protected]> - 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, or (at your option) - any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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. + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybylogfile.cpp new/knotifications-4.98.0/src/notifybylogfile.cpp --- old/knotifications-4.97.0/src/notifybylogfile.cpp 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/notifybylogfile.cpp 2014-03-28 19:17:18.000000000 +0100 @@ -1,20 +1,21 @@ /* Copyright (C) 2005-2006 by Olivier Goffart <ogoffart at kde.org> + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. - 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, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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. + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybylogfile.h new/knotifications-4.98.0/src/notifybylogfile.h --- old/knotifications-4.97.0/src/notifybylogfile.h 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/notifybylogfile.h 2014-03-28 19:17:18.000000000 +0100 @@ -1,20 +1,21 @@ /* Copyright (C) 2005-2006 by Olivier Goffart <ogoffart at kde.org> + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. - 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, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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. + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybypopup.cpp new/knotifications-4.98.0/src/notifybypopup.cpp --- old/knotifications-4.97.0/src/notifybypopup.cpp 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/notifybypopup.cpp 2014-03-28 19:17:18.000000000 +0100 @@ -3,19 +3,21 @@ Copyright (C) 2008 by Dmitry Suzdalev <[email protected]> Copyright (C) 2014 by Martin Klapetek <[email protected]> - 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, or (at your option) - any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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. + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. */ @@ -447,6 +449,12 @@ } d->galagoNotifications.remove(dbus_id); finished(n); + // The popup bubble is the only user facing part of a notification, + // if the user closes the popup, it means he wants to get rid + // of the notification completely, including playing sound etc + // Therefore we close the KNotification completely after closing + // the popup + n->close(); } void NotifyByPopup::onGalagoServerReply(QDBusPendingCallWatcher *watcher) @@ -645,7 +653,9 @@ void NotifyByPopupPrivate::closeGalagoNotification(KNotification *notification) { - if (notification->id() == 0) { + uint galagoId = galagoNotifications.key(notification, 0); + + if (galagoId == 0) { qDebug() << "not found dbus id to close" << notification->id(); return; } @@ -653,7 +663,7 @@ QDBusMessage m = QDBusMessage::createMethodCall(dbusServiceName, dbusPath, dbusInterfaceName, "CloseNotification"); QList<QVariant> args; - args.append(notification->id()); + args.append(galagoId); m.setArguments(args); // send(..) does not block diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybypopup.h new/knotifications-4.98.0/src/notifybypopup.h --- old/knotifications-4.97.0/src/notifybypopup.h 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/notifybypopup.h 2014-03-28 19:17:18.000000000 +0100 @@ -3,20 +3,21 @@ Copyright (C) 2008 by Dmitry Suzdalev <[email protected]> Copyright (C) 2014 by Martin Klapetek <[email protected]> + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. - 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, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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. + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybypopupgrowl.cpp new/knotifications-4.98.0/src/notifybypopupgrowl.cpp --- old/knotifications-4.97.0/src/notifybypopupgrowl.cpp 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/notifybypopupgrowl.cpp 2014-03-28 19:17:18.000000000 +0100 @@ -1,19 +1,21 @@ /* Copyright (C) 2010 by Sjors Gielen <[email protected]> - 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, or (at your option) - any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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. + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybypopupgrowl.h new/knotifications-4.98.0/src/notifybypopupgrowl.h --- old/knotifications-4.97.0/src/notifybypopupgrowl.h 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/notifybypopupgrowl.h 2014-03-28 19:17:18.000000000 +0100 @@ -1,19 +1,21 @@ /* Copyright (C) 2010 by Sjors Gielen <[email protected]> - 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, or (at your option) - any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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. + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybytaskbar.cpp new/knotifications-4.98.0/src/notifybytaskbar.cpp --- old/knotifications-4.97.0/src/notifybytaskbar.cpp 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/notifybytaskbar.cpp 2014-03-28 19:17:18.000000000 +0100 @@ -1,20 +1,21 @@ /* Copyright (C) 2005-2006 by Olivier Goffart <ogoffart at kde.org> + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. - 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, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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. + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/notifybytaskbar.h new/knotifications-4.98.0/src/notifybytaskbar.h --- old/knotifications-4.97.0/src/notifybytaskbar.h 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/notifybytaskbar.h 2014-03-28 19:17:18.000000000 +0100 @@ -1,20 +1,21 @@ /* Copyright (C) 2005-2006 by Olivier Goffart <ogoffart at kde.org> + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. - 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, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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. + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/org.freedesktop.Notifications.xml new/knotifications-4.98.0/src/org.freedesktop.Notifications.xml --- old/knotifications-4.97.0/src/org.freedesktop.Notifications.xml 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/org.freedesktop.Notifications.xml 2014-03-28 19:17:18.000000000 +0100 @@ -10,7 +10,7 @@ <arg name="action_key" type="s" direction="out"/> </signal> <method name="Notify"> - <annotation name="com.trolltech.QtDBus.QtTypeName.In6" value="QVariantMap"/> + <annotation name="org.qtproject.QtDBus.QtTypeName.In6" value="QVariantMap"/> <arg type="u" direction="out"/> <arg name="app_name" type="s" direction="in"/> <arg name="replaces_id" type="u" direction="in"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/org.kde.StatusNotifierItem.xml new/knotifications-4.98.0/src/org.kde.StatusNotifierItem.xml --- old/knotifications-4.97.0/src/org.kde.StatusNotifierItem.xml 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/org.kde.StatusNotifierItem.xml 2014-03-28 19:17:18.000000000 +0100 @@ -20,13 +20,13 @@ <!--struct containing width, height and image data--> <property name="IconPixmap" type="(iiay)" access="read"> - <annotation name="com.trolltech.QtDBus.QtTypeName" value="KDbusImageVector"/> + <annotation name="org.qtproject.QtDBus.QtTypeName" value="KDbusImageVector"/> </property> <property name="OverlayIconName" type="s" access="read"/> <property name="OverlayIconPixmap" type="(iiay)" access="read"> - <annotation name="com.trolltech.QtDBus.QtTypeName" value="KDbusImageVector"/> + <annotation name="org.qtproject.QtDBus.QtTypeName" value="KDbusImageVector"/> </property> @@ -35,7 +35,7 @@ <!--same definition as image--> <property name="AttentionIconPixmap" type="(iiay)" access="read"> - <annotation name="com.trolltech.QtDBus.QtTypeName" value="KDbusImageVector"/> + <annotation name="org.qtproject.QtDBus.QtTypeName" value="KDbusImageVector"/> </property> <property name="AttentionMovieName" type="s" access="read"/> @@ -46,7 +46,7 @@ <!--(iiay) is an image--> <property name="ToolTip" type="(s(iiay)ss)" access="read"> - <annotation name="com.trolltech.QtDBus.QtTypeName" value="KDbusToolTipStruct"/> + <annotation name="org.qtproject.QtDBus.QtTypeName" value="KDbusToolTipStruct"/> </property> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/src/org.kde.StatusNotifierWatcher.xml new/knotifications-4.98.0/src/org.kde.StatusNotifierWatcher.xml --- old/knotifications-4.97.0/src/org.kde.StatusNotifierWatcher.xml 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/src/org.kde.StatusNotifierWatcher.xml 2014-03-28 19:17:18.000000000 +0100 @@ -15,7 +15,7 @@ <!-- properties --> <property name="RegisteredStatusNotifierItems" type="as" access="read"> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringList"/> + <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringList"/> </property> <property name="IsStatusNotifierHostRegistered" type="b" access="read"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/tests/CMakeLists.txt new/knotifications-4.98.0/tests/CMakeLists.txt --- old/knotifications-4.97.0/tests/CMakeLists.txt 2014-03-03 17:23:43.000000000 +0100 +++ new/knotifications-4.98.0/tests/CMakeLists.txt 2014-03-28 19:17:18.000000000 +0100 @@ -7,7 +7,7 @@ macro(knotifications_executable_tests) foreach(_testname ${ARGN}) add_executable(${_testname} ${_testname}.cpp) - target_link_libraries(${_testname} Qt5::Test KF5::Notifications) + target_link_libraries(${_testname} Qt5::Test Qt5::DBus KF5::Notifications) ecm_mark_as_test(${_testname}) endforeach(_testname) endmacro() @@ -16,6 +16,7 @@ knotificationrestrictionstest kpassivepopuptest kstatusnotifieritemtest + knotificationdbustest ) target_link_libraries(kpassivepopuptest KF5::WindowSystem) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-4.97.0/tests/knotificationdbustest.cpp new/knotifications-4.98.0/tests/knotificationdbustest.cpp --- old/knotifications-4.97.0/tests/knotificationdbustest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/knotifications-4.98.0/tests/knotificationdbustest.cpp 2014-03-28 19:17:18.000000000 +0100 @@ -0,0 +1,103 @@ +/* + Copyright 2014 Martin Klapetek <[email protected]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include <knotification.h> +#include <QTimer> + +#include <QApplication> +#include <QLabel> +#include <QDebug> +#include <QtDBus/QDBusConnection> +#include <QtDBus/QDBusMessage> + +static const char dbusServiceName[] = "org.freedesktop.Notifications"; +static const char dbusInterfaceName[] = "org.freedesktop.Notifications"; +static const char dbusPath[] = "/org/freedesktop/Notifications"; + +void notificationDBusCall(const QString &iconName, const QString &title, const QString &body, const QStringList &actions, bool persistent = false) +{ + QDBusMessage dbusNotificationMessage = QDBusMessage::createMethodCall(dbusServiceName, dbusPath, dbusInterfaceName, "Notify"); + + QList<QVariant> args; + + args.append(QString()); // app_name + args.append((uint)0); // notification to update + args.append(iconName); // app_icon + args.append(title); // summary + args.append(body); // body + + QStringList actionList; + int actId = 0; + Q_FOREACH (const QString &actionName, actions) { + actId++; + actionList.append(QString::number(actId)); + actionList.append(actionName); + } + + args.append(actionList); // actions + + args.append(QVariantMap()); // hints + + // Persistent => 0 == infinite timeout + // CloseOnTimeout => -1 == let the server decide + int timeout = persistent ? 0 : -1; + + args.append(timeout); // expire timout + + dbusNotificationMessage.setArguments(args); + + QDBusMessage reply = QDBusConnection::sessionBus().call(dbusNotificationMessage, QDBus::Block, 4000); + if (reply.type() == QDBusMessage::ErrorMessage) { + qDebug() << "Error sending notification:" << reply.errorMessage(); + } +} + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + + notificationDBusCall("amarok", + "Testing notification #1", + "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In condimentum", + QStringList() << "action1" << "action2"); + + // wait a little before sending another notification + QEventLoop a; + QTimer::singleShot(500, &a, SLOT(quit())); + a.exec(); + + notificationDBusCall("kwalletmanager", + "Testing notification #2", + "Praesent odio ipsum, posuere a magna ac, egestas vehicula lectus", + QStringList() << "action1" << "action2"); + + QTimer::singleShot(1000, &a, SLOT(quit())); + a.exec(); + + notificationDBusCall("preferences-desktop-accessibility", + "Testing notification #3", + "Fusce hendrerit egestas pellentesque", + QStringList(), + true); + + return app.exec(); + + QTimer::singleShot(2000, &app, SLOT(quit())); +} + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
