Merge lp:~charlesk/unity-gtk-module/lp-664647 into lp:unity-gtk-module/14.04

[Charles Kerr]

Add acroread to the blacklist.

[William Hua (attente)]

Looks good!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:306
http://jenkins.qa.ubuntu.com/job/unity-gtk-module-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-trusty-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-trusty-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-gtk-module-ci/17/rebuild

review: Approve (continuous-integration)

=== modified file 'src/main.c'
--- src/main.c	2013-03-14 17:09:54 +0000
+++ src/main.c	2013-10-31 17:36:57 +0000
@@ -90,6 +90,8 @@
                                                                       gint           *natural_height);
 #endif
 
+/* Crude blacklist to avoid patching innocent apps.
+   Use xprop | grep CLASS to find the name to use */
 static gboolean
 is_blacklisted (const gchar *name)
 {
@@ -100,6 +102,7 @@
          g_strcmp0 (name, "emacs24") == 0 ||
          g_strcmp0 (name, "emacs24-lucid") == 0 ||
          g_strcmp0 (name, "glade") == 0 ||
+         g_strcmp0 (name, "acroread") == 0 ||
          g_strcmp0 (name, "gwyddion") == 0;
 }