diff -Nru ibus-1.3.99.20110419/debian/changelog ibus-1.3.99.20110419/debian/changelog
--- ibus-1.3.99.20110419/debian/changelog	2011-08-19 08:04:13.000000000 +0900
+++ ibus-1.3.99.20110419/debian/changelog	2011-08-20 22:26:33.000000000 +0900
@@ -1,3 +1,9 @@
+ibus (1.3.99.20110419-1ubuntu3) oneiric; urgency=low
+
+  * debian/patches/05_appindicator.patch: fix crash issue (LP: #828833)
+
+ -- Ikuya Awashiro <ikuya@fruitsbasket.info>  Sat, 20 Aug 2011 21:46:09 +0900
+
 ibus (1.3.99.20110419-1ubuntu2) oneiric; urgency=low
 
   * configure.ac: look at the gtk+2.0 pkg-config settings for the directory
diff -Nru ibus-1.3.99.20110419/debian/patches/05_appindicator.patch ibus-1.3.99.20110419/debian/patches/05_appindicator.patch
--- ibus-1.3.99.20110419/debian/patches/05_appindicator.patch	2011-08-12 07:31:25.000000000 +0900
+++ ibus-1.3.99.20110419/debian/patches/05_appindicator.patch	2011-08-20 22:26:24.000000000 +0900
@@ -1,5 +1,7 @@
---- a/ui/gtk/main.py
-+++ b/ui/gtk/main.py
+Index: ibus-1.3.99.20110419/ui/gtk/main.py
+===================================================================
+--- ibus-1.3.99.20110419.orig/ui/gtk/main.py	2011-08-20 21:26:50.592829685 +0900
++++ ibus-1.3.99.20110419/ui/gtk/main.py	2011-08-20 21:42:54.856712440 +0900
 @@ -63,8 +63,9 @@
                              "Please restart ibus input platform."), \
                              "ibus")
@@ -12,8 +14,10 @@
  
      def __restart_cb(self, notify, action, data):
          if action == "restart":
---- a/ui/gtk/panel.py
-+++ b/ui/gtk/panel.py
+Index: ibus-1.3.99.20110419/ui/gtk/panel.py
+===================================================================
+--- ibus-1.3.99.20110419.orig/ui/gtk/panel.py	2011-08-20 21:26:50.608829483 +0900
++++ ibus-1.3.99.20110419/ui/gtk/panel.py	2011-08-20 21:43:40.504130035 +0900
 @@ -37,6 +37,11 @@
  
  from i18n import _, N_
@@ -26,15 +30,17 @@
  ICON_KEYBOARD = ibus.get_ICON_KEYBOARD()
  ICON_ENGINE = "ibus-engine"
  
-@@ -63,6 +68,7 @@
+@@ -62,7 +67,9 @@
+         self.__bus = bus
          self.__config = self.__bus.get_config()
          self.__focus_ic = None
++        self.__previous_focus_ic = None
          self.__setup_pid = None
 +        self.__block_activate = False
          self.__prefix = os.getenv("IBUS_PREFIX")
          self.__data_dir = path.join(self.__prefix, "share", "ibus")
          # self.__icons_dir = path.join(self.__data_dir, "icons")
-@@ -102,26 +108,35 @@
+@@ -102,26 +109,35 @@
                          lambda widget, index, button, state: self.candidate_clicked(index, button, state))
  
  
@@ -90,7 +96,7 @@
  
          self.__config_load_lookup_table_orientation()
          self.__config_load_show()
-@@ -209,10 +224,13 @@
+@@ -209,10 +225,13 @@
          if not icon_name:
              icon_name = ICON_ENGINE
          self.__language_bar.set_im_icon(icon_name)
@@ -107,7 +113,7 @@
  
      def __set_im_name(self, name):
          self.__language_bar.set_im_name(name)
-@@ -234,15 +252,24 @@
+@@ -234,15 +253,24 @@
              else:
                  self.__set_im_icon(ICON_KEYBOARD)
                  self.__set_im_name(None)
@@ -132,7 +138,7 @@
  
      def state_changed(self):
          if not self.__focus_ic:
-@@ -311,7 +338,13 @@
+@@ -311,7 +339,13 @@
  
      def __config_load_show_icon_on_systray(self):
          value = self.__config.get_value("panel", "show_icon_on_systray", True)
@@ -147,7 +153,7 @@
  
      def __config_load_show_im_name(self):
          value = self.__config.get_value("panel", "show_im_name", False)
-@@ -338,8 +371,7 @@
+@@ -338,8 +372,7 @@
      def __config_reloaded_cb(self, bus):
          pass
  
@@ -157,7 +163,7 @@
          item = gtk.ImageMenuItem(gtk.STOCK_PREFERENCES)
          item.connect("activate",
              self.__sys_menu_item_activate_cb, gtk.STOCK_PREFERENCES)
-@@ -358,8 +390,6 @@
+@@ -358,8 +391,6 @@
              self.__sys_menu_item_activate_cb, gtk.STOCK_QUIT)
          menu.add(item)
  
@@ -166,7 +172,7 @@
          return menu
  
      # def __create_im_menu(self):
-@@ -422,33 +452,50 @@
+@@ -422,33 +453,50 @@
  
          size = gtk.icon_size_lookup(gtk.ICON_SIZE_MENU)
          menu = gtk.Menu()
@@ -232,7 +238,7 @@
          return menu
  
      def __show_engine_about_cb(self, langagebar):
-@@ -465,7 +512,12 @@
+@@ -465,7 +513,12 @@
          self.__config.set_value("panel", "y", y)
  
      def __status_icon_popup_menu_cb(self, status_icon, button, active_time):
@@ -246,7 +252,7 @@
          menu.popup(None, None,
                  gtk.status_icon_position_menu,
                  button,
-@@ -479,23 +531,57 @@
+@@ -479,23 +532,57 @@
              size = gtk.icon_size_lookup(gtk.ICON_SIZE_MENU)
              item.set_image(_icon.IconWidget("gtk-info", size[0]))
              menu.add(item)