From 5bb4ce27cb8335384236970a7b17b3c4258acaca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sun, 28 Aug 2011 16:48:30 +0200
Subject: Don't rely on CCVERSION being present.

Resolves: #911
Release-Notes: Fixed build problem when GCC version can't be determined.

diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index bc7781b..7c172f4 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -176,7 +176,7 @@ else :
 	env.Append(CXXFLAGS = ["-Wextra", "-Wall", "-Wnon-virtual-dtor", "-Wundef", "-Wold-style-cast", "-Wno-long-long", "-Woverloaded-virtual", "-Wfloat-equal", "-Wredundant-decls"])
 	if not env.get("allow_warnings", False) :
 		env.Append(CXXFLAGS = ["-Werror"])
-	gccVersion = env["CCVERSION"].split(".")
+	gccVersion = env.get("CCVERSION", "0.0.0").split(".")
 	if gccVersion >= ["4", "5", "0"] :
 		env.Append(CCFLAGS = ["-Wlogical-op"])
 
-- 
cgit v0.10.2-6-g49f6


From eedd35c220d6c8788c8ae4921135333a57feb3a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 1 Oct 2011 09:25:29 +0200
Subject: Set a title on subscription notification popup.

Notify-OSD behaves weird if you ask it to render a popup without a
subject/header/summary.

Release-Notes: Fixed the issue where subscription notifications on Linux did not show properly.

diff --git a/Swift/Controllers/EventNotifier.cpp b/Swift/Controllers/EventNotifier.cpp
index 645ee3c..7ecc27c 100644
--- a/Swift/Controllers/EventNotifier.cpp
+++ b/Swift/Controllers/EventNotifier.cpp
@@ -47,7 +47,7 @@ void EventNotifier::handleEventAdded(boost::shared_ptr<StanzaEvent> event) {
 	}
 	else if(boost::shared_ptr<SubscriptionRequestEvent> subscriptionEvent = boost::dynamic_pointer_cast<SubscriptionRequestEvent>(event)) {
 		JID jid = subscriptionEvent->getJID();
-		std::string title = "";
+		std::string title = jid;
 		std::string message = str(format(QT_TRANSLATE_NOOP("", "%1% wants to add you to his/her contact list")) % nickResolver->jidToNick(jid));
 		notifier->showMessage(Notifier::SystemMessage, title, message, boost::filesystem::path(), boost::function<void()>());
 	}
-- 
cgit v0.10.2-6-g49f6