Merge lp:~brandontschaefer/overlay-scrollbar/lp.1109114-1109113-CID-13652-13653 into lp:overlay-scrollbar

[Brandon Schaefer]

One was an unused var, and the other was only used if using GTK3 so moved that into the #ifndef.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:365
http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/14/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/14/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=raring,flavor=armhf/14/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=raring,flavor=i386/14/console
Coverity artifacts:
    http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/14//artifact/results/coverity/CID_13650.html
    http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=raring,flavor=armhf/14//artifact/results/coverity/NO_COVERITY_DEFECTS.txt
    http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=raring,flavor=i386/14//artifact/results/coverity/NO_COVERITY_DEFECTS.txt

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/14//rebuild/?

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:365
http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/17/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/17/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=raring,flavor=armhf/17/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=raring,flavor=i386/17/console
Coverity artifacts:
    http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/17//artifact/results/coverity/CID_13650.html
    http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=raring,flavor=armhf/17//artifact/results/coverity/NO_COVERITY_DEFECTS.txt
    http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=raring,flavor=i386/17//artifact/results/coverity/NO_COVERITY_DEFECTS.txt

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/17//rebuild/?

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

+1

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2012-11-30 07:51:59 +0000
+++ os/os-scrollbar.c	2013-02-02 00:59:19 +0000
@@ -1962,17 +1962,19 @@
 {
   Display *display;
   GtkScrollbar *scrollbar;
-  OsScrollbarPrivate *priv;
   XWindowChanges changes;
   guint32 xid, xid_parent;
   unsigned int value_mask = CWSibling | CWStackMode;
   int res;
 
   scrollbar = GTK_SCROLLBAR (user_data);
-  priv = get_private (GTK_WIDGET (scrollbar));
 
 #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
@@ -3830,10 +3832,8 @@
 {
   if (use_overlay_scrollbar ())
     {
-      GtkScrollbar *scrollbar;
       OsScrollbarPrivate *priv;
 
-      scrollbar = GTK_SCROLLBAR (widget);
       priv = get_private (widget);
 
       if (priv->orientation == GTK_ORIENTATION_VERTICAL)