From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 11 Nov 2011 12:24:57 +0000 (+0100)
Subject: Merge branch 'configurable-notifications-250' into next
X-Git-Tag: 0.7.3^2~14
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=1dfe9f0daba9a1103c5566b81af5bed7791dde5c;p=Sone.git

Merge branch 'configurable-notifications-250' into next

This resolves #250.

Conflicts:
	src/main/java/net/pterodactylus/sone/core/Core.java
---

1dfe9f0daba9a1103c5566b81af5bed7791dde5c
diff --cc src/main/java/net/pterodactylus/sone/core/Core.java
index d24f497,aa5b820..264390e
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@@ -1008,7 -1008,9 +1008,10 @@@ public class Core extends AbstractServi
  		}
  		Sone sone = addLocalSone(ownIdentity);
  		sone.getOptions().addBooleanOption("AutoFollow", new DefaultOption<Boolean>(false));
 +		sone.getOptions().addBooleanOption("EnableSoneInsertNotifications", new DefaultOption<Boolean>(false));
+ 		sone.getOptions().addBooleanOption("ShowNotification/NewSones", new DefaultOption<Boolean>(true));
+ 		sone.getOptions().addBooleanOption("ShowNotification/NewPosts", new DefaultOption<Boolean>(true));
+ 		sone.getOptions().addBooleanOption("ShowNotification/NewReplies", new DefaultOption<Boolean>(true));
  		sone.addFriend("nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI");
  		touchConfiguration();
  		return sone;