Commit f8dbef74 authored by Marco Martin's avatar Marco Martin

solve conflicts

parent 264bff28
......@@ -41,33 +41,8 @@ Item {
property int notificationId: 0;
property int buttonHeight: width/4
<<<<<<< HEAD
/*
Notification data object has the following properties:
appIcon
image
appName
summary
body
isPersistent
expireTimeout
urgency
appRealName
configurable
*/
function addNotification(source, data, actions) {
// Do not show duplicated notifications
// Remove notifications that are sent again (odd, but true)
for (var i = 0; i < notificationsModel.count; ++i) {
var tmp = notificationsModel.get(i);
var matches = (tmp.appName == data.appName &&
tmp.summary == data.summary &&
tmp.body == data.body);
var sameSource = tmp.source == source;
=======
onContainmentChanged: {
containment.parent = homescreen;
>>>>>>> mart/newContainmentShell
if (containment != null) {
containment.visible = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment