summarylogtreecommitdiffstats
path: root/git-54f7e8cb.patch
diff options
context:
space:
mode:
authorJan Cholasta2014-01-31 17:03:42 +0100
committerJan Cholasta2014-01-31 17:04:02 +0100
commita16514abeb9b93c74d698566240ce277cf6e7008 (patch)
tree8ea3c98695b49c09034d220dcec27ca19e12ec3b /git-54f7e8cb.patch
parent28e5c17f35f237d71c078dedc75384eef4716e42 (diff)
downloadaur-a16514abeb9b93c74d698566240ce277cf6e7008.tar.gz
Update wxgtk dependency in slade.
Diffstat (limited to 'git-54f7e8cb.patch')
-rw-r--r--git-54f7e8cb.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/git-54f7e8cb.patch b/git-54f7e8cb.patch
new file mode 100644
index 000000000000..8cbf12769661
--- /dev/null
+++ b/git-54f7e8cb.patch
@@ -0,0 +1,47 @@
+From 54f7e8cb0433e8cfe607f4f6b9db015156e1c101 Mon Sep 17 00:00:00 2001
+From: Gaerzi <gaerzi@gmail.com>
+Date: Fri, 17 Jan 2014 14:28:53 +0100
+Subject: [PATCH] Restored a few CHR() that were in fact needed.
+
+---
+ src/MainApp.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/MainApp.cpp b/src/MainApp.cpp
+index d1f7ffa..e2b893b 100644
+--- a/src/MainApp.cpp
++++ b/src/MainApp.cpp
+@@ -861,14 +861,14 @@ void MainApp::readConfigFile()
+ if (!token.Cmp("base_resource_paths"))
+ {
+ // Skip {
+- token = wxString::FromUTF8(tz.getToken());
++ token = wxString::FromUTF8(CHR(tz.getToken()));
+
+ // Read paths until closing brace found
+ token = tz.getToken();
+ while (token.Cmp("}"))
+ {
+ theArchiveManager->addBaseResourcePath(token);
+- token = wxString::FromUTF8(tz.getToken());
++ token = wxString::FromUTF8(CHR(tz.getToken()));
+ }
+ }
+
+@@ -879,11 +879,11 @@ void MainApp::readConfigFile()
+ token = tz.getToken();
+
+ // Read files until closing brace found
+- token = wxString::FromUTF8(tz.getToken());
++ token = wxString::FromUTF8(CHR(tz.getToken()));
+ while (token != "}")
+ {
+ theArchiveManager->addRecentFile(token);
+- token = wxString::FromUTF8(tz.getToken());
++ token = wxString::FromUTF8(CHR(tz.getToken()));
+ }
+ }
+
+--
+1.8.5.3
+