Merge lp:~laney/overlay-scrollbar/drop-gtk3 into lp:overlay-scrollbar

[Iain Lane]

Drop overlay-scrollbar-gtk3 - gtk 3.16 has a replacement

We are going to use gtk 3.16's overlay scrollbars. Drop overlay-scrollbar-gtk3.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:402
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/~laney/overlay-scrollbar/drop-gtk3/+merge/260932/+edit-commit-message

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

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

review: Needs Fixing (continuous-integration)

[Lars Karlitski (larsu)]

Coding style is changed in some areas and the wrong branch is removed on line 613 in the diff (all this switching between ifdef and ifndef is confusing).

I have commits for those in lp:~larsu/overlay-scrollbar/drop-gtk3

review: Needs Fixing

[lp:~laney/overlay-scrollbar/drop-gtk3]

403. By Iain Lane on 2015-06-03

merge lp:~larsu/overlay-scrollbar/drop-gtk3

[Iain Lane (laney)]

On Wed, Jun 03, 2015 at 01:12:38PM -0000, Lars Uebernickel wrote:
> Review: Needs Fixing
>
> Coding style is changed in some areas and the wrong branch is removed on line 613 in the diff (all this switching between ifdef and ifndef is confusing).
>
> I have commits for those in lp:~larsu/overlay-scrollbar/drop-gtk3

Thanks, merged, please re-review.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:403
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/~laney/overlay-scrollbar/drop-gtk3/+merge/260932/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-wily-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-wily-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-wily-i386-ci/2

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

review: Needs Fixing (continuous-integration)

[Lars Karlitski (larsu)]

Looks good to me now.

Thanks! This is awesome.

review: Approve

[lp:~laney/overlay-scrollbar/drop-gtk3]

404. By Iain Lane on 2015-06-04

C/R o-s-gtk3 so that it gets removed on upgrade

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:404
http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-wily-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-wily-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-wily-i386-ci/3

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

review: Approve (continuous-integration)

[lp:~laney/overlay-scrollbar/drop-gtk3]

405. By Iain Lane on 2015-06-04

Bump version so we can drop the weird +r...

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:405
http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-wily-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-wily-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-wily-i386-ci/4

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

review: Approve (continuous-integration)

=== removed symlink 'INSTALL'
=== target was u'/usr/share/automake-1.11/INSTALL'
=== modified file 'configure.ac'
--- configure.ac	2012-08-09 13:56:26 +0000
+++ configure.ac	2015-06-04 09:25:27 +0000
@@ -37,27 +37,14 @@
 GLIB_GSETTINGS
 
 AC_SUBST(glib_req, 2.26.0)
-AC_SUBST(gtk_req, 2.22.0)
-AC_SUBST(gtk3_req, 3.4.0)
+AC_SUBST(gtk_req, 2.24.26)
 AC_SUBST(cairo_req, 1.10)
 
-AC_ARG_WITH([gtk],
-            [AS_HELP_STRING([--with-gtk], [Which version of gtk to use @<:@default=3@:>@])],
-            [],
-            [with_gtk=3])
-AS_IF([test "x$with_gtk" = x3],
-      [PKG_CHECK_MODULES(DEPS, glib-2.0 >= $glib_req gtk+-3.0 >= $gtk3_req cairo >= $cairo_req)
-       AC_SUBST(DEPS_CFLAGS)
-       AC_SUBST(DEPS_LIBS)],
-      [test "x$with_gtk" = x2],
-      [PKG_CHECK_MODULES(DEPS, glib-2.0 >= $glib_req gtk+-2.0 >= $gtk_req cairo >= $cairo_req)
-       AC_SUBST(DEPS_CFLAGS)
-       AC_SUBST(DEPS_LIBS)],
-      [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
-)
-AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
+PKG_CHECK_MODULES(DEPS, [glib-2.0 >= $glib_req gtk+-2.0 >= $gtk_req cairo >= $cairo_req gmodule-2.0 >= $glib_req x11],
+                  [AC_SUBST(DEPS_CFLAGS)
+                  AC_SUBST(DEPS_LIBS)])
 
-GTK_MODULES_DIR="${libdir}/gtk-"$with_gtk".0/modules"
+GTK_MODULES_DIR="${libdir}/gtk-2.0/modules"
 AC_SUBST(GTK_MODULES_DIR)
 
 # Check if build tests
@@ -146,7 +133,6 @@
 echo "  overlay-scrollbar $PACKAGE_VERSION"
 echo "  ======================="
 echo ""
-echo "  Gtk+:   ${with_gtk}"
 echo "  Tests:  ${enable_tests}"
 echo "  Debug:  ${enable_debug}"
 echo "  Prefix: ${prefix}"

=== modified file 'data/81overlay-scrollbar'
--- data/81overlay-scrollbar	2012-05-15 16:42:07 +0000
+++ data/81overlay-scrollbar	2015-06-04 09:25:27 +0000
@@ -1,9 +1,9 @@
 # This file is sourced by Xsession(5), not executed.
 
-if [ -z "$GTK_MODULES" ] ; then
-	GTK_MODULES="overlay-scrollbar"
+if [ -z "$GTK2_MODULES" ] ; then
+	GTK2_MODULES="overlay-scrollbar"
 else
-	GTK_MODULES="$GTK_MODULES:overlay-scrollbar"
+	GTK2_MODULES="$GTK2_MODULES:overlay-scrollbar"
 fi
 
-export GTK_MODULES
+export GTK2_MODULES

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-19 09:00:11 +0000
+++ debian/changelog	2015-06-04 09:25:27 +0000
@@ -1,3 +1,12 @@
+overlay-scrollbar (0.2.17.1+15.10.20150604-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Drop overlay-scrollbar-gtk3 - this is no longer needed with GTK 3.16.
+    Force it to be removed, since loading it with GTK 3.16 causes visual
+    problems.
+  * Bump Standards-Verison to 3.9.6
+
+ -- Iain Lane <[e-mail]>  Wed, 03 Jun 2015 12:52:13 +0100
+
 overlay-scrollbar (0.2.16+r359+15.04.20150319-0ubuntu1) vivid; urgency=medium
 
   [ Lars Uebernickel ]

=== modified file 'debian/control'
--- debian/control	2013-05-01 19:11:34 +0000
+++ debian/control	2015-06-04 09:25:27 +0000
@@ -6,9 +6,8 @@
                dh-autoreconf,
                libcairo2-dev (>= 1.10),
                libglib2.0-dev (>= 2.26.0),
-               libgtk-3-dev,
-               libgtk2.0-dev,
-Standards-Version: 3.9.3
+               libgtk2.0-dev (>= 2.24.26),
+Standards-Version: 3.9.6
 Section: libs
 Homepage: http://launchpad.net/ayatana-scrollbar
 # If you aren't a member of ~ayatana-scrollbar-team but need to upload
@@ -17,26 +16,11 @@
 Vcs-Bzr: https://code.launchpad.net/~ayatana-scrollbar-team/overlay-scrollbar/trunk
 Vcs-Browser: https://bazaar.launchpad.net/~ayatana-scrollbar-team/overlay-scrollbar/trunk/files
 
-Package: overlay-scrollbar-gtk3
-Section: libs
-Architecture: any
-Multi-Arch: same
-Depends: overlay-scrollbar,
-         ${misc:Depends},
-         ${shlibs:Depends},
-Replaces: liboverlay-scrollbar3-0.2-0 (<< 0.2.16+r348),
-          liboverlay-scrollbar3-0.2-dev (<< 0.2.16+r348),
-Conflicts: liboverlay-scrollbar3-0.2-0 (<< 0.2.16+r348),
-           liboverlay-scrollbar3-0.2-dev (<< 0.2.16+r348),
-Description: GTK 3 module for overlay scrollbars
- Overlay scrollbar is a GtkModule enabling a dynamic overlay behavior.
-
 Package: overlay-scrollbar-gtk2
 Section: libs
 Architecture: any
 Multi-Arch: same
-Depends: overlay-scrollbar,
-         ${misc:Depends},
+Depends: ${misc:Depends},
          ${shlibs:Depends},
 Replaces: liboverlay-scrollbar-0.2-0 (<< 0.2.16+r348),
           liboverlay-scrollbar-0.2-dev (<< 0.2.16+r348),
@@ -49,7 +33,8 @@
 Section: libs
 Architecture: all
 Depends: overlay-scrollbar-gtk2,
-         overlay-scrollbar-gtk3,
          ${misc:Depends},
+Conflicts: overlay-scrollbar-gtk3
+Replaces: overlay-scrollbar-gtk3
 Description: Scrollbar overlay
  Overlay scrollbar is a GtkModule enabling a dynamic overlay behavior.

=== modified file 'debian/overlay-scrollbar-gtk2.install'
--- debian/overlay-scrollbar-gtk2.install	2012-09-24 14:25:40 +0000
+++ debian/overlay-scrollbar-gtk2.install	2015-06-04 09:25:27 +0000
@@ -1,1 +1,1 @@
-debian/tmp/gtk2/usr/lib/* /usr/lib/
+usr/lib

=== removed file 'debian/overlay-scrollbar-gtk3.install'
--- debian/overlay-scrollbar-gtk3.install	2012-09-24 14:25:40 +0000
+++ debian/overlay-scrollbar-gtk3.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/tmp/gtk3/usr/lib/*  /usr/lib/

=== modified file 'debian/overlay-scrollbar.install'
--- debian/overlay-scrollbar.install	2013-05-01 19:11:34 +0000
+++ debian/overlay-scrollbar.install	2015-06-04 09:25:27 +0000
@@ -1,2 +1,2 @@
-debian/tmp/gtk3/etc/X11 /etc/
-debian/tmp/gtk3/usr/share/glib-2.0 /usr/share/
+etc
+usr/share

=== modified file 'debian/rules'
--- debian/rules	2012-11-26 13:59:47 +0000
+++ debian/rules	2015-06-04 09:25:27 +0000
@@ -1,10 +1,8 @@
 #!/usr/bin/make -f
 
-FLAVORS = gtk2 gtk3
-
-CONFIGURE_FLAGS_gtk2 = --with-gtk=2
-CONFIGURE_FLAGS_gtk3 = --with-gtk=3
-CONFIGURE_COMMON_FLAGS = --disable-static --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) 
+CONFIGURE_COMMON_FLAGS = --disable-static \
+			 --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+			 --disable-silent-rules
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
@@ -14,26 +12,11 @@
 override_dh_autoreconf:
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
 
-override_dh_auto_configure: $(FLAVORS:%=doconfigure-%)
-
-doconfigure-%:
-	dh_auto_configure --builddirectory=build/$* -- \
-		$(CONFIGURE_FLAGS_$*) \
-		$(CONFIGURE_COMMON_FLAGS)
-
-override_dh_auto_build: $(FLAVORS:%=dobuild-%)
-
-dobuild-%:
-	dh_auto_build --builddirectory=build/$*
-
-override_dh_auto_install: $(FLAVORS:%=doinstall-%)
-
-doinstall-%:
-	dh_auto_install --sourcedir=build/$* --destdir=debian/tmp/$*
+override_dh_auto_configure:
+	dh_auto_configure -- $(CONFIGURE_COMMON_FLAGS)
 
 override_dh_install:
-	find debian/tmp -name \*.la -delete
-	rm -rf debian/tmp/gtk2/usr/share/glib-2.0/schemas
-	rm -f debian/tmp/gtk2/etc/X11/Xsession.d/81overlay-scrollbar
 	dh_install --fail-missing
+	find debian/overlay-scrollbar-gtk2 -name \*.la -delete
 
+override_dh_makeshlibs:

=== modified file 'os/Makefile.am'
--- os/Makefile.am	2012-04-26 14:44:19 +0000
+++ os/Makefile.am	2015-06-04 09:25:27 +0000
@@ -1,8 +1,4 @@
-if USE_GTK3
-VER=3
-else
 VER=
-endif
 
 source_h = \
 	$(srcdir)/os-private.h \
@@ -21,12 +17,8 @@
 
 liboverlay_scrollbar_la_SOURCES = $(source_h) $(source_c)
 
-if USE_GTK3
-liboverlay_scrollbar_la_CFLAGS = $(OS_CFLAGS) -DUSE_GTK3
-else
 liboverlay_scrollbar_la_CFLAGS = $(OS_CFLAGS)
-endif
 
-liboverlay_scrollbar_la_LIBADD = $(OS_LIBADD)
+liboverlay_scrollbar_la_LIBADD = $(OS_LIBADD) -lm
 
 liboverlay_scrollbar_la_LDFLAGS = $(OS_LDFLAGS)

=== modified file 'os/os-bar.c'
--- os/os-bar.c	2013-11-29 13:45:59 +0000
+++ os/os-bar.c	2015-06-04 09:25:27 +0000
@@ -62,13 +62,8 @@
 static void
 draw_bar (OsBar *bar)
 {
-#ifdef USE_GTK3
-  GdkRGBA c1, c2, color;
-  GtkStyleContext *style_context;
-#else
   GdkColor color;
   GtkStyle *style;
-#endif
   OsBarPrivate *priv;
   gfloat weight;
 
@@ -76,27 +71,6 @@
 
   weight = priv->weight;
 
-#ifdef USE_GTK3
-  style_context = gtk_widget_get_style_context (priv->parent);
-
-  if (priv->active == FALSE)
-    {
-      gtk_style_context_get_background_color (style_context, GTK_STATE_FLAG_INSENSITIVE, &c1);
-      gtk_style_context_get_background_color (style_context, GTK_STATE_FLAG_SELECTED, &c2);
-    }
-  else
-    {
-      gtk_style_context_get_background_color (style_context, GTK_STATE_FLAG_SELECTED, &c1);
-      gtk_style_context_get_background_color (style_context, GTK_STATE_FLAG_INSENSITIVE, &c2);
-    }
-
-  color.red   = weight * c1.red   + (1.0 - weight) * c2.red;
-  color.green = weight * c1.green + (1.0 - weight) * c2.green;
-  color.blue  = weight * c1.blue  + (1.0 - weight) * c2.blue;
-  color.alpha = 1.0;
-
-  gdk_window_set_background_rgba (priv->bar_window, &color);
-#else
   style = gtk_widget_get_style (priv->parent);
 
   color = style->bg[GTK_STATE_SELECTED];
@@ -104,7 +78,6 @@
   gdk_colormap_alloc_color (gdk_drawable_get_colormap (priv->bar_window), &color, FALSE, TRUE);
 
   gdk_window_set_background (priv->bar_window, &color);
-#endif
 
   gdk_window_invalidate_rect (gtk_widget_get_window (priv->parent), &priv->allocation, TRUE);
 }
@@ -113,26 +86,12 @@
 static void
 draw_tail (OsBar *bar)
 {
-#ifdef USE_GTK3
-  GdkRGBA color;
-  GtkStyleContext *style_context;
-#else
   GdkColor color;
   GtkStyle *style;
-#endif
   OsBarPrivate *priv;
 
   priv = bar->priv;
 
-#ifdef USE_GTK3
-  style_context = gtk_widget_get_style_context (priv->parent);
-
-  gtk_style_context_get_background_color (style_context, GTK_STATE_FLAG_ACTIVE, &color);
-
-  color.alpha = 1.0;
-
-  gdk_window_set_background_rgba (priv->tail_window, &color);
-#else
   style = gtk_widget_get_style (priv->parent);
 
   color = style->bg[GTK_STATE_ACTIVE];
@@ -140,7 +99,6 @@
   gdk_colormap_alloc_color (gdk_drawable_get_colormap (priv->tail_window), &color, FALSE, TRUE);
 
   gdk_window_set_background (priv->tail_window, &color);
-#endif
 
   gdk_window_invalidate_rect (gtk_widget_get_window (priv->parent), &priv->allocation, TRUE);
 }
@@ -222,19 +180,9 @@
                                     gint                 offset_x,
                                     gint                 offset_y)
 {
-#ifdef USE_GTK3
-
-  cairo_region_t * shape_region = cairo_region_create_rectangle (shape_rect);
-  gdk_window_shape_combine_region (window, shape_region, offset_x, offset_y);
-  cairo_region_destroy (shape_region);
-
-#else
-
   GdkRegion * shape_region = gdk_region_rectangle (shape_rect);
   gdk_window_shape_combine_region (window, shape_region, offset_x, offset_y);
   gdk_region_destroy (shape_region);
-
-#endif
 }
 
 /* Callback called by the retract-tail animation. */
@@ -545,60 +493,6 @@
 }
 
 /**
- * os_bar_set_active:
- * @bar: a #OsBar
- * @active: whether is active or not
- * @animate: whether animate it or not
- *
- * Changes the activity state of @bar.
- **/
-void
-os_bar_set_active (OsBar   *bar,
-                   gboolean active,
-                   gboolean animate)
-{
-#ifdef USE_GTK3
-  OsBarPrivate *priv;
-
-  g_return_if_fail (OS_IS_BAR (bar));
-
-  priv = bar->priv;
-
-  /* Set the state and draw even if there's a state_animation running, that is
-   * (!animate && os_animation_is_running (priv->state_animation)). */
-  if ((priv->active != active) ||
-      (!animate && os_animation_is_running (priv->state_animation)))
-    {
-      gboolean visible;
-
-      priv->active = active;
-
-      if (priv->parent == NULL)
-        return;
-
-      visible = gdk_window_is_visible (priv->bar_window);
-
-      if (visible)
-        os_animation_stop (priv->state_animation, NULL);
-
-      if (visible && animate)
-        {
-          os_animation_set_duration (priv->state_animation, priv->active ? DURATION_FADE_IN :
-                                                                           DURATION_FADE_OUT);
-          os_animation_start (priv->state_animation);
-        }
-
-      if (!visible || !animate)
-        {
-          priv->weight = 1.0f;
-
-          draw_bar (bar);
-        }
-    }
-#endif
-}
-
-/**
  * os_bar_set_detached:
  * @bar: a #OsBar
  * @detached: whether the bar is detached or not
@@ -702,23 +596,12 @@
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.visual = gtk_widget_get_visual (priv->parent);
-#ifndef USE_GTK3
   attributes.colormap = gtk_widget_get_colormap (priv->parent);
-#endif
 
   /* tail_window. */
   priv->tail_window = gdk_window_new (gtk_widget_get_window (priv->parent),
                                             &attributes,
-#ifdef USE_GTK3
-                                            GDK_WA_VISUAL);
-#else
                                             GDK_WA_VISUAL | GDK_WA_COLORMAP);
-#endif
-
-#ifdef USE_GTK3
-  gdk_window_ensure_native (priv->tail_window);
-  gtk_widget_register_window (priv->parent, priv->tail_window);
-#endif
 
   g_object_ref_sink (priv->tail_window);
 
@@ -727,26 +610,13 @@
 
   /* FIXME(Cimi) maybe this is not required with 0 as event mask. */
   gdk_window_input_shape_combine_region (priv->tail_window,
-#ifdef USE_GTK3
-                                         cairo_region_create (),
-#else
                                          gdk_region_new (),
-#endif
                                          0, 0);
 
   /* bar_window. */
   priv->bar_window = gdk_window_new (gtk_widget_get_window (priv->parent),
                                      &attributes,
-#ifdef USE_GTK3
-                                     GDK_WA_VISUAL);
-#else
                                      GDK_WA_VISUAL | GDK_WA_COLORMAP);
-#endif 
-
-#ifdef USE_GTK3
-  gdk_window_ensure_native (priv->bar_window);
-  gtk_widget_register_window (priv->parent, priv->bar_window);
-#endif
 
   g_object_ref_sink (priv->bar_window);
 
@@ -755,11 +625,7 @@
 
   /* FIXME(Cimi) maybe this is not required with 0 as event mask. */
   gdk_window_input_shape_combine_region (priv->bar_window,
-#ifdef USE_GTK3
-                                         cairo_region_create (),
-#else
                                          gdk_region_new (),
-#endif
                                          0, 0);
 
   mask_tail (bar);

=== modified file 'os/os-private.h'
--- os/os-private.h	2012-11-26 14:35:24 +0000
+++ os/os-private.h	2015-06-04 09:25:27 +0000
@@ -196,10 +196,6 @@
 void   os_bar_move_resize   (OsBar       *bar,
                              GdkRectangle mask);
 
-void   os_bar_set_active    (OsBar   *bar,
-                             gboolean active,
-                             gboolean animate);
-
 void   os_bar_set_detached  (OsBar   *bar,
                              gboolean detached,
                              gboolean animate);

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2015-03-03 08:57:49 +0000
+++ os/os-scrollbar.c	2015-06-04 09:25:27 +0000
@@ -126,9 +126,6 @@
   gboolean allow_resize;
   gboolean allow_resize_paned;
   gboolean resizing_paned;
-#ifdef USE_GTK3
-  gboolean deactivable_bar;
-#endif
   gboolean hidable_thumb;
   gboolean window_button_press; /* FIXME(Cimi) to replace with X11 input events. */
   gdouble value;
@@ -142,11 +139,6 @@
   guint32 source_unlock_thumb_id;
 } OsScrollbarPrivate;
 
-#ifdef USE_GTK3
-static GdkInputSource os_input_source = GDK_SOURCE_MOUSE;
-static gint os_device_id = 0;
-static GtkCssProvider *provider = NULL;
-#endif
 static Atom net_active_window_atom = None;
 static Atom unity_net_workarea_region_atom = None;
 static GSList *os_root_list = NULL;
@@ -176,16 +168,9 @@
 static void thumb_unmap_cb (GtkWidget *widget, gpointer user_data);
 
 /* GtkScrollbar vfunc pointers. */
-#ifdef USE_GTK3
-static gboolean (* pre_hijacked_scrollbar_draw) (GtkWidget *widget, cairo_t *cr);
-static void (* pre_hijacked_scrollbar_get_preferred_width) (GtkWidget *widget, gint *minimal_width, gint *natural_width);
-static void (* pre_hijacked_scrollbar_get_preferred_height) (GtkWidget *widget, gint *minimal_height, gint *natural_height);
-static void (* pre_hijacked_scrollbar_state_flags_changed) (GtkWidget *widget, GtkStateFlags flags);
-#else
 static gboolean (* pre_hijacked_scrollbar_expose_event) (GtkWidget *widget, GdkEventExpose *event);
 static void (* pre_hijacked_scrollbar_size_request) (GtkWidget *widget, GtkRequisition *requisition);
 static void (* pre_hijacked_scrollbar_state_changed) (GtkWidget *widget, GtkStateType state);
-#endif
 static void (* pre_hijacked_scrollbar_grab_notify) (GtkWidget *widget, gboolean was_grabbed);
 static void (* pre_hijacked_scrollbar_hide) (GtkWidget *widget);
 static void (* pre_hijacked_scrollbar_map) (GtkWidget *widget);
@@ -197,16 +182,9 @@
 static void (* pre_hijacked_scrollbar_dispose) (GObject *object);
 
 /* Hijacked GtkScrollbar vfunc pointers. */
-#ifdef USE_GTK3
-static gboolean hijacked_scrollbar_draw (GtkWidget *widget, cairo_t *cr);
-static void hijacked_scrollbar_get_preferred_width (GtkWidget *widget, gint *minimal_width, gint *natural_width);
-static void hijacked_scrollbar_get_preferred_height (GtkWidget *widget, gint *minimal_height, gint *natural_height);
-static void hijacked_scrollbar_state_flags_changed (GtkWidget *widget, GtkStateFlags flags);
-#else
 static gboolean hijacked_scrollbar_expose_event (GtkWidget *widget, GdkEventExpose *event);
 static void hijacked_scrollbar_size_request (GtkWidget *widget, GtkRequisition *requisition);
 static void hijacked_scrollbar_state_changed (GtkWidget *widget, GtkStateType state);
-#endif
 static void hijacked_scrollbar_grab_notify (GtkWidget *widget, gboolean was_grabbed);
 static void hijacked_scrollbar_hide (GtkWidget *widget);
 static void hijacked_scrollbar_map (GtkWidget *widget);
@@ -576,38 +554,6 @@
   return value;
 }
 
-#ifdef USE_GTK3
-/* Deactivate the bar if it's the case. */
-static void
-deactivate_bar (GtkScrollbar *scrollbar)
-{
-  OsScrollbarPrivate *priv;
-
-  priv = get_private (GTK_WIDGET (scrollbar));
-
-  if (priv->bar != NULL && priv->deactivable_bar)
-    os_bar_set_active (priv->bar, FALSE, TRUE);
-}
-
-/* Timeout before deactivating the bar. */
-static gboolean
-deactivate_bar_cb (gpointer user_data)
-{
-  GtkScrollbar *scrollbar;
-  OsScrollbarPrivate *priv;
-
-  scrollbar = GTK_SCROLLBAR (user_data);
-  priv = get_private (GTK_WIDGET (scrollbar));
-
-  OS_DCHECK (!priv->active_window);
-
-  deactivate_bar (scrollbar);
-  priv->source_deactivate_bar_id = 0;
-
-  return FALSE;
-}
-#endif
-
 /* destroy the private struct */
 static void
 destroy_private (gpointer priv)
@@ -669,9 +615,6 @@
 
       /* Initialize struct variables. */
       qdata->side = OS_SIDE_RIGHT;
-#ifdef USE_GTK3
-      qdata->deactivable_bar = TRUE;
-#endif
       qdata->hidable_thumb = TRUE;
       qdata->fine_scroll_multiplier = 1.0;
       qdata->bar = os_bar_new ();
@@ -733,11 +676,7 @@
 static gboolean
 is_insensitive (GtkScrollbar *scrollbar)
 {
-#ifdef USE_GTK3
-  return (gtk_widget_get_state_flags (GTK_WIDGET (scrollbar)) & GTK_STATE_FLAG_INSENSITIVE) != 0;
-#else
   return gtk_widget_get_state (GTK_WIDGET (scrollbar)) == GTK_STATE_INSENSITIVE;
-#endif
 }
 
 /* Move the bar. */
@@ -829,9 +768,7 @@
             gint          x,
             gint          y)
 {
-#ifndef USE_GTK3
   GdkRectangle gdk_rect;
-#endif
   GdkScreen *screen;
   OsScrollbarPrivate *priv;
   cairo_rectangle_int_t rect;
@@ -845,16 +782,12 @@
 
   screen = gtk_widget_get_screen (GTK_WIDGET (scrollbar));
   n_monitor = gdk_screen_get_monitor_at_point (screen, monitor_x, y);
-#ifdef USE_GTK3
-  gdk_screen_get_monitor_geometry (screen, n_monitor, &rect);
-#else
   gdk_screen_get_monitor_geometry (screen, n_monitor, &gdk_rect);
 
   rect.x = gdk_rect.x;
   rect.y = gdk_rect.y;
   rect.width = gdk_rect.width;
   rect.height = gdk_rect.height;
-#endif
 
   screen_x = rect.x;
   screen_width = rect.x + rect.width;
@@ -972,9 +905,7 @@
             gint          x,
             gint          y)
 {
-#ifndef USE_GTK3
   GdkRectangle gdk_rect;
-#endif
   GdkScreen *screen;
   OsScrollbarPrivate *priv;
   cairo_rectangle_int_t rect;
@@ -988,16 +919,12 @@
 
   screen = gtk_widget_get_screen (GTK_WIDGET (scrollbar));
   n_monitor = gdk_screen_get_monitor_at_point (screen, x, monitor_y);
-#ifdef USE_GTK3
-  gdk_screen_get_monitor_geometry (screen, n_monitor, &rect);
-#else
   gdk_screen_get_monitor_geometry (screen, n_monitor, &gdk_rect);
 
   rect.x = gdk_rect.x;
   rect.y = gdk_rect.y;
   rect.width = gdk_rect.width;
   rect.height = gdk_rect.height;
-#endif
 
   screen_y = rect.y;
   screen_height = rect.y + rect.height;
@@ -1286,17 +1213,7 @@
                    gint      *x,
                    gint      *y)
 {
-#ifdef USE_GTK3
-  GdkDeviceManager *device_manager;
-  GdkDevice *device;
-
-  device_manager = gdk_display_get_device_manager (gdk_window_get_display (window));
-  device = gdk_device_manager_get_client_pointer (device_manager);
-
-  return gdk_device_get_window_at_position (device, x, y);
-#else
   return gdk_window_at_pointer (x, y);
-#endif
 }
 
 /* Get the position of the pointer. */
@@ -1306,17 +1223,7 @@
                     gint            *y,
                     GdkModifierType *mask)
 {
-#ifdef USE_GTK3
-  GdkDeviceManager *device_manager;
-  GdkDevice *device;
-
-  device_manager = gdk_display_get_device_manager (gdk_window_get_display (window));
-  device = gdk_device_manager_get_client_pointer (device_manager);
-
-  return gdk_window_get_device_position (window, device, x, y, mask);
-#else
   return gdk_window_get_pointer (window, x, y, mask);
-#endif
 }
 
 /* Adjustment functions. */
@@ -1506,38 +1413,6 @@
   move_bar (scrollbar);
 }
 
-#ifdef USE_GTK3
-/* Bar functions. */
-
-/* Set the state of the bar checking mouse position. */
-static void
-bar_set_state_from_pointer (GtkScrollbar *scrollbar,
-                            gint          x,
-                            gint          y)
-{
-  GtkAllocation allocation;
-  OsScrollbarPrivate *priv;
-
-  priv = get_private (GTK_WIDGET (scrollbar));
-
-  OS_DCHECK (!priv->active_window);
-
-  gtk_widget_get_allocation (gtk_widget_get_parent (GTK_WIDGET (scrollbar)), &allocation);
-
-  if ((x > allocation.x && x < allocation.x + allocation.width) &&
-      (y > allocation.y && y < allocation.y + allocation.height))
-    {
-      priv->deactivable_bar = FALSE;
-      os_bar_set_active (priv->bar, TRUE, TRUE);
-    }
-  else
-    {
-      priv->deactivable_bar = TRUE;
-      os_bar_set_active (priv->bar, FALSE, TRUE);
-    }
-}
-#endif
-
 /* Root window functions. */
 
 /* Filter function applied to the root window. */
@@ -1600,12 +1475,7 @@
               &xev);
 
   gdk_flush ();
-
-#ifdef USE_GTK3
-  gdk_error_trap_pop_ignored ();
-#else
   gdk_error_trap_pop ();
-#endif
 }
 
 /* Present a Gdk window. */
@@ -1858,9 +1728,6 @@
 
   priv->event |= OS_EVENT_ENTER_NOTIFY;
 
-#ifdef USE_GTK3
-  priv->deactivable_bar = FALSE;
-#endif
   priv->hidable_thumb = FALSE;
 
   if (priv->state & OS_STATE_INTERNAL)
@@ -1876,15 +1743,6 @@
 
   scrollbar = GTK_SCROLLBAR (user_data);
 
-#ifdef USE_GTK3
-  /* Gtk+ 3.3.18 emits more GdkEventCrossing
-   * with touch devices, skip few events. */
-  if (event->mode == GDK_CROSSING_TOUCH_BEGIN ||
-      event->mode == GDK_CROSSING_TOUCH_END ||
-      event->mode == GDK_CROSSING_DEVICE_SWITCH)
-    return FALSE;
-#endif
-
   enter_event (scrollbar);
 
   return FALSE;
@@ -1901,22 +1759,6 @@
   scrollbar = GTK_SCROLLBAR (user_data);
   priv = get_private (GTK_WIDGET (scrollbar));
 
-#ifdef USE_GTK3
-  /* Gtk+ 3.3.18 emits more GdkEventCrossing
-   * with touch devices, skip few events.
-   * Last line skips the event if the pointer is still in the window:
-   * this happens with touch devices because Gtk+ emits 
-   * GDK_CROSSING_UNGRAB to the touch device, thus calling leave-notify,
-   * and we want to skip those events.
-   * 
-   * FIXME the logic of this event should be rewritten. */
-  if (event->mode == GDK_CROSSING_TOUCH_BEGIN ||
-      event->mode == GDK_CROSSING_TOUCH_END ||
-      event->mode == GDK_CROSSING_DEVICE_SWITCH ||
-      window_at_pointer (event->window, NULL, NULL) == event->window)
-    return FALSE;
-#endif
-
   /* When exiting the thumb horizontally (or vertically),
    * in LOCKED state, remove the lock. */
   if ((priv->state & OS_STATE_LOCKED) &&
@@ -1930,21 +1772,6 @@
    * not interacting with the thumb. */
   if (!(priv->event & OS_EVENT_BUTTON_PRESS))
     {
-#ifdef USE_GTK3
-      /* Never deactivate the bar in an active window. */
-      if (!priv->active_window)
-        {
-          priv->deactivable_bar = TRUE;
-
-          if (priv->source_deactivate_bar_id != 0)
-            g_source_remove (priv->source_deactivate_bar_id);
-
-          priv->source_deactivate_bar_id = g_timeout_add (TIMEOUT_THUMB_HIDE,
-                                                          deactivate_bar_cb,
-                                                          scrollbar);
-        }
-#endif
-
       priv->event &= ~(OS_EVENT_ENTER_NOTIFY);
 
       priv->hidable_thumb = TRUE;
@@ -1973,16 +1800,6 @@
 
   scrollbar = GTK_SCROLLBAR (user_data);
 
-#ifdef USE_GTK3
-  OsScrollbarPrivate *priv;
-
-  /* Immediately set the bar to be active. */
-  priv = get_private (GTK_WIDGET (scrollbar));
-
-  priv->deactivable_bar = FALSE;
-  os_bar_set_active (priv->bar, TRUE, FALSE);
-#endif
-
   xid = GDK_WINDOW_XID (gtk_widget_get_window (widget));
   xid_parent = GDK_WINDOW_XID (gtk_widget_get_window (gtk_widget_get_toplevel (GTK_WIDGET (scrollbar))));
   display = GDK_WINDOW_XDISPLAY (gtk_widget_get_window (GTK_WIDGET (scrollbar)));
@@ -2031,12 +1848,7 @@
                   &xev);
 
       gdk_flush ();
-
-#ifdef USE_GTK3
-      gdk_error_trap_pop_ignored ();
-#else
       gdk_error_trap_pop ();
-#endif
     }
 }
 
@@ -2117,17 +1929,6 @@
   scrollbar = GTK_SCROLLBAR (user_data);
   priv = get_private (GTK_WIDGET (scrollbar));
 
-#ifdef USE_GTK3
-  /* On touch devices with XI2 and Gtk+ >= 3.3.18,
-   * the event enter-notify is not emitted.
-   * Deal with it in motion-notify. */
-  
-  /* Should be fixed with:
-   * https://bugs.launchpad.net/ubuntu/+source/gtk+3.0/+bug/949414 */
-  // if (!(priv->event & OS_EVENT_ENTER_NOTIFY))
-  //   enter_event (scrollbar);
-#endif
-
   if (priv->event & OS_EVENT_BUTTON_PRESS)
     {
       gint x, y;
@@ -2513,14 +2314,6 @@
   OsScrollbarPrivate *priv;
   gdouble delta;
 
-#ifdef USE_GTK3
-  /* Gtk+ 3.3.18 adds a smooth scroll support,
-   * but at the moment is not ready to be used without various issues.
-   * Don't use it for thumb scrolling in overlay scrollbar. */
-  if (event->direction == GDK_SCROLL_SMOOTH)
-    return FALSE;
-#endif
-
   scrollbar = GTK_SCROLLBAR (user_data);
   priv = get_private (GTK_WIDGET (scrollbar));
 
@@ -2597,52 +2390,6 @@
   const gint64 current_time = g_get_monotonic_time ();
   const gint64 end_time = priv->present_time + TIMEOUT_PRESENT_WINDOW * 1000;
 
-#ifdef USE_GTK3
-  /* If the widget is mapped, is not insentitive
-   * and the configure-event happens after
-   * the PropertyNotify _NET_ACTIVE_WINDOW event,
-   * see if the mouse pointer is over this window, if TRUE,
-   * proceed with bar_set_state_from_pointer (). */
-  if (!is_insensitive (scrollbar) &&
-      (current_time > end_time) &&
-      gtk_widget_get_mapped (GTK_WIDGET (scrollbar)))
-    {
-      if (!priv->active_window)
-        {
-          GdkWindow *parent;
-
-          /* Loop through parent windows until it reaches
-           * either an unknown GdkWindow (NULL),
-           * or the toplevel window. */
-          parent = window_at_pointer (gtk_widget_get_window (GTK_WIDGET (scrollbar)), NULL, NULL);
-          while (parent != NULL)
-            {
-              if (event->window == parent)
-                break;
-
-              parent = gdk_window_get_parent (parent);
-            }
-
-          if (parent != NULL)
-            {
-              gint x, y;
-
-              window_get_pointer (gtk_widget_get_window (GTK_WIDGET (scrollbar)), &x, &y, NULL);
-
-              /* When the window is resized (maximize/restore),
-               * check the position of the pointer
-               * and set the state accordingly. */
-              bar_set_state_from_pointer (scrollbar, x, y);
-            }
-        }
-      else
-        {
-          priv->deactivable_bar = FALSE;
-          os_bar_set_active (priv->bar, TRUE, TRUE);
-        }
-    }
-#endif
-
   if (current_time > end_time)
     gtk_widget_hide (priv->thumb);
 
@@ -2877,55 +2624,7 @@
 is_touch_mode (GtkWidget *widget,
                gint       device_id)
 {
-#ifdef USE_GTK3
-  switch (scrollbar_mode)
-  {
-    case SCROLLBAR_MODE_OVERLAY_AUTO:
-    default:
-      /* Continue detecting source type. */
-      break;
-    case SCROLLBAR_MODE_OVERLAY_POINTER:
-      /* Touch mode always disabled. */
-      return FALSE;
-      break;
-    case SCROLLBAR_MODE_OVERLAY_TOUCH:
-      /* Touch mode always enabled. */
-      return TRUE;
-      break;
-  }
-
-  /* Use some sort of cache for the device.
-   * Update the input source only if the device_id
-   * is different from the previous one. */
-  if (os_device_id != device_id)
-    {
-      GdkDeviceManager *device_manager;
-      GdkDevice *device;
-      GdkWindow *window;
-
-      /* Update the static os_device_id variable. */
-      os_device_id = device_id;
-
-      window = gtk_widget_get_window (widget);
-      device_manager = gdk_display_get_device_manager (gdk_window_get_display (window));
-      device = gdk_x11_device_manager_lookup (device_manager, os_device_id);
-
-      /* Return FALSE if we don't recognize the device. */
-      if (!device)
-        return FALSE;
-
-      /* Update the static os_input_source variable. */
-      os_input_source = gdk_device_get_source (device);
-    }
-
-  /* Detect touch mode accordingly to the input source type. */
-  if (os_input_source == GDK_SOURCE_TOUCHSCREEN)
-    return TRUE;
-  else
-    return FALSE;
-#else
   return scrollbar_mode == SCROLLBAR_MODE_OVERLAY_TOUCH;
-#endif
 }
 
 /* Callback that shows the thumb if it's the case. */
@@ -3028,192 +2727,134 @@
 
       sourceid = 0;
 
-#ifdef USE_GTK3
-      if (xev->type == GenericEvent)
-        {
-          /* Deal with XInput 2 events. */
-          XIDeviceEvent *xiev;
-
-          xiev = xev->xcookie.data;
-
-          sourceid = xiev->sourceid;
-
-          if (xiev->evtype == XI_ButtonPress)
-            os_xevent = OS_XEVENT_BUTTON_PRESS;
-
-          if (xiev->evtype == XI_ButtonRelease)
-            {
-              os_xevent = OS_XEVENT_BUTTON_RELEASE;
-              event_x = xiev->event_x;
-              event_y = xiev->event_y;
-            }
-
-          if (xiev->evtype == XI_Leave)
-            os_xevent = OS_XEVENT_LEAVE;
-
-          if (xiev->evtype == XI_Motion)
-            {
-              os_xevent = OS_XEVENT_MOTION;
-              event_x = xiev->event_x;
-              event_y = xiev->event_y;
-            }
-        }
-      else
-        {
-#endif
-          /* Deal with X core events, when apps (like rhythmbox),
-           * are using gdk_disable_miltidevice (). */
-          if (xev->type == ButtonPress)
-            os_xevent = OS_XEVENT_BUTTON_PRESS;
-
-          if (xev->type == ButtonRelease)
-            {
-              os_xevent = OS_XEVENT_BUTTON_RELEASE;
-              event_x = xev->xbutton.x;
-              event_y = xev->xbutton.y;
-            }
-
-          if (xev->type == LeaveNotify)
-            os_xevent = OS_XEVENT_LEAVE;
-
-          if (xev->type == MotionNotify)
-            {
-              os_xevent = OS_XEVENT_MOTION;
-              event_x = xev->xmotion.x;
-              event_y = xev->xmotion.y;
-            }
-#ifdef USE_GTK3
-        }
-#endif
-
-        if (os_xevent == OS_XEVENT_BUTTON_PRESS)
-          {
-            priv->window_button_press = TRUE;
-
-            if (priv->source_show_thumb_id != 0)
-              {
-                g_source_remove (priv->source_show_thumb_id);
-                priv->source_show_thumb_id = 0;
-              }
-
-            gtk_widget_hide (priv->thumb);
-          }
-
-        if (priv->window_button_press && os_xevent == OS_XEVENT_BUTTON_RELEASE)
-          {
-            priv->window_button_press = FALSE;
-
-            /* Proximity area. */
-            if (check_proximity (scrollbar, event_x, event_y))
-              {
-                priv->hidable_thumb = FALSE;
-
-                adjust_thumb_position (scrollbar, event_x, event_y);
-
-                if (priv->state & OS_STATE_LOCKED)
-                  return GDK_FILTER_CONTINUE;
-
-                if (!is_touch_mode (GTK_WIDGET (scrollbar), sourceid) && !priv->resizing_paned)
-                  show_thumb (scrollbar);
-              }
-          }
-
-        if (os_xevent == OS_XEVENT_LEAVE)
-          {
-            priv->window_button_press = FALSE;
-
-#ifdef USE_GTK3
-            /* Never deactivate the bar in an active window. */
-            if (!priv->active_window)
-              {
-                priv->deactivable_bar = TRUE;
-
-                if (priv->source_deactivate_bar_id != 0)
-                  g_source_remove (priv->source_deactivate_bar_id);
-
-                priv->source_deactivate_bar_id = g_timeout_add (TIMEOUT_TOPLEVEL_HIDE,
-                                                                deactivate_bar_cb,
+      /* Deal with X core events, when apps (like rhythmbox),
+       * are using gdk_disable_miltidevice (). */
+      if (xev->type == ButtonPress)
+        os_xevent = OS_XEVENT_BUTTON_PRESS;
+
+      if (xev->type == ButtonRelease)
+        {
+          os_xevent = OS_XEVENT_BUTTON_RELEASE;
+          event_x = xev->xbutton.x;
+          event_y = xev->xbutton.y;
+        }
+
+      if (xev->type == LeaveNotify)
+        os_xevent = OS_XEVENT_LEAVE;
+
+      if (xev->type == MotionNotify)
+        {
+          os_xevent = OS_XEVENT_MOTION;
+          event_x = xev->xmotion.x;
+          event_y = xev->xmotion.y;
+        }
+
+      if (os_xevent == OS_XEVENT_BUTTON_PRESS)
+        {
+          priv->window_button_press = TRUE;
+
+          if (priv->source_show_thumb_id != 0)
+            {
+              g_source_remove (priv->source_show_thumb_id);
+              priv->source_show_thumb_id = 0;
+            }
+
+          gtk_widget_hide (priv->thumb);
+        }
+
+      if (priv->window_button_press && os_xevent == OS_XEVENT_BUTTON_RELEASE)
+        {
+          priv->window_button_press = FALSE;
+
+          /* Proximity area. */
+          if (check_proximity (scrollbar, event_x, event_y))
+            {
+              priv->hidable_thumb = FALSE;
+
+              adjust_thumb_position (scrollbar, event_x, event_y);
+
+              if (priv->state & OS_STATE_LOCKED)
+                return GDK_FILTER_CONTINUE;
+
+              if (!is_touch_mode (GTK_WIDGET (scrollbar), sourceid) && !priv->resizing_paned)
+                show_thumb (scrollbar);
+            }
+        }
+
+      if (os_xevent == OS_XEVENT_LEAVE)
+        {
+          priv->window_button_press = FALSE;
+
+          if (gtk_widget_get_mapped (priv->thumb) &&
+              !(priv->event & OS_EVENT_BUTTON_PRESS))
+            {
+              priv->hidable_thumb = TRUE;
+
+              if (priv->source_hide_thumb_id != 0)
+                g_source_remove (priv->source_hide_thumb_id);
+
+              priv->source_hide_thumb_id = g_timeout_add (TIMEOUT_TOPLEVEL_HIDE,
+                                                          hide_thumb_cb,
+                                                          scrollbar);
+            }
+
+          if (priv->source_show_thumb_id != 0)
+            {
+              g_source_remove (priv->source_show_thumb_id);
+              priv->source_show_thumb_id = 0;
+            }
+
+          if (priv->source_unlock_thumb_id != 0)
+            g_source_remove (priv->source_unlock_thumb_id);
+
+          priv->source_unlock_thumb_id = g_timeout_add (TIMEOUT_TOPLEVEL_HIDE,
+                                                        unlock_thumb_cb,
+                                                        scrollbar);
+        }
+
+      /* Get the motion_notify_event trough XEvent. */
+      if (!priv->window_button_press && os_xevent == OS_XEVENT_MOTION)
+        {
+          /* Proximity area. */
+          if (check_proximity (scrollbar, event_x, event_y))
+            {
+              priv->hidable_thumb = FALSE;
+
+              if (priv->source_hide_thumb_id != 0)
+                {
+                  g_source_remove (priv->source_hide_thumb_id);
+                  priv->source_hide_thumb_id = 0;
+                }
+
+              adjust_thumb_position (scrollbar, event_x, event_y);
+
+              if (priv->state & OS_STATE_LOCKED)
+                return GDK_FILTER_CONTINUE;
+
+              if (!is_touch_mode (GTK_WIDGET (scrollbar), sourceid) && !priv->resizing_paned)
+                show_thumb (scrollbar);
+            }
+          else
+            {
+              priv->state &= ~(OS_STATE_LOCKED);
+
+              if (priv->source_show_thumb_id != 0)
+                {
+                  g_source_remove (priv->source_show_thumb_id);
+                  priv->source_show_thumb_id = 0;
+                }
+
+              if (gtk_widget_get_mapped (priv->thumb) &&
+                  !(priv->event & OS_EVENT_BUTTON_PRESS))
+                {
+                  priv->hidable_thumb = TRUE;
+
+                  if (priv->source_hide_thumb_id == 0)
+                    priv->source_hide_thumb_id = g_timeout_add (TIMEOUT_PROXIMITY_HIDE,
+                                                                hide_thumb_cb,
                                                                 scrollbar);
-              }
-#endif
-
-            if (gtk_widget_get_mapped (priv->thumb) &&
-                !(priv->event & OS_EVENT_BUTTON_PRESS))
-              {
-                priv->hidable_thumb = TRUE;
-
-                if (priv->source_hide_thumb_id != 0)
-                  g_source_remove (priv->source_hide_thumb_id);
-
-                priv->source_hide_thumb_id = g_timeout_add (TIMEOUT_TOPLEVEL_HIDE,
-                                                            hide_thumb_cb,
-                                                            scrollbar);
-              }
-
-            if (priv->source_show_thumb_id != 0)
-              {
-                g_source_remove (priv->source_show_thumb_id);
-                priv->source_show_thumb_id = 0;
-              }
-
-            if (priv->source_unlock_thumb_id != 0)
-              g_source_remove (priv->source_unlock_thumb_id);
-
-            priv->source_unlock_thumb_id = g_timeout_add (TIMEOUT_TOPLEVEL_HIDE,
-                                                          unlock_thumb_cb,
-                                                          scrollbar);
-          }
-
-        /* Get the motion_notify_event trough XEvent. */
-        if (!priv->window_button_press && os_xevent == OS_XEVENT_MOTION)
-          {
-#ifdef USE_GTK3
-            /* React to motion_notify_event
-             * and set the state accordingly. */
-            if (!is_insensitive (scrollbar) && !priv->active_window)
-              bar_set_state_from_pointer (scrollbar, event_x, event_y);
-#endif
-
-            /* Proximity area. */
-            if (check_proximity (scrollbar, event_x, event_y))
-              {
-                priv->hidable_thumb = FALSE;
-
-                if (priv->source_hide_thumb_id != 0)
-                  {
-                    g_source_remove (priv->source_hide_thumb_id);
-                    priv->source_hide_thumb_id = 0;
-                  }
-
-                adjust_thumb_position (scrollbar, event_x, event_y);
-
-                if (priv->state & OS_STATE_LOCKED)
-                  return GDK_FILTER_CONTINUE;
-
-                if (!is_touch_mode (GTK_WIDGET (scrollbar), sourceid) && !priv->resizing_paned)
-                  show_thumb (scrollbar);
-              }
-            else
-              {
-                priv->state &= ~(OS_STATE_LOCKED);
-
-                if (priv->source_show_thumb_id != 0)
-                  {
-                    g_source_remove (priv->source_show_thumb_id);
-                    priv->source_show_thumb_id = 0;
-                  }
-
-                if (gtk_widget_get_mapped (priv->thumb) &&
-                    !(priv->event & OS_EVENT_BUTTON_PRESS))
-                  {
-                    priv->hidable_thumb = TRUE;
-
-                    if (priv->source_hide_thumb_id == 0)
-                      priv->source_hide_thumb_id = g_timeout_add (TIMEOUT_PROXIMITY_HIDE,
-                                                                  hide_thumb_cb,
-                                                                  scrollbar);
-                  }
-              }
+                }
+            }
         }
     }
 
@@ -3261,11 +2902,7 @@
 static gboolean
 use_overlay_scrollbar (void)
 {
-#ifdef USE_GTK3
-  return scrollbar_mode != SCROLLBAR_MODE_NORMAL;
-#else
   return scrollbar_mode != SCROLLBAR_MODE_NORMAL && ubuntu_gtk_get_use_overlay_scrollbar ();
-#endif
 }
 
 static void
@@ -3345,17 +2982,6 @@
   (* pre_hijacked_scrollbar_dispose) (object);
 }
 
-#ifdef USE_GTK3
-static gboolean
-hijacked_scrollbar_draw (GtkWidget *widget,
-                         cairo_t   *cr)
-{
-  if (use_overlay_scrollbar ())
-    return TRUE;
-
-  return (* pre_hijacked_scrollbar_draw) (widget, cr);
-}
-#else
 static gboolean
 hijacked_scrollbar_expose_event (GtkWidget      *widget,
                                  GdkEventExpose *event)
@@ -3365,59 +2991,6 @@
 
   return (* pre_hijacked_scrollbar_expose_event) (widget, event);
 }
-#endif
-
-#ifdef USE_GTK3
-static void
-hijacked_scrollbar_get_preferred_width (GtkWidget *widget,
-                                        gint      *minimal_width,
-                                        gint      *natural_width)
-{
-  if (use_overlay_scrollbar ())
-    {
-      OsScrollbarPrivate *priv;
-
-      priv = get_private (widget);
-
-      if (priv->orientation == GTK_ORIENTATION_VERTICAL)
-        *minimal_width = *natural_width = 0;
-      else
-        {
-          *minimal_width = MIN_THUMB_HEIGHT;
-          *natural_width = THUMB_HEIGHT;
-        }
-
-      return;
-    }
-
-  (* pre_hijacked_scrollbar_get_preferred_width) (widget, minimal_width, natural_width);
-}
-
-static void
-hijacked_scrollbar_get_preferred_height (GtkWidget *widget,
-                                         gint      *minimal_height,
-                                         gint      *natural_height)
-{
-  if (use_overlay_scrollbar ())
-    {
-      OsScrollbarPrivate *priv;
-
-      priv = get_private (widget);
-
-      if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
-        *minimal_height = *natural_height = 0;
-      else
-        {
-          *minimal_height = MIN_THUMB_HEIGHT;
-          *natural_height = THUMB_HEIGHT;
-        }
-
-      return;
-    }
-
-  (* pre_hijacked_scrollbar_get_preferred_height) (widget, minimal_height, natural_height);
-}
-#endif
 
 static void
 hijacked_scrollbar_grab_notify (GtkWidget *widget,
@@ -3442,15 +3015,6 @@
   (* pre_hijacked_scrollbar_hide) (widget);
 }
 
-#ifdef USE_GTK3
-/* Return TRUE if the widget is in backdrop window. */
-static gboolean
-is_backdrop_window (GtkWidget *widget)
-{
-  return (gtk_widget_get_state_flags (widget) & GTK_STATE_FLAG_BACKDROP) != 0;
-}
-#endif
-
 static void
 hijacked_scrollbar_map (GtkWidget *widget)
 {
@@ -3464,46 +3028,6 @@
 
       (* widget_class_map) (widget);
 
-#ifdef USE_GTK3
-      /* On map, check for the active window. */
-      if (!is_backdrop_window (GTK_WIDGET (scrollbar)))
-        {
-          /* Stops potential running timeout. */
-          if (priv->source_deactivate_bar_id != 0)
-            {
-              g_source_remove (priv->source_deactivate_bar_id);
-              priv->source_deactivate_bar_id = 0;
-            }
-
-          priv->active_window = TRUE;
-        }
-      else
-        priv->active_window = FALSE;
-
-      if (!is_insensitive (scrollbar))
-        {
-          if (!priv->active_window)
-            {
-              gint x, y;
-
-              window_get_pointer (gtk_widget_get_window (widget), &x, &y, NULL);
-
-              /* When the scrollbar appears on screen (mapped),
-               * for example when switching notebook page,
-               * check the position of the pointer
-               * and set the state accordingly. */
-              bar_set_state_from_pointer (scrollbar, x, y);
-            }
-          else
-            {
-              /* On map-event of an active window,
-               * the bar should be active. */
-              priv->deactivable_bar = FALSE;
-              os_bar_set_active (priv->bar, TRUE, FALSE);
-            }
-        }
-#endif
-
       if (!(priv->state & OS_STATE_FULLSIZE))
         os_bar_show (priv->bar);
 
@@ -3810,10 +3334,6 @@
   priv->filter.proximity = FALSE;
   remove_window_filter (scrollbar);
 
-#ifdef USE_GTK3
-  os_bar_set_active (priv->bar, FALSE, FALSE);
-#endif
-
   gtk_widget_hide (priv->thumb);
 }
 
@@ -3833,124 +3353,8 @@
       priv->filter.proximity = TRUE;
       add_window_filter (scrollbar);
     }
-
-#ifdef USE_GTK3
-  if (priv->active_window)
-    os_bar_set_active (priv->bar, TRUE, FALSE);
-  else if (gtk_widget_get_realized (GTK_WIDGET (scrollbar)))
-    {
-      gint x, y;
-
-      window_get_pointer (gtk_widget_get_window (GTK_WIDGET (scrollbar)), &x, &y, NULL);
-
-      /* When the window is unfocused,
-       * check the position of the pointer
-       * and set the state accordingly. */
-      bar_set_state_from_pointer (scrollbar, x, y);
-    }
-#endif
-}
-
-#ifdef USE_GTK3
-/* React on active window changes. */
-static void
-backdrop_state_flag_changed (GtkScrollbar *scrollbar)
-{
-  OsScrollbarPrivate *priv;
-
-  priv = get_private (GTK_WIDGET (scrollbar));
-
-  OS_DCHECK (scrollbar != NULL);
-
-  /* Return if the scrollbar is insensitive. */
-  if (is_insensitive (scrollbar))
-    return;
-
-  if (gtk_widget_get_mapped (GTK_WIDGET (scrollbar)))
-    {
-      if (!is_backdrop_window (GTK_WIDGET (scrollbar)))
-        {
-          /* Stops potential running timeout. */
-          if (priv->source_deactivate_bar_id != 0)
-            {
-              g_source_remove (priv->source_deactivate_bar_id);
-              priv->source_deactivate_bar_id = 0;
-            }
-
-          priv->active_window = TRUE;
-
-          priv->deactivable_bar = FALSE;
-          os_bar_set_active (priv->bar, TRUE, TRUE);
-        }
-      else if (priv->active_window)
-        {
-          GdkWindow *parent;
-          GdkWindow *window;
-          const gint64 current_time = g_get_monotonic_time ();
-          const gint64 end_time = priv->present_time + TIMEOUT_PRESENT_WINDOW * 1000;
-
-          priv->active_window = FALSE;
-
-          /* Loop through parent windows until it reaches
-           * either an unknown GdkWindow (NULL),
-           * or the toplevel window. */
-          window = gtk_widget_get_window (GTK_WIDGET (scrollbar));
-          parent = window_at_pointer (window, NULL, NULL);
-          while (parent != NULL)
-            {
-              if (window == parent)
-                break;
-
-              parent = gdk_window_get_parent (parent);
-            }
-
-          if (parent != NULL)
-            {
-              gint x, y;
-
-              window_get_pointer (window, &x, &y, NULL);
-
-              /* When the window is unfocused,
-               * check the position of the pointer
-               * and set the state accordingly. */
-              bar_set_state_from_pointer (scrollbar, x, y);
-            }
-          else
-            {
-              /* If the pointer is outside of the window, set it inactive. */
-              priv->deactivable_bar = TRUE;
-              os_bar_set_active (priv->bar, FALSE, TRUE);
-            }
-
-          if ((current_time > end_time) && priv->thumb != NULL)
-            gtk_widget_hide (priv->thumb);
-        }
-    }
-}
-
-static void
-hijacked_scrollbar_state_flags_changed (GtkWidget    *widget,
-                                        GtkStateFlags flags)
-{
-  GtkScrollbar *scrollbar;
-
-  scrollbar = GTK_SCROLLBAR (widget);
-
-  if ((flags & GTK_STATE_FLAG_BACKDROP) !=
-      (gtk_widget_get_state_flags (widget) & GTK_STATE_FLAG_BACKDROP))
-    backdrop_state_flag_changed (scrollbar);
-
-  /* Only set the new state if the right bit changed. */
-  if ((flags & GTK_STATE_FLAG_INSENSITIVE) !=
-      (gtk_widget_get_state_flags (widget) & GTK_STATE_FLAG_INSENSITIVE))
-    {
-      if ((gtk_widget_get_state_flags (widget) & GTK_STATE_FLAG_INSENSITIVE) != 0)
-        set_insensitive (scrollbar);
-      else
-        set_sensitive (scrollbar);
-    }
-}
-#else
+}
+
 static void
 hijacked_scrollbar_size_request (GtkWidget      *widget,
                                  GtkRequisition *requisition)
@@ -3994,7 +3398,6 @@
 
   (* pre_hijacked_scrollbar_state_changed) (widget, state);
 }
-#endif
 
 static void
 hijacked_scrollbar_unmap (GtkWidget *widget)
@@ -4151,23 +3554,12 @@
   if (object_class->dispose == pre_hijacked_scrollbar_dispose)
     object_class->dispose = hijacked_scrollbar_dispose;
 
-#ifdef USE_GTK3
-  if (widget_class->draw == pre_hijacked_scrollbar_draw)
-    widget_class->draw = hijacked_scrollbar_draw;
-  if (widget_class->get_preferred_width == pre_hijacked_scrollbar_get_preferred_width)
-    widget_class->get_preferred_width = hijacked_scrollbar_get_preferred_width;
-  if (widget_class->get_preferred_height == pre_hijacked_scrollbar_get_preferred_height)
-    widget_class->get_preferred_height = hijacked_scrollbar_get_preferred_height;
-  if (widget_class->state_flags_changed == pre_hijacked_scrollbar_state_flags_changed)
-    widget_class->state_flags_changed = hijacked_scrollbar_state_flags_changed;
-#else
   if (widget_class->expose_event == pre_hijacked_scrollbar_expose_event)
     widget_class->expose_event = hijacked_scrollbar_expose_event;
   if (widget_class->size_request == pre_hijacked_scrollbar_size_request)
     widget_class->size_request = hijacked_scrollbar_size_request;
   if (widget_class->state_changed == pre_hijacked_scrollbar_state_changed)
     widget_class->state_changed = hijacked_scrollbar_state_changed;
-#endif
   if (pre_hijacked_scrollbar_grab_notify &&
       widget_class->grab_notify == pre_hijacked_scrollbar_grab_notify)
     widget_class->grab_notify = hijacked_scrollbar_grab_notify;
@@ -4197,29 +3589,13 @@
 static void
 custom_style_load (void)
 {
-#ifdef USE_GTK3
-  gtk_style_context_add_provider_for_screen (gdk_display_get_default_screen (gdk_display_get_default ()),
-                                             GTK_STYLE_PROVIDER (provider),
-                                             GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-#else
   gtk_rc_parse_string ("style \"overlay-scrollbar\" {\n"
                        "    GtkScrolledWindow::scrollbar-spacing = 0\n"
                        "    GtkScrolledWindow::scrollbars-within-bevel = 1\n"
                        " }\n"
                        "\n"
                        "class \"GtkScrolledWindow\" style \"overlay-scrollbar\"");
-#endif
-}
-
-#ifdef USE_GTK3
-/* Unload custom style for overlay scrollbar. */
-static void
-custom_style_unload (void)
-{
-  gtk_style_context_remove_provider_for_screen (gdk_display_get_default_screen (gdk_display_get_default ()),
-                                                GTK_STYLE_PROVIDER (provider));
-}
-#endif
+}
 
 /* Unload all scrollbars. */
 static void
@@ -4287,17 +3663,9 @@
   /* Update the scrollbar_mode variable. */
   scrollbar_mode = g_settings_get_enum (settings, "scrollbar-mode");
 
-#ifdef USE_GTK3
-  /* Load or unload custom style for overlay scrollbar. */
-  if (use_overlay_scrollbar ())
-    custom_style_load ();
-  else
-    custom_style_unload ();
-#else
   /* Gtk+ 2.0 doesn't support dynamic loading of styles.
    * Please contact me in case I'm wrong,
    * and I'll add the required bits here. */
-#endif
 
   /* Load all scrollbars, using new scrollbar_mode. */
   g_slist_foreach (tmp_list, scrollbar_mode_changed_load_gfunc, NULL);
@@ -4323,12 +3691,6 @@
   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");
@@ -4341,16 +3703,9 @@
 
   pre_hijacked_scrollbar_dispose  = object_class->dispose;
 
-#ifdef USE_GTK3
-  pre_hijacked_scrollbar_draw                 = widget_class->draw;
-  pre_hijacked_scrollbar_get_preferred_width  = widget_class->get_preferred_width;
-  pre_hijacked_scrollbar_get_preferred_height = widget_class->get_preferred_height;
-  pre_hijacked_scrollbar_state_flags_changed  = widget_class->state_flags_changed;
-#else
   pre_hijacked_scrollbar_expose_event         = widget_class->expose_event;
   pre_hijacked_scrollbar_size_request         = widget_class->size_request;
   pre_hijacked_scrollbar_state_changed        = widget_class->state_changed;
-#endif
   pre_hijacked_scrollbar_grab_notify          = widget_class->grab_notify;
   pre_hijacked_scrollbar_hide                 = widget_class->hide;
   pre_hijacked_scrollbar_map                  = widget_class->map;
@@ -4379,19 +3734,7 @@
                     G_CALLBACK (scrollbar_mode_changed_cb), NULL);
   scrollbar_mode = g_settings_get_enum (settings, "scrollbar-mode");
 
-#ifdef USE_GTK3
-  /* Initialize styling bits. */
-  provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (provider),
-                                   "* {\n"
-                                   "    -GtkScrolledWindow-scrollbar-spacing: 0;\n"
-                                   "    -GtkScrolledWindow-scrollbars-within-bevel: 1;\n"
-                                   "}\n", -1, NULL);
-#endif
-
-#ifndef USE_GTK3
   ubuntu_gtk_set_use_overlay_scrollbar (TRUE);
-#endif
 
   /* Load custom overlay scrollbar style. */
   if (use_overlay_scrollbar ())

=== modified file 'os/os-thumb.c'
--- os/os-thumb.c	2013-02-02 00:46:51 +0000
+++ os/os-thumb.c	2015-06-04 09:25:27 +0000
@@ -40,14 +40,12 @@
 /* Number of tolerance pixels, before hiding the thumb. */
 #define TOLERANCE_FADE 3
 
-#ifndef USE_GTK3
 typedef struct {
   gdouble red;
   gdouble green;
   gdouble blue;
   gdouble alpha;
 } GdkRGBA;
-#endif
 
 struct _OsThumbPrivate {
   GtkOrientation orientation;
@@ -71,11 +69,7 @@
 static gboolean os_thumb_button_press_event (GtkWidget *widget, GdkEventButton *event);
 static gboolean os_thumb_button_release_event (GtkWidget *widget, GdkEventButton *event);
 static void os_thumb_composited_changed (GtkWidget *widget);
-#ifdef USE_GTK3
-static gboolean os_thumb_draw (GtkWidget *widget, cairo_t *cr);
-#else
 static gboolean os_thumb_expose (GtkWidget *widget, GdkEventExpose *event);
-#endif
 static gboolean os_thumb_leave_notify_event (GtkWidget *widget, GdkEventCrossing *event);
 static gboolean os_thumb_motion_notify_event (GtkWidget *widget, GdkEventMotion *event);
 static void os_thumb_map (GtkWidget *widget);
@@ -145,11 +139,7 @@
   widget_class->button_press_event   = os_thumb_button_press_event;
   widget_class->button_release_event = os_thumb_button_release_event;
   widget_class->composited_changed   = os_thumb_composited_changed;
-#ifdef USE_GTK3
-  widget_class->draw                 = os_thumb_draw;
-#else
   widget_class->expose_event         = os_thumb_expose;
-#endif
   widget_class->leave_notify_event   = os_thumb_leave_notify_event;
   widget_class->map                  = os_thumb_map;
   widget_class->motion_notify_event  = os_thumb_motion_notify_event;
@@ -602,7 +592,6 @@
   b->alpha = a->alpha;
 }
 
-#ifndef USE_GTK3
 /* Convert a GdkColor to GdkRGBA. */
 static void
 convert_gdk_color_to_gdk_rgba (GdkColor *color,
@@ -614,7 +603,6 @@
 
   rgba->alpha = 1.0;
 }
-#endif
 
 enum {
   ACTION_NORMAL,
@@ -624,19 +612,12 @@
 };
 
 static gboolean
-#ifdef USE_GTK3
-os_thumb_draw (GtkWidget *widget,
-               cairo_t   *cr)
-{
-  GtkStyleContext *style_context;
-#else
 os_thumb_expose (GtkWidget      *widget,
                  GdkEventExpose *event)
 {
   GtkAllocation allocation;
   cairo_t *cr;
   GtkStyle *style;
-#endif
   GdkRGBA bg, bg_active, bg_selected;
   GdkRGBA bg_arrow_up, bg_arrow_down;
   GdkRGBA bg_shadow, bg_dark_line, bg_bright_line;
@@ -653,17 +634,6 @@
 
   radius = priv->rgba ? THUMB_RADIUS : 0;
 
-#ifdef USE_GTK3
-  width = gtk_widget_get_allocated_width (widget);
-  height = gtk_widget_get_allocated_height (widget);
-
-  style_context = gtk_widget_get_style_context (widget);
-
-  gtk_style_context_get_background_color (style_context, gtk_widget_get_state_flags (widget), &bg);
-  gtk_style_context_get_background_color (style_context, GTK_STATE_FLAG_ACTIVE, &bg_active);
-  gtk_style_context_get_background_color (style_context, GTK_STATE_FLAG_SELECTED, &bg_selected);
-  gtk_style_context_get_color (style_context, gtk_widget_get_state_flags (widget), &arrow_color);
-#else
   gtk_widget_get_allocation (widget, &allocation);
  
   width = allocation.width;
@@ -677,7 +647,6 @@
   convert_gdk_color_to_gdk_rgba (&style->fg[gtk_widget_get_state (widget)], &arrow_color);
 
   cr = gdk_cairo_create (gtk_widget_get_window (widget));
-#endif
 
   cairo_save (cr);
 
@@ -912,12 +881,8 @@
     }
 
   cairo_restore (cr);
-
   cairo_restore (cr);
-
-#ifndef USE_GTK3
   cairo_destroy (cr);
-#endif
 
   return FALSE;
 }
@@ -1037,16 +1002,6 @@
 os_thumb_screen_changed (GtkWidget *widget,
                          GdkScreen *old_screen)
 {
-#ifdef USE_GTK3
-  GdkScreen *screen;
-  GdkVisual *visual;
-
-  screen = gtk_widget_get_screen (widget);
-  visual = gdk_screen_get_rgba_visual (screen);
-
- if (visual)
-   gtk_widget_set_visual (widget, visual);
-#else
   GdkScreen *screen;
   GdkColormap *colormap;
 
@@ -1055,7 +1010,6 @@
 
   if (colormap)
     gtk_widget_set_colormap (widget, colormap);
-#endif
 }
 
 static gboolean

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2012-04-26 14:02:33 +0000
+++ tests/Makefile.am	2015-06-04 09:25:27 +0000
@@ -1,16 +1,8 @@
-if USE_GTK3
-VER=3
-else
 VER=
-endif
 
 noinst_PROGRAMS = \
 	test-os
 
-if USE_GTK3
-test_os_CFLAGS = -I$(top_srcdir) $(OS_CFLAGS) -DUSE_GTK3
-else
 test_os_CFLAGS = -I$(top_srcdir) $(OS_CFLAGS)
-endif
 
 test_os_LDFLAGS = $(OS_LIBADD)

=== modified file 'tests/test-os.c'
--- tests/test-os.c	2012-11-26 14:35:24 +0000
+++ tests/test-os.c	2015-06-04 09:25:27 +0000
@@ -250,18 +250,10 @@
   gtk_window_set_title (GTK_WINDOW (window), "Vertical \"Overlay Scrollbar\" test");
 
   /* vbox */
-#ifdef USE_GTK3
-  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-#else
   vbox = gtk_vbox_new (TRUE, 2);
-#endif
 
   /* hbox */
-#ifdef USE_GTK3
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
-#else
   hbox = gtk_hbox_new (TRUE, 2);
-#endif
 
   /* scrolled_window_text0 */
   scrolled_window_text0 = gtk_scrolled_window_new (NULL, NULL);