~ubuntu-branches/ubuntu/lucid/ibus/lucid

« back to all changes in this revision

Viewing changes to debian/patches/05_appindicator.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-02-26 19:44:25 UTC
  • Revision ID: james.westby@ubuntu.com-20100226194425-5i0qjj86yfdngqr4
Tags: 1.2.0.20091215-1ubuntu2
05_appindicator.dpatch: update from Jan Arne Petersen to fix the application
indicator menu not being displayed (lp: #528406)

Show diffs side-by-side

added added

removed removed

Lines of Context:
5
5
## DP: No description.
6
6
 
7
7
@DPATCH@
8
 
diff -urNad ibus-1.2.0.20091215~/ui/gtk/panel.py ibus-1.2.0.20091215/ui/gtk/panel.py
9
 
--- ibus-1.2.0.20091215~/ui/gtk/panel.py        2009-12-04 08:55:50.000000000 +0100
10
 
+++ ibus-1.2.0.20091215/ui/gtk/panel.py 2010-02-15 13:40:17.215978625 +0100
 
8
diff -urNad ibus~/ui/gtk/panel.py ibus/ui/gtk/panel.py
 
9
--- ibus~/ui/gtk/panel.py       2010-02-26 12:23:29.000000000 +0100
 
10
+++ ibus/ui/gtk/panel.py        2010-02-26 12:24:25.707690489 +0100
11
11
@@ -34,6 +34,11 @@
12
12
 from candidatepanel import CandidatePanel
13
13
 from engineabout import EngineAbout
138
138
         menu.popup(None, None,
139
139
                 gtk.status_icon_position_menu,
140
140
                 button,
141
 
@@ -428,22 +456,48 @@
 
141
@@ -428,22 +456,50 @@
142
142
             size = gtk.icon_size_lookup(gtk.ICON_SIZE_MENU)
143
143
             item.set_image(_icon.IconWidget("gtk-info", size[0]))
144
144
             menu.add(item)
170
170
+        menu.add(gtk.SeparatorMenuItem())
171
171
+
172
172
+        self.__create_sys_menu(menu)
 
173
+
 
174
+        menu.show_all()
173
175
+        menu.set_take_focus(False)
174
176
+
175
177
+        self.__appindicator.set_menu(menu)