Merge lp:~xnox/appmenu-gtk/fix-all-emacs into lp:appmenu-gtk/13.04

Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 169
Merged at revision: 169
Proposed branch: lp:~xnox/appmenu-gtk/fix-all-emacs
Merge into: lp:appmenu-gtk/13.04
Diff against target: 14 lines (+1/-3)
1 file modified
src/bridge.c (+1/-3)
To merge this branch: bzr merge lp:~xnox/appmenu-gtk/fix-all-emacs
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+156235@code.launchpad.net

Commit message

* Fix appmenu-gtk breaks dynamically created Emacs Gtk+ menus, for emacs* (emacs24 specifically) (LP: #673302)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Approve.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/bridge.c'
2--- src/bridge.c 2013-02-25 20:11:18 +0000
3+++ src/bridge.c 2013-03-30 00:47:29 +0000
4@@ -971,9 +971,7 @@
5 || (g_strcmp0 (prg, "firefox-bin") == 0)
6 || (g_strcmp0 (prg, "thunderbird-bin") == 0)
7 || (g_strcmp0 (prg, "Eclipse") == 0)
8- || (g_strcmp0 (prg, "emacs") == 0)
9- || (g_strcmp0 (prg, "emacs23") == 0)
10- || (g_strcmp0 (prg, "emacs23-lucid") == 0)
11+ || g_str_has_prefix (prg, "emacs")
12 || (g_strcmp0 (prg, "glade") == 0)
13 || (g_strcmp0 (prg, "gnome-panel") == 0)
14 || (g_strcmp0 (prg, "gwyddion") == 0)

Subscribers

People subscribed via source and target branches