Merge lp:~townsend/unity/fix-gtk-build-error into lp:unity

[Christopher Townsend]

Fix compile error due to deprecated gtk_widget_get_state() function.

Fix compile error due to deprecated gtk_widget_get_state() function.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/411/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3598/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-autolanding/41/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-autolanding/41/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-autolanding/41/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3609
http://jenkins.qa.ubuntu.com/job/unity-ci/525/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/56
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/56/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/59

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/525/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/416/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3610
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-autolanding/46
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-autolanding/46/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-autolanding/46

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/417/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3630
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-autolanding/47
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-autolanding/47/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-autolanding/47

review: Needs Fixing (continuous-integration)

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/418/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3637
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-autolanding/48
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-autolanding/48/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-autolanding/48

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/419/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3646
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-autolanding/49
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-autolanding/49/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-autolanding/49

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/420/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3659
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-autolanding/50
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-autolanding/50/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-autolanding/50

review: Needs Fixing (continuous-integration)

[Eleni Maria Stea (hikiko)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/421/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3704
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-autolanding/51
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-autolanding/51/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-autolanding/51

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/422/
Executed test runs:
    None: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3724/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-autolanding/52
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-autolanding/52/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-autolanding/52

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2013-10-26 19:14:03 +0000
+++ services/panel-service.c	2013-12-11 16:52:23 +0000
@@ -1888,7 +1888,7 @@
           GtkWidget *item = (GtkWidget *)c->data;
 
           if (GTK_IS_MENU_ITEM (item)
-              && gtk_widget_get_state (item) == GTK_STATE_PRELIGHT
+              && gtk_widget_get_state_flags (item) & GTK_STATE_FLAG_PRELIGHT
               && gtk_menu_item_get_submenu (GTK_MENU_ITEM (item)))
             {
               /* Skip direction due to there being a submenu,