[gnome-control-center/gnome-3-22] info: Trim AMD renderer strings

[Bastien Nocera <hadess src gnome org>]

commit 3f651ef8d265c8ff7af0c5495cd471f3b19f6d85
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Nov 16 16:40:08 2016 +0100

    info: Trim AMD renderer strings
    
    Remove the references to Gallium, and the exact versions of the DRM
    backend, the kernel and LLVM. Debug information can still be gathered in
    plenty of other ways.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=774240

 panels/info/info-cleanup-test.txt |    3 +++
 panels/info/info-cleanup.c        |   16 +++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/panels/info/info-cleanup-test.txt b/panels/info/info-cleanup-test.txt
index eb631a5..cb21d12 100644
--- a/panels/info/info-cleanup-test.txt
+++ b/panels/info/info-cleanup-test.txt
@@ -1,3 +1,6 @@
 Intel(R) Core(TM) i5-4590T CPU @ 2.00GHz       Intel<sup>®</sup> Core<sup>™</sup> i5-4590T CPU @ 2.00GHz
 Intel(R) Ivybridge Mobile      Intel<sup>®</sup> Ivybridge Mobile
 Intel(R)  Ivybridge Mobile     Intel<sup>®</sup> Ivybridge Mobile
+Gallium 0.4 on AMD KAVERI      AMD KAVERI
+AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3)        AMD KAVERI
+Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD KAVERI
diff --git a/panels/info/info-cleanup.c b/panels/info/info-cleanup.c
index 5bd49e8..b97772f 100644
--- a/panels/info/info-cleanup.c
+++ b/panels/info/info-cleanup.c
@@ -39,6 +39,8 @@ prettify_info (const char *info)
     { "Intel[(]R[)]", "Intel<sup>\302\256</sup>"},
     { "Core[(]TM[)]", "Core<sup>\342\204\242</sup>"},
     { "Atom[(]TM[)]", "Atom<sup>\342\204\242</sup>"},
+    { "Gallium .* on (AMD .*)", "\\1"},
+    { "(AMD .*) [(].*[)]", "\\1"},
     { "Graphics Controller", "Graphics"},
   };
 
@@ -64,13 +66,13 @@ prettify_info (const char *info)
           continue;
         }
 
-      new = g_regex_replace_literal (re,
-                                     pretty,
-                                     -1,
-                                     0,
-                                     rs[i].replacement,
-                                     0,
-                                     &error);
+      new = g_regex_replace (re,
+                             pretty,
+                             -1,
+                             0,
+                             rs[i].replacement,
+                             0,
+                             &error);
 
       g_regex_unref (re);