[smuxi: 3/3] Merge branch 'stable'
- From: Mirco M. M. Bauer <mmmbauer src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [smuxi: 3/3] Merge branch 'stable'
- Date: Fri, 14 Mar 2014 00:46:23 +0000 (UTC)
commit 308167e7d036edb9c9d533916d5d98a3d9321477
Merge: 47d6d02 00c427c
Author: Mirco Bauer <meebey meebey net>
Date: Fri Mar 14 01:44:42 2014 +0100
Merge branch 'stable'
Conflicts:
src/Frontend-GNOME/Frontend.cs
src/Frontend-GNOME/Frontend-GNOME.csproj | 1 +
src/Frontend-GNOME/Frontend.cs | 5 ++++-
src/Frontend-GNOME/Makefile.am | 1 +
3 files changed, 6 insertions(+), 1 deletions(-)
---
diff --cc src/Frontend-GNOME/Frontend.cs
index d4575e7,5a6d8ca..c23a07f
--- a/src/Frontend-GNOME/Frontend.cs
+++ b/src/Frontend-GNOME/Frontend.cs
@@@ -797,8 -803,9 +799,9 @@@ namespace Smuxi.Frontend.Gnom
break;
}
}
- var linkChat = link.Fragment;
+ // decode #%23csharp to ##csharp
+ var linkChat = HttpUtility.UrlDecode(link.Fragment);
- if (String.IsNullOrEmpty(linkChat)) {
+ if (String.IsNullOrEmpty(linkChat) && link.AbsolutePath.Length > 0) {
linkChat = link.AbsolutePath.Substring(1);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]