Merge lp:~attente/unity/libreoffice-menu-highlight into lp:unity/7.0

Proposed by William Hua on 2013-04-25
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2013-05-30
Approved revision: 3314
Merged at revision: 3318
Proposed branch: lp:~attente/unity/libreoffice-menu-highlight
Merge into: lp:unity/7.0
Diff against target: 31 lines (+14/-0)
1 file modified
services/panel-service.c (+14/-0)
To merge this branch: bzr merge lp:~attente/unity/libreoffice-menu-highlight
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-05-30
Andrea Azzarone (community) Approve on 2013-05-22
Marco Trevisan (Treviño) 2013-04-25 Approve on 2013-04-26
Review via email: mp+160941@code.launchpad.net

Commit message

Revert 3196 to fix menu highlighting issues with LibreOffice.

Revision 3196 prevents LibreOffice's menu items from highlighting.
See Launchpad bug #1153350.

Description of the change

A regression occurred with LibreOffice's menu items being unable to highlight on mouse hover. See LP #1153350.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3314
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/~attente/unity/libreoffice-menu-highlight/+merge/160941/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-7.0-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-amd64-ci/2
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-armhf-ci/2/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-7.0-ci/2/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
William Hua (attente) wrote :

Does anyone know why Jenkins CI failed on the arm build? I'm not really sure what this means:

"Failed to load native POSIX impl; falling back on Java impl. Stacktrace follows.
java.lang.NoClassDefFoundError: Could not initialize class com.kenai.jffi.Foreign$InstanceHolder"

Allan LeSage (allanlesage) wrote :

I'm told that a few of our panda-builders have been unreliable over the last week; top-approving to test on new machines.

Andrea Azzarone (azzar1) :
review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'services/panel-service.c'
2--- services/panel-service.c 2013-03-07 16:02:10 +0000
3+++ services/panel-service.c 2013-04-25 16:00:36 +0000
4@@ -1281,6 +1281,10 @@
5 g_signal_handler_disconnect (priv->last_menu, priv->last_menu_id);
6 g_signal_handler_disconnect (priv->last_menu, priv->last_menu_move_id);
7
8+ GtkWidget *top_win = gtk_widget_get_toplevel (GTK_WIDGET (priv->last_menu));
9+ if (GTK_IS_WINDOW (top_win))
10+ gtk_window_set_attached_to (GTK_WINDOW (top_win), NULL);
11+
12 priv->last_menu = NULL;
13 priv->last_menu_id = 0;
14 priv->last_menu_move_id = 0;
15@@ -1740,6 +1744,16 @@
16 G_CALLBACK (menuitem_activated), entry);
17 }
18
19+ GtkWidget *top_widget = gtk_widget_get_toplevel (GTK_WIDGET (priv->last_menu));
20+
21+ if (GTK_IS_WINDOW (top_widget))
22+ {
23+ GtkWindow *top_win = GTK_WINDOW (top_widget);
24+
25+ if (gtk_window_get_attached_to (top_win) != priv->menubar)
26+ gtk_window_set_attached_to (top_win, priv->menubar);
27+ }
28+
29 priv->last_entry = entry;
30 priv->last_x = x;
31 priv->last_y = y;

Subscribers

People subscribed via source and target branches

to all changes: