Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-10-01 07:33:23 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-10-01 07:35:12 (GMT) |
| commit | 4a65cdd952d5d3325c9be6e55e9f33ca5efa0301 (patch) | |
| tree | bb0c67b97b0ee7baeeb2d47793f9d9bc5249762d | |
| parent | 26e34e9888e4c523741a659055d469c828909cc6 (diff) | |
| parent | eedd35c220d6c8788c8ae4921135333a57feb3a0 (diff) | |
| download | swift-4a65cdd952d5d3325c9be6e55e9f33ca5efa0301.zip swift-4a65cdd952d5d3325c9be6e55e9f33ca5efa0301.tar.bz2 | |
Merge branch 'swift-1.x'
* swift-1.x:
Set a title on subscription notification popup.
Don't rely on CCVERSION being present.
Conflicts:
BuildTools/SCons/SConstruct
| -rw-r--r-- | BuildTools/SCons/SConscript.boot | 2 | ||||
| -rw-r--r-- | Swift/Controllers/EventNotifier.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot index 366981c..7148f6e 100644 --- a/BuildTools/SCons/SConscript.boot +++ b/BuildTools/SCons/SConscript.boot @@ -180,7 +180,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(CXXFLAGS = ["-Wlogical-op"]) if "clang" in env["CC"] : 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()>()); } |