Merge lp:~aacid/overlay-scrollbar/blacklisted_libs into lp:overlay-scrollbar

[Albert Astals Cid]

Look at /proc/pid/maps for blacklisted libs

Look at /proc/pid/maps for blacklisted libs

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:357
http://jenkins.qa.ubuntu.com/job/ayatana-scrollbar-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ayatana-scrollbar-ci/./distribution=quantal,flavor=amd64/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ayatana-scrollbar-ci/./distribution=quantal,flavor=i386/4/console

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

FWIW I'm going on holiday tomorrow, will be back October 1st

[Albert Astals Cid (aacid)]

Rejecting the branch, https://code.launchpad.net/~aacid/ayatana-scrollbar/qt_no_overlay_scrollbar/+merge/124697 has been merged into the distro package fixing the crashes and this one is just another big hack and has had no comments for a week so i guess Andrea is not interested in it either

Unmerged revisions

357. By Albert Astals Cid on 2012-09-18

Look at /proc/pid/maps for blacklisted libs

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2012-08-29 16:09:23 +0000
+++ os/os-scrollbar.c	2012-09-18 09:51:39 +0000
@@ -3158,10 +3158,29 @@
     }
 }
 
+static gboolean searched_libs = FALSE;
+static gboolean searched_libs_blacklisted = FALSE;
+
 static gboolean
 use_overlay_scrollbar (void)
 {
-  return scrollbar_mode != SCROLLBAR_MODE_NORMAL;
+  if (!searched_libs)
+    {
+#ifndef GTK3
+      gchar proc_path[20];
+      pid_t pid = getpid ();
+      sprintf (proc_path, "/proc/%d/maps", pid);
+      gchar *contents;
+      if (g_file_get_contents (proc_path, &contents, NULL, NULL))
+        {
+          if (g_strrstr (contents, "/libQtGui.so"))
+            searched_libs_blacklisted = TRUE;
+        }
+      g_free(contents);
+#endif
+      searched_libs = TRUE;
+    }
+  return !searched_libs_blacklisted && scrollbar_mode != SCROLLBAR_MODE_NORMAL;
 }
 
 static void
@@ -4231,7 +4250,12 @@
                                    "}\n", -1, NULL);
 #endif
 
+  // don't want to trigger the libs search yet,
+  // we want to do it when someone creates a scrollbar,
+  // i.e. the next time use_overlay_scrollbar () is called
+  searched_libs = TRUE;
   /* Load custom overlay scrollbar style. */
   if (use_overlay_scrollbar ())
     custom_style_load ();
+  searched_libs = FALSE;
 }