[meego-commits] 23821: Changes to Trunk:Testing/mlite
Marko Saukko
no_reply at build.meego.com
Thu Sep 8 08:27:16 UTC 2011
Hi,
I have made the following changes to mlite in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Marko Saukko
[This message was auto-generated]
---
Request #23821:
submit: home:marko.saukko:branches:Trunk:Testing/mlite(r6cbfa9e6fe36dc9d47d151b41ea9b3e7)(cleanup) -> Trunk:Testing/mlite
Message:
NOTE: Sync 1.3.
* Wed Jul 20 2011 Rusty Lynch <rusty.lynch at intel.com> - 0.0.4
- Fix BMC #21561
Add MPreeditInjectionEvent support
* Mon Jul 18 2011 Rusty Lynch <rusty.lynch at intel.com> - 0.0.4
- Fix BMC #21338
Fix loading translations from desktop files by explicitly loading
the UTF-8 codec since the freedesktop specification requires all
desktop files to use this encoding.
* Mon Jul 11 2011 Rusty Lynch <rusty.lynch at intel.com> - 0.0.4
- Fix BMC #20892
Verify that the caller of MRemoteAction has provided valid DBus
service/object/interface before attempting to make a call on the
interface.
* Tue Jun 14 2011 Rusty Lynch <rusty.lynch at intel.com> - 0.0.4
- Fix BMC #19077 by adding QtGui to the list of Requires in
the mlite.pc file
- Cleanup the yaml file to remove warnings when generating the
spec file
* Sat Jun 11 2011 Rusty Lynch <rusty.lynch at intel.com> - 0.0.3
- Added support for a remote decline action to MNotification as
part of a fix for BMC #18907
* Mon May 30 2011 Rusty Lynch <rusty.lynch at intel.com> - 0.0.2
- Part of a fix for BMC #15501, by adding a new notification types
to support hard notifications
State: new 2011-09-08T01:18:46 marko.saukko
Comment: None
changes files:
--------------
--- mlite.changes
+++ mlite.changes
@@ -0,0 +1,30 @@
+* Wed Jul 20 2011 Rusty Lynch <rusty.lynch at intel.com> - 0.0.4
+- Fix BMC #21561
+ Add MPreeditInjectionEvent support
+
+* Mon Jul 18 2011 Rusty Lynch <rusty.lynch at intel.com> - 0.0.4
+- Fix BMC #21338
+ Fix loading translations from desktop files by explicitly loading
+ the UTF-8 codec since the freedesktop specification requires all
+ desktop files to use this encoding.
+
+* Mon Jul 11 2011 Rusty Lynch <rusty.lynch at intel.com> - 0.0.4
+- Fix BMC #20892
+ Verify that the caller of MRemoteAction has provided valid DBus
+ service/object/interface before attempting to make a call on the
+ interface.
+
+* Tue Jun 14 2011 Rusty Lynch <rusty.lynch at intel.com> - 0.0.4
+- Fix BMC #19077 by adding QtGui to the list of Requires in
+ the mlite.pc file
+- Cleanup the yaml file to remove warnings when generating the
+ spec file
+
+* Sat Jun 11 2011 Rusty Lynch <rusty.lynch at intel.com> - 0.0.3
+- Added support for a remote decline action to MNotification as
+ part of a fix for BMC #18907
+
+* Mon May 30 2011 Rusty Lynch <rusty.lynch at intel.com> - 0.0.2
+- Part of a fix for BMC #15501, by adding a new notification types
+ to support hard notifications
+
old:
----
mlite-0.0.1.tar.bz2
new:
----
0001-Fix-BMC-20892.patch
0002-Fix-BMC-21338.patch
0003-Fix-BMC-21561.patch
mlite-0.0.4.tar.bz2
spec files:
-----------
--- mlite.spec
+++ mlite.spec
@@ -1,24 +1,28 @@
#
# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.21
+# Generated by: spectacle version 0.22
#
# >> macros
# << macros
Name: mlite
Summary: Useful classes originating from MeeGo Touch
-Version: 0.0.1
+Version: 0.0.4
Release: 1
Group: System/Libraries
License: LGPL v2.1
URL: http://www.meego.com
Source0: %{name}-%{version}.tar.bz2
Source100: mlite.yaml
+Patch0: 0001-Fix-BMC-20892.patch
+Patch1: 0002-Fix-BMC-21338.patch
+Patch2: 0003-Fix-BMC-21561.patch
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
+BuildRequires: pkgconfig(QtDBus)
+BuildRequires: pkgconfig(QtCore)
+BuildRequires: pkgconfig(QtGui)
BuildRequires: pkgconfig(gconf-2.0)
-BuildRequires: libqt-devel
-BuildRequires: libqtopengl-devel
%description
@@ -40,6 +44,12 @@
%prep
%setup -q -n %{name}-%{version}
+# 0001-Fix-BMC-20892.patch
+%patch0 -p1
+# 0002-Fix-BMC-21338.patch
+%patch1 -p1
+# 0003-Fix-BMC-21561.patch
+%patch2 -p1
# >> setup
# << setup
other changes:
--------------
++++++ 0001-Fix-BMC-20892.patch (new)
--- 0001-Fix-BMC-20892.patch
+++ 0001-Fix-BMC-20892.patch
+From 4cd411529ac9c11d7f3d02161fb39f49c3130137 Mon Sep 17 00:00:00 2001
+From: Rusty Lynch <rusty.lynch at intel.com>
+Date: Mon, 11 Jul 2011 09:38:37 -0700
+Subject: [PATCH] Fix BMC #20892
+
+Verify that the caller of MRemoteAction has provided valid DBus
+service/object/interface before attempting to make a call on the
+interface.
+---
+ mremoteaction.cpp | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/mremoteaction.cpp b/mremoteaction.cpp
+index aaed9fb..c3cb9e8 100644
+--- a/mremoteaction.cpp
++++ b/mremoteaction.cpp
+@@ -129,5 +129,8 @@ void MRemoteAction::call()
+ Q_D(MRemoteAction);
+
+ QDBusInterface interface(d->serviceName, d->objectPath, d->interface.toAscii());
+- interface.asyncCallWithArgumentList(d->methodName, d->arguments);
++ if (interface.isValid())
++ {
++ interface.asyncCallWithArgumentList(d->methodName, d->arguments);
++ }
+ }
+--
+1.7.2.2
+
++++++ 0002-Fix-BMC-21338.patch (new)
--- 0002-Fix-BMC-21338.patch
+++ 0002-Fix-BMC-21338.patch
+From 6bf61e04e7028ac331d267ded19048424ad4110f Mon Sep 17 00:00:00 2001
+From: Denis Sapon <dsapon at ics.com>
+Date: Mon, 18 Jul 2011 19:36:42 +0300
+Subject: [PATCH 2/2] Fix BMC #21338
+
+fix loading translation after rebooting device
+---
+ mdesktopentry.cpp | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/mdesktopentry.cpp b/mdesktopentry.cpp
+index d3cf16e..e13d0d7 100644
+--- a/mdesktopentry.cpp
++++ b/mdesktopentry.cpp
+@@ -21,6 +21,7 @@
+ #include <QStringList>
+ #include <QLocale>
+ #include <QTextStream>
++#include <QTextCodec>
+ #include <QDebug>
+
+ #include "mdesktopentry.h"
+@@ -135,6 +136,7 @@ bool MDesktopEntryPrivate::readDesktopFile(QIODevice &device, QMap<QString, QStr
+ QString currentGroup;
+ QStringList groupNames;
+ QTextStream stream(&device);
++ stream.setCodec(QTextCodec::codecForName("UTF-8"));
+ while (!stream.atEnd()) {
+ QString line = stream.readLine().trimmed();
+ if (!line.isEmpty() && !line.startsWith('#')) {
+--
+1.7.2.2
+
++++++ 0003-Fix-BMC-21561.patch (new)
--- 0003-Fix-BMC-21561.patch
+++ 0003-Fix-BMC-21561.patch
+From e9fdb5b56f96e4491971fa8f933d5d9f36ed82e6 Mon Sep 17 00:00:00 2001
+From: Andy Ross <andy.ross at windriver.com>
+Date: Fri, 15 Jul 2011 08:23:13 -0700
+Subject: [PATCH 3/3] Fix BMC #21561
+
+Add MPreeditInjectionEvent
+
+This bit from libmeegotouch is needed for Maliit interaction. In
+MeeGo 1.3, it moves to libmaliit, so needs to be removed when deployed
+there.
+
+Signed-off-by: Andy Ross <andy.ross at windriver.com>
+---
+ mlite.pro | 10 +++-
+ mpreeditinjectionevent.cpp | 117 ++++++++++++++++++++++++++++++++++++++++++++
+ mpreeditinjectionevent.h | 96 ++++++++++++++++++++++++++++++++++++
+ mpreeditinjectionevent_p.h | 35 +++++++++++++
+ 4 files changed, 255 insertions(+), 3 deletions(-)
+ create mode 100644 mpreeditinjectionevent.cpp
+ create mode 100644 mpreeditinjectionevent.h
+ create mode 100644 mpreeditinjectionevent_p.h
+
+diff --git a/mlite.pro b/mlite.pro
+index 7e1eddf..081dfe2 100644
+--- a/mlite.pro
++++ b/mlite.pro
+@@ -19,7 +19,8 @@ SOURCES += \
+ mnotification.cpp \
+ mnotificationgroup.cpp \
+ mnotificationmanager.cpp \
+- mnotificationmanagerproxy.cpp
++ mnotificationmanagerproxy.cpp \
++ mpreeditinjectionevent.cpp
+
+ HEADERS += \
+ mdesktopentry_p.h \
+@@ -43,7 +44,9 @@ HEADERS += \
+ mnotificationmanagerproxy.h \
+ MNotification \
+ MGConfItem \
+- MNotificationGroup
++ MNotificationGroup \
++ mpreeditinjectionevent.h \
++ mpreeditinjectionevent_p.h
+
+ INSTALL_HEADERS += \
+ mgconfitem.h \
+@@ -57,7 +60,8 @@ INSTALL_HEADERS += \
+ mnotificationgroup.h \
+ MNotification \
+ MGConfItem \
+- MNotificationGroup
++ MNotificationGroup \
++ mpreeditinjectionevent.h
+
+ pcfiles.files += mlite.pc
+ pcfiles.path += $$INSTALL_ROOT/usr/lib/pkgconfig
+diff --git a/mpreeditinjectionevent.cpp b/mpreeditinjectionevent.cpp
+new file mode 100644
+index 0000000..37a8154
+--- /dev/null
++++ b/mpreeditinjectionevent.cpp
+@@ -0,0 +1,117 @@
++/***************************************************************************
++**
++** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
++** All rights reserved.
++** Contact: Nokia Corporation (directui at nokia.com)
++**
++** This file is part of libmeegotouch.
++**
++** If you have questions regarding the use of this file, please contact
++** Nokia at directui at nokia.com.
++**
++** This library is free software; you can redistribute it and/or
++** modify it under the terms of the GNU Lesser General Public
++** License version 2.1 as published by the Free Software Foundation
++** and appearing in the file LICENSE.LGPL included in the packaging
++** of this file.
++**
++****************************************************************************/
++
++#include <QString>
++#include <QMutex>
++
++#include "mpreeditinjectionevent.h"
++#include "mpreeditinjectionevent_p.h"
++
++
++static int sPreeditEventNumber = -1;
++static QMutex sPreeditInjectionMutex;
++
++MPreeditInjectionEventPrivate::MPreeditInjectionEventPrivate(const QString &preedit, int eventCursorPos)
++ : preedit(preedit),
++ eventCursorPosition(eventCursorPos),
++ replacementStart(0),
++ replacementLength(0)
++{
++ // nothing
++}
++
++
++MPreeditInjectionEventPrivate::~MPreeditInjectionEventPrivate()
++{
++ // nothing
++}
++
++
++///////////////////////
++// class implementation
++
++
++MPreeditInjectionEvent::MPreeditInjectionEvent(const QString &preedit)
++ : QEvent(MPreeditInjectionEvent::eventNumber()),
++ d_ptr(new MPreeditInjectionEventPrivate(preedit, -1))
++{
++ setAccepted(false);
++}
++
++MPreeditInjectionEvent::MPreeditInjectionEvent(const QString &preedit, int eventCursorPosition)
++ : QEvent(MPreeditInjectionEvent::eventNumber()),
++ d_ptr(new MPreeditInjectionEventPrivate(preedit, eventCursorPosition))
++{
++ setAccepted(false);
++}
++
++MPreeditInjectionEvent::~MPreeditInjectionEvent()
++{
++ delete d_ptr;
++}
++
++
++QString MPreeditInjectionEvent::preedit() const
++{
++ Q_D(const MPreeditInjectionEvent);
++ return d->preedit;
++}
++
++int MPreeditInjectionEvent::eventCursorPosition() const
++{
++ Q_D(const MPreeditInjectionEvent);
++ return d->eventCursorPosition;
++}
++
++void MPreeditInjectionEvent::setReplacement(int replacementStart, int replacementLength)
++{
++ Q_D(MPreeditInjectionEvent);
++ d->replacementStart = replacementStart;
++ d->replacementLength = replacementLength;
++}
++
++int MPreeditInjectionEvent::replacementStart() const
++{
++ Q_D(const MPreeditInjectionEvent);
++ return d->replacementStart;
++}
++
++int MPreeditInjectionEvent::replacementLength() const
++{
++ Q_D(const MPreeditInjectionEvent);
++ return d->replacementLength;
++}
++
++
++// static
++QEvent::Type MPreeditInjectionEvent::eventNumber()
++{
++ if (sPreeditEventNumber < 0) {
++ // no event number yet registered, do it now
++ sPreeditInjectionMutex.lock();
++
++ if (sPreeditEventNumber < 0) {
++ sPreeditEventNumber = QEvent::registerEventType();
++ }
++
++ sPreeditInjectionMutex.unlock();
++ }
++
++ return static_cast<QEvent::Type>(sPreeditEventNumber);
++}
+diff --git a/mpreeditinjectionevent.h b/mpreeditinjectionevent.h
+new file mode 100644
+index 0000000..3b2831e
+--- /dev/null
++++ b/mpreeditinjectionevent.h
+@@ -0,0 +1,96 @@
++/***************************************************************************
++**
++** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
++** All rights reserved.
++** Contact: Nokia Corporation (directui at nokia.com)
++**
++** This file is part of libmeegotouch.
++**
++** If you have questions regarding the use of this file, please contact
++** Nokia at directui at nokia.com.
++**
++** This library is free software; you can redistribute it and/or
(128 more lines skipped)
++++++ mlite-0.0.1.tar.bz2 -> mlite-0.0.4.tar.bz2
--- MNotificationGroup
+++ MNotificationGroup
+#include "mnotificationgroup.h"
--- mlite.pc
+++ mlite.pc
@@ -8,4 +8,4 @@
Version: 0.0.1
Cflags: -I${includedir}
Libs: -L${libdir} -lmlite
-Requires: QtDBus
+Requires: QtDBus QtGui
--- mlite.pro
+++ mlite.pro
@@ -42,7 +42,8 @@
mnotificationmanager.h \
mnotificationmanagerproxy.h \
MNotification \
- MGConfItem
+ MGConfItem \
+ MNotificationGroup
INSTALL_HEADERS += \
mgconfitem.h \
@@ -55,7 +56,8 @@
mnotification.h \
mnotificationgroup.h \
MNotification \
- MGConfItem
+ MGConfItem \
+ MNotificationGroup
pcfiles.files += mlite.pc
pcfiles.path += $$INSTALL_ROOT/usr/lib/pkgconfig
@@ -68,7 +70,7 @@
INSTALLS += target headers pcfiles
TRANSLATIONS += $${SOURCES} $${HEADERS} $${OTHER_FILES}
-VERSION = 0.0.1
+VERSION = 0.0.4
PROJECT_NAME = mlite
dist.commands += rm -fR $${PROJECT_NAME}-$${VERSION} &&
--- mnotification.cpp
+++ mnotification.cpp
@@ -33,6 +33,7 @@
const QString MNotification::ImEvent = "im";
const QString MNotification::ImErrorEvent = "im.error";
const QString MNotification::ImReceivedEvent = "im.received";
+const QString MNotification::ImIncomingVideoChat = "im.incomingVideoChat";
const QString MNotification::NetworkEvent = "network";
const QString MNotification::NetworkConnectedEvent = "network.connected";
const QString MNotification::NetworkDisconnectedEvent = "network.disconnected";
@@ -45,6 +46,8 @@
const QString MNotification::TransferErrorEvent = "transfer.error";
const QString MNotification::MessageEvent = "x-nokia.message";
const QString MNotification::MessageArrivedEvent = "x-nokia.message.arrived";
+const QString MNotification::PhoneIncomingCall = "x-nokia.call";
+const QString MNotification::HardNotification = "hard.notification";
MNotificationPrivate::MNotificationPrivate() :
id(0),
@@ -185,6 +188,12 @@
return d->identifier;
}
+void MNotification::setDeclineAction(const MRemoteAction &declineAction)
+{
+ Q_D(MNotification);
+ d->declineAction = declineAction.toString();
+}
+
bool MNotification::publish()
{
Q_D(MNotification);
@@ -192,7 +201,7 @@
bool success = false;
if (d->id == 0) {
if (!d->summary.isNull() || !d->body.isNull() || !d->image.isNull() || !d->action.isNull() || !d->identifier.isNull()) {
- d->id = MNotificationManager::instance()->addNotification(d->groupId, d->eventType, d->summary, d->body, d->action, d->image, d->count, d->identifier);
+ d->id = MNotificationManager::instance()->addNotification(d->groupId, d->eventType, d->summary, d->body, d->action, d->image, d->declineAction, d->count, d->identifier);
} else {
d->id = MNotificationManager::instance()->addNotification(d->groupId, d->eventType);
}
@@ -200,7 +209,7 @@
success = d->id != 0;
} else {
if (!d->summary.isNull() || !d->body.isNull() || !d->image.isNull() || !d->action.isNull() || !d->identifier.isNull()) {
- success = MNotificationManager::instance()->updateNotification(d->id, d->eventType, d->summary, d->body, d->action, d->image, d->count, d->identifier);
+ success = MNotificationManager::instance()->updateNotification(d->id, d->eventType, d->summary, d->body, d->action, d->image, d->declineAction, d->count, d->identifier);
} else {
success = MNotificationManager::instance()->updateNotification(d->id, d->eventType);
}
@@ -252,6 +261,7 @@
argument << d->action;
argument << d->count;
argument << d->identifier;
+ argument << d->declineAction;
argument.endStructure();
return argument;
}
@@ -269,6 +279,7 @@
argument >> d->action;
argument >> d->count;
argument >> d->identifier;
+ argument >> d->declineAction;
argument.endStructure();
return argument;
}
@@ -286,5 +297,6 @@
d->action = dn->action;
d->count = dn->count;
d->identifier = dn->identifier;
+ d->declineAction = dn->declineAction;
return *this;
}
--- mnotification.h
+++ mnotification.h
@@ -148,6 +148,8 @@
static const QString ImErrorEvent;
//! A received instant message notification.
static const QString ImReceivedEvent;
+ //! An incoming instant message video chat notification
+ static const QString ImIncomingVideoChat;
//! A generic network notification that doesn't fit into any other category.
static const QString NetworkEvent;
//! A network connection notification, such as successful sign-on to a network service. This should not be confused with device.added for new network devices.
@@ -172,6 +174,10 @@
static const QString MessageEvent;
//! A new SMS/MMS notification.
static const QString MessageArrivedEvent;
+ //! A incoming phone call.
+ static const QString PhoneIncomingCall;
+ //! String to indicate hard notification
+ static const QString HardNotification;
/*!
* Creates a new representation of a notification. The notification will
@@ -288,6 +294,13 @@
QString identifier() const;
/*!
+ * Sets the decline action to be executed when notification is declined.
+ *
+ * \param the decline action to be executed when notification is declined.
+ */
+ void setDeclineAction(const MRemoteAction &declineAction);
+
+ /*!
* Publishes the notification. If the notification has not yet been
* published a notification is created into the given notification
* group (if any) and is given an ID by the notification manager.
--- mnotification_p.h
+++ mnotification_p.h
@@ -62,6 +62,9 @@
//! The identifier of the notification set by the application
QString identifier;
+
+ //! The action to be executed when the notification is declined.
+ QString declineAction;
};
#endif // MNOTIFICATION_P_H
--- mnotificationgroup.cpp
+++ mnotificationgroup.cpp
@@ -65,7 +65,7 @@
if (d->id == 0) {
if (!d->summary.isNull() || !d->body.isNull() || !d->image.isNull() || !d->action.isNull() || !d->identifier.isNull()) {
- d->id = MNotificationManager::instance()->addGroup(d->eventType, d->summary, d->body, d->action, d->image, d->count, d->identifier);
+ d->id = MNotificationManager::instance()->addGroup(d->eventType, d->summary, d->body, d->action, d->image, d->declineAction, d->count, d->identifier);
} else {
d->id = MNotificationManager::instance()->addGroup(d->eventType);
}
@@ -73,7 +73,7 @@
success = d->id != 0;
} else {
if (!d->summary.isNull() || !d->body.isNull() || !d->image.isNull() || !d->action.isNull() || !d->identifier.isNull()) {
- success = MNotificationManager::instance()->updateGroup(d->id, d->eventType, d->summary, d->body, d->action, d->image, d->count, d->identifier);
+ success = MNotificationManager::instance()->updateGroup(d->id, d->eventType, d->summary, d->body, d->action, d->image, d->declineAction, d->count, d->identifier);
} else {
success = MNotificationManager::instance()->updateGroup(d->id, d->eventType);
}
@@ -116,6 +116,7 @@
argument << d->action;
argument << d->count;
argument << d->identifier;
+ argument << d->declineAction;
argument.endStructure();
return argument;
}
@@ -132,6 +133,7 @@
argument >> d->action;
argument >> d->count;
argument >> d->identifier;
+ argument >> d->declineAction;
argument.endStructure();
return argument;
}
--- mnotificationmanager.cpp
+++ mnotificationmanager.cpp
@@ -73,8 +73,13 @@
return ¬ificationManagerInstance;
}
-uint MNotificationManager::addGroup(const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, uint count, const QString &identifier)
+uint MNotificationManager::addGroup(const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, const QString &declineAction, uint count, const QString &identifier)
{
+ return proxy.addGroup(userId, eventType, summary, body, action, imageURI, declineAction, count, identifier);
+}
+
+uint MNotificationManager::addGroup(const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, uint count, const QString &identifier)
+{
return proxy.addGroup(userId, eventType, summary, body, action, imageURI, count, identifier);
}
@@ -83,8 +88,13 @@
return proxy.addGroup(userId, eventType);
}
-uint MNotificationManager::addNotification(uint groupId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, uint count, const QString &identifier)
+uint MNotificationManager::addNotification(uint groupId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, const QString &declineAction, uint count, const QString &identifier)
{
+ return proxy.addNotification(userId, groupId, eventType, summary, body, action, imageURI, declineAction, count, identifier);
+}
+
+uint MNotificationManager::addNotification(uint groupId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, uint count, const QString &identifier)
+{
return proxy.addNotification(userId, groupId, eventType, summary, body, action, imageURI, count, identifier);
}
@@ -103,6 +113,11 @@
return proxy.removeNotification(userId, notificationId);
}
+bool MNotificationManager::updateGroup(uint groupId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, const QString &declineAction, uint count, const QString &identifier)
+{
+ return proxy.updateGroup(userId, groupId, eventType, summary, body, action, imageURI, declineAction, count, identifier);
+}
+
bool MNotificationManager::updateGroup(uint groupId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, uint count, const QString &identifier)
{
return proxy.updateGroup(userId, groupId, eventType, summary, body, action, imageURI, count, identifier);
@@ -113,6 +128,11 @@
return proxy.updateGroup(userId, groupId, eventType);
}
+bool MNotificationManager::updateNotification(uint notificationId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, const QString &declineAction, uint count, const QString &identifier)
+{
+ return proxy.updateNotification(userId, notificationId, eventType, summary, body, action, imageURI, declineAction, count, identifier);
+}
+
bool MNotificationManager::updateNotification(uint notificationId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, uint count, const QString &identifier)
{
return proxy.updateNotification(userId, notificationId, eventType, summary, body, action, imageURI, count, identifier);
--- mnotificationmanager.h
+++ mnotificationmanager.h
@@ -68,6 +68,22 @@
* \param imageURI the ID of the icon to be used in the notification
* \param count the number of items inside this group
* \param identifier the identifier string of the notification
+ * \param declineAction the remote action to be used when notification is declined
+ * \return the ID of the new notification group
+ */
+ uint addGroup(const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, const QString &declineAction, uint count, const QString &identifier);
+
+ /*!
+ * Adds a new notification group.
+ *
+ * \param eventType the event type of the notification
+ * \param summary the summary text to be used in the notification
+ * \param body the body text to be used in the notification
+ * \param action the ID of the content to be used in the notification
+ * \param imageURI the ID of the icon to be used in the notification
+ * \param count the number of items inside this group
+ * \param identifier the identifier string of the notification
+ * \param declineAction the remote action to be used when notification is declined
* \return the ID of the new notification group
*/
uint addGroup(const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, uint count, const QString &identifier);
@@ -91,10 +107,28 @@
* \param imageURI the ID of the icon to be used in the notification
* \param count the number of items inside this notification
* \param identifier the identifier string of the notification
+ * \param declineAction the remote action to be used when notification is declined
+ * \return the ID of the new notification
+ */
+ uint addNotification(uint groupId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, const QString &declineAction, uint count = 1, const QString &identifier = QString());
+
+ /*!
+ * Adds a new notification.
+ *
+ * \param groupId the ID of the notification group to put the notification in
+ * \param eventType the event type of the notification
+ * \param summary the summary text to be used in the notification
+ * \param body the body text to be used in the notification
+ * \param action the ID of the content to be used in the notification
+ * \param imageURI the ID of the icon to be used in the notification
+ * \param count the number of items inside this notification
+ * \param identifier the identifier string of the notification
+ * \param declineAction the remote action to be used when notification is declined
* \return the ID of the new notification
*/
uint addNotification(uint groupId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, uint count = 1, const QString &identifier = QString());
+
/*!
* Adds a new notification.
*
@@ -133,6 +167,21 @@
* \param identifier the identifier string of the notification
* \return true if the update succeeded, false otherwise
*/
+ bool updateGroup(uint groupId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, const QString &declineAction, uint count, const QString &identifier = QString());
+
+ /*!
+ * Updates an existing notification group.
+ *
+ * \param groupId the ID of the notification group to be updated
+ * \param eventType the event type of the notification
+ * \param summary the summary text to be used in the notification
+ * \param body the body text to be used in the notification
+ * \param action the ID of the content to be used in the notification
+ * \param imageURI the ID of the icon to be used in the notification
+ * \param count the number of items inside this group
+ * \param identifier the identifier string of the notification
+ * \return true if the update succeeded, false otherwise
+ */
bool updateGroup(uint groupId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, uint count, const QString &identifier = QString());
/*!
@@ -146,6 +195,21 @@
/*!
* Updates an existing notification.
+ *
+ * \param notificationId the ID of the notification to be updated
+ * \param eventType the event type of the notification
+ * \param summary the summary text to be used in the notification
+ * \param body the body text to be used in the notification
+ * \param action the ID of the content to be used in the notification
+ * \param imageURI the ID of the icon to be used in the notification
+ * \param count the number of items inside this notification
+ * \param identifier the identifier string of the notification
+ * \return true if the update succeeded, false otherwise
+ */
+ bool updateNotification(uint notificationId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, const QString &declineAction, uint count = 1, const QString &identifier = QString());
+
+ /*!
+ * Updates an existing notification.
*
* \param notificationId the ID of the notification to be updated
* \param eventType the event type of the notification
--- mnotificationmanagerproxy.h
+++ mnotificationmanagerproxy.h
@@ -37,10 +37,18 @@
~MNotificationManagerProxy();
public Q_SLOTS: // METHODS
+ inline QDBusPendingReply<uint> addGroup(uint notificationUserId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, const QString &declineAction, uint count, const QString &identifier)
+ {
+ QList<QVariant> argumentList;
+ argumentList << qVariantFromValue(notificationUserId) << qVariantFromValue(eventType) << qVariantFromValue(summary) << qVariantFromValue(body) << qVariantFromValue(action) << qVariantFromValue(imageURI) << qVariantFromValue(declineAction) << qVariantFromValue(count) << qVariantFromValue(identifier);
+ return asyncCallWithArgumentList(QLatin1String("addGroup"), argumentList);
+ }
+
inline QDBusPendingReply<uint> addGroup(uint notificationUserId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, uint count, const QString &identifier)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(notificationUserId) << qVariantFromValue(eventType) << qVariantFromValue(summary) << qVariantFromValue(body) << qVariantFromValue(action) << qVariantFromValue(imageURI) << qVariantFromValue(count) << qVariantFromValue(identifier);
+ QString declineAction;
+ argumentList << qVariantFromValue(notificationUserId) << qVariantFromValue(eventType) << qVariantFromValue(summary) << qVariantFromValue(body) << qVariantFromValue(action) << qVariantFromValue(imageURI) << qVariantFromValue(declineAction) << qVariantFromValue(count) << qVariantFromValue(identifier);
return asyncCallWithArgumentList(QLatin1String("addGroup"), argumentList);
}
@@ -51,11 +59,21 @@
return asyncCallWithArgumentList(QLatin1String("addGroup"), argumentList);
}
+ inline QDBusPendingReply<uint> addNotification(uint notificationUserId, uint groupId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, const QString &declineAction, uint count, const QString &identifier)
+ {
+ QList<QVariant> argumentList;
+ argumentList << qVariantFromValue(notificationUserId) << qVariantFromValue(groupId) << qVariantFromValue(eventType) << qVariantFromValue(summary) << qVariantFromValue(body) << qVariantFromValue(action) << qVariantFromValue(imageURI) << qVariantFromValue(declineAction) << qVariantFromValue(count) << qVariantFromValue(identifier);
+ return asyncCallWithArgumentList(QLatin1String("addNotification"), argumentList);
+
+ }
+
inline QDBusPendingReply<uint> addNotification(uint notificationUserId, uint groupId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, uint count, const QString &identifier)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(notificationUserId) << qVariantFromValue(groupId) << qVariantFromValue(eventType) << qVariantFromValue(summary) << qVariantFromValue(body) << qVariantFromValue(action) << qVariantFromValue(imageURI) << qVariantFromValue(count) << qVariantFromValue(identifier);
- return asyncCallWithArgumentList(QLatin1String("addNotification"), argumentList);
+ QString declineAction;
+ argumentList << qVariantFromValue(notificationUserId) << qVariantFromValue(groupId) << qVariantFromValue(eventType) << qVariantFromValue(summary) << qVariantFromValue(body) << qVariantFromValue(action) << qVariantFromValue(imageURI) << qVariantFromValue(declineAction) << qVariantFromValue(count) << qVariantFromValue(identifier);
+ return asyncCallWithArgumentList(QLatin1String("addNotification"), argumentList);
+
}
inline QDBusPendingReply<uint> addNotification(uint notificationUserId, uint groupId, const QString &eventType)
@@ -106,10 +124,18 @@
return asyncCallWithArgumentList(QLatin1String("removeNotification"), argumentList);
}
+ inline QDBusPendingReply<bool> updateGroup(uint notificationUserId, uint groupId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, const QString &declineAction, uint count, const QString &identifier)
+ {
+ QList<QVariant> argumentList;
+ argumentList << qVariantFromValue(notificationUserId) << qVariantFromValue(groupId) << qVariantFromValue(eventType) << qVariantFromValue(summary) << qVariantFromValue(body) << qVariantFromValue(action) << qVariantFromValue(imageURI) << qVariantFromValue(declineAction)<< qVariantFromValue(count) << qVariantFromValue(identifier);
+ return asyncCallWithArgumentList(QLatin1String("updateGroup"), argumentList);
+ }
+
inline QDBusPendingReply<bool> updateGroup(uint notificationUserId, uint groupId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, uint count, const QString &identifier)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(notificationUserId) << qVariantFromValue(groupId) << qVariantFromValue(eventType) << qVariantFromValue(summary) << qVariantFromValue(body) << qVariantFromValue(action) << qVariantFromValue(imageURI) << qVariantFromValue(count) << qVariantFromValue(identifier);
+ QString declineAction;
+ argumentList << qVariantFromValue(notificationUserId) << qVariantFromValue(groupId) << qVariantFromValue(eventType) << qVariantFromValue(summary) << qVariantFromValue(body) << qVariantFromValue(action) << qVariantFromValue(imageURI) << qVariantFromValue(declineAction)<< qVariantFromValue(count) << qVariantFromValue(identifier);
return asyncCallWithArgumentList(QLatin1String("updateGroup"), argumentList);
}
@@ -120,10 +146,18 @@
return asyncCallWithArgumentList(QLatin1String("updateGroup"), argumentList);
}
+ inline QDBusPendingReply<bool> updateNotification(uint notificationUserId, uint notificationId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, const QString &declineAction, uint count, const QString &identifier)
+ {
+ QList<QVariant> argumentList;
+ argumentList << qVariantFromValue(notificationUserId) << qVariantFromValue(notificationId) << qVariantFromValue(eventType) << qVariantFromValue(summary) << qVariantFromValue(body) << qVariantFromValue(action) << qVariantFromValue(imageURI) << qVariantFromValue(declineAction)<< qVariantFromValue(count) << qVariantFromValue(identifier);
+ return asyncCallWithArgumentList(QLatin1String("updateNotification"), argumentList);
+ }
+
inline QDBusPendingReply<bool> updateNotification(uint notificationUserId, uint notificationId, const QString &eventType, const QString &summary, const QString &body, const QString &action, const QString &imageURI, uint count, const QString &identifier)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(notificationUserId) << qVariantFromValue(notificationId) << qVariantFromValue(eventType) << qVariantFromValue(summary) << qVariantFromValue(body) << qVariantFromValue(action) << qVariantFromValue(imageURI) << qVariantFromValue(count) << qVariantFromValue(identifier);
+ QString declineAction;
+ argumentList << qVariantFromValue(notificationUserId) << qVariantFromValue(notificationId) << qVariantFromValue(eventType) << qVariantFromValue(summary) << qVariantFromValue(body) << qVariantFromValue(action) << qVariantFromValue(imageURI) << qVariantFromValue(declineAction)<< qVariantFromValue(count) << qVariantFromValue(identifier);
return asyncCallWithArgumentList(QLatin1String("updateNotification"), argumentList);
}
--- notificationmanager.xml
+++ notificationmanager.xml
@@ -16,6 +16,18 @@
<arg name="body" type="s" direction="in"/>
<arg name="action" type="s" direction="in"/>
<arg name="imageURI" type="s" direction="in"/>
+ <arg name="declineAction" type="s" direction="in"/>
+ <arg name="count" type="u" direction="in"/>
+ <arg name="identifier" type="s" direction="in"/>
+ <arg name="groupId" type="u" direction="out"/>
+ </method>
+ <method name="addGroup">
+ <arg name="notificationUserId" type="u" direction="in"/>
+ <arg name="eventType" type="s" direction="in"/>
+ <arg name="summary" type="s" direction="in"/>
+ <arg name="body" type="s" direction="in"/>
+ <arg name="action" type="s" direction="in"/>
+ <arg name="imageURI" type="s" direction="in"/>
<arg name="count" type="u" direction="in"/>
<arg name="identifier" type="s" direction="in"/>
<arg name="groupId" type="u" direction="out"/>
@@ -34,6 +46,19 @@
<arg name="body" type="s" direction="in"/>
<arg name="action" type="s" direction="in"/>
<arg name="imageURI" type="s" direction="in"/>
+ <arg name="declineAction" type="s" direction="in"/>
+ <arg name="count" type="u" direction="in"/>
+ <arg name="identifier" type="s" direction="in"/>
+ <arg name="result" type="b" direction="out"/>
+ </method>
+ <method name="updateGroup">
+ <arg name="notificationUserId" type="u" direction="in"/>
+ <arg name="groupId" type="u" direction="in"/>
+ <arg name="eventType" type="s" direction="in"/>
+ <arg name="summary" type="s" direction="in"/>
+ <arg name="body" type="s" direction="in"/>
+ <arg name="action" type="s" direction="in"/>
+ <arg name="imageURI" type="s" direction="in"/>
<arg name="count" type="u" direction="in"/>
<arg name="identifier" type="s" direction="in"/>
<arg name="result" type="b" direction="out"/>
@@ -61,6 +86,19 @@
<arg name="identifier" type="s" direction="in"/>
<arg name="notificationId" type="u" direction="out"/>
</method>
+ <method name="addNotification">
+ <arg name="notificationUserId" type="u" direction="in"/>
+ <arg name="groupId" type="u" direction="in"/>
+ <arg name="eventType" type="s" direction="in"/>
+ <arg name="summary" type="s" direction="in"/>
+ <arg name="body" type="s" direction="in"/>
+ <arg name="action" type="s" direction="in"/>
+ <arg name="imageURI" type="s" direction="in"/>
+ <arg name="declineAction" type="s" direction="in"/>
+ <arg name="count" type="u" direction="in"/>
+ <arg name="identifier" type="s" direction="in"/>
+ <arg name="notificationId" type="u" direction="out"/>
+ </method>
<method name="updateNotification">
<arg name="notificationUserId" type="u" direction="in"/>
<arg name="notificationId" type="u" direction="in"/>
@@ -68,6 +106,19 @@
<arg name="result" type="b" direction="out"/>
</method>
<method name="updateNotification">
+ <arg name="notificationUserId" type="u" direction="in"/>
+ <arg name="notificationId" type="u" direction="in"/>
+ <arg name="eventType" type="s" direction="in"/>
+ <arg name="summary" type="s" direction="in"/>
+ <arg name="body" type="s" direction="in"/>
+ <arg name="action" type="s" direction="in"/>
+ <arg name="imageURI" type="s" direction="in"/>
+ <arg name="declineAction" type="s" direction="in"/>
+ <arg name="count" type="u" direction="in"/>
+ <arg name="identifier" type="s" direction="in"/>
+ <arg name="result" type="b" direction="out"/>
+ </method>
+ <method name="updateNotification">
<arg name="notificationUserId" type="u" direction="in"/>
<arg name="notificationId" type="u" direction="in"/>
<arg name="eventType" type="s" direction="in"/>
++++++ mlite.yaml
--- mlite.yaml
+++ mlite.yaml
@@ -1,20 +1,24 @@
Name: mlite
Summary: Useful classes originating from MeeGo Touch
-Version: 0.0.1
+Version: 0.0.4
Release: 1
Group: System/Libraries
License: LGPL v2.1
URL: http://www.meego.com
Sources:
- "%{name}-%{version}.tar.bz2"
+Patches:
+ - 0001-Fix-BMC-20892.patch
+ - 0002-Fix-BMC-21338.patch
+ - 0003-Fix-BMC-21561.patch
Description: |
Select set of useful classes from meegotouch that do not require
taking in all of meegotouch.
-PkgBR:
- - libqt-devel
- - libqtopengl-devel
PkgConfigBR:
+ - QtDBus
+ - QtCore
+ - QtGui
- gconf-2.0
Configure: none
Builder: qmake
More information about the MeeGo-commits
mailing list