Ubuntu Pastebin

Paste from hikiko at Mon, 3 Apr 2017 12:48:56 +0000

Download as text 
 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
39
40
41
42
43
44
=== modified file 'miral-shell/decoration_provider.cpp'
--- miral-shell/decoration_provider.cpp	2017-03-15 12:36:17 +0000
+++ miral-shell/decoration_provider.cpp	2017-04-03 12:47:30 +0000
@@ -116,7 +116,7 @@
     if (!working)
         return;
 
-    auto title = converter.from_bytes(title_);
+    auto title = converter.from_bytes(title_.c_str());
 
     int base_x = 2;
     int base_y = region.height-2;
@@ -187,7 +187,7 @@
     {
         int line_width = 0;
 
-        auto const line = converter.from_bytes(rawline);
+        std::string line(rawline);
 
         auto const fwidth = std::min(region.width / 60, 20);
 
@@ -213,7 +213,7 @@
     {
         int base_x = (region.width - help_width)/2;
 
-        auto const line = converter.from_bytes(rawline);
+        std::string line(rawline);
 
         for (auto const& ch : line)
         {

=== modified file 'miral/cursor_theme.cpp'
--- miral/cursor_theme.cpp	2016-09-28 10:57:41 +0000
+++ miral/cursor_theme.cpp	2017-04-03 12:41:56 +0000
@@ -49,7 +49,7 @@
 
             if (has_default_cursor(*xcursor_loader))
                 return xcursor_loader;
-
-            BOOST_THROW_EXCEPTION(std::runtime_error(("Failed to load cursor theme: " + theme).c_str()));
+            else
+                return std::shared_ptr<mi::CursorImages>{};
         });
 }
Download as text