Merge lp:~robert-ancell/overlay-scrollbar/only-x11 into lp:overlay-scrollbar

[Robert Ancell]

Only attempt to run under X11

Abort if not under X11 so GTK+ applications running under Mir don't crash.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:385
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~robert-ancell/overlay-scrollbar/only-x11/+merge/222466/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-utopic-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-utopic-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/overlay-scrollbar-ci/15/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:385
http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-utopic-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-utopic-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-utopic-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/overlay-scrollbar-ci/16/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

(I am testing if you can request that you can request yourself to review your own MP. It appears you can).

review: Approve

[Andrea Cimitan (cimi)]

Cool

review: Approve

[Andrea Cimitan (cimi)]

actually, how about gtk2? it doesn't run in mir?

[Robert Ancell (robert-ancell)]

GTK2 doesn't have GDK_IS_X11_DISPLAY so we can't detect if we're non-X11 quite so easily. We don't have any plans to port GTK2 so it doesn't matter at the moment.

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2013-12-12 10:17:22 +0000
+++ os/os-scrollbar.c	2014-06-09 03:56:06 +0000
@@ -4320,6 +4320,12 @@
   if (app_is_blacklisted ())
     return;
 
+  /* We only support X11 */
+#if GTK_MAJOR_VERSION == 3
+  if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
+    return;
+#endif
+
   /* Initialize static variables. */
   net_active_window_atom = gdk_x11_get_xatom_by_name ("_NET_ACTIVE_WINDOW");
   unity_net_workarea_region_atom = gdk_x11_get_xatom_by_name ("_UNITY_NET_WORKAREA_REGION");