abs/core/lirc/0010-lirc-setup-Fix-remote-config-file-display-problems.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38

From f3714b04a20069b70b9cbba7558bb3cb5d28caa9 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 14 Jan 2015 01:13:00 +0100
Subject: [PATCH 10/13] lirc-setup: Fix remote config file display problems.

---
 tools/lirc-setup/mvc_control.py | 2 +-
 tools/lirc-setup/mvc_view.py    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/lirc-setup/mvc_control.py b/tools/lirc-setup/mvc_control.py
index a922df5..8cf216b 100644
--- a/tools/lirc-setup/mvc_control.py
+++ b/tools/lirc-setup/mvc_control.py
@@ -244,7 +244,7 @@ class Controller(object):
                                                              errors='ignore')
         except urllib.error.URLError as ex:
             text = "Sorry: cannot download: " + uri + ' (' + str(ex) + ')'
-        self.view.show_text(text, 'lirc: download error')
+        self.view.show_text(text, 'lirc: Remote config file')
 
 
 def main():
diff --git a/tools/lirc-setup/mvc_view.py b/tools/lirc-setup/mvc_view.py
index a50ce73..19e8df7 100644
--- a/tools/lirc-setup/mvc_view.py
+++ b/tools/lirc-setup/mvc_view.py
@@ -156,6 +156,7 @@ class View(baseview.Baseview):
             else:
                 return True
 
+        text = text.replace("&", "&amp;")
         self.builder.get_object("show_text_label").set_markup(text)
         w = self.builder.get_object('view_text_window')
         w.set_title(title)
-- 
2.2.2