Accepting request 155027 from M17N

- fix bnc#802967
  * fix ibus's tray icon can't show in gnome-shell 3.6 for openSUSE 12.3,
    add ibus-fix-tray-icon-on-gnome-3.6.patch (forwarded request 154982 from hillwood)

OBS-URL: https://build.opensuse.org/request/show/155027
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ibus?expand=0&rev=30

ibus-fix-tray-icon-on-gnome-3.6.patch

@@ -0,0 +1,23 @@
+diff -Nur ibus-1.4.2/ui/gtk/panel.py ibus-1.4.2-new/ui/gtk/panel.py
+--- ibus-1.4.2/ui/gtk/panel.py	2012-08-22 22:16:51.000000000 +0800
++++ ibus-1.4.2-new/ui/gtk/panel.py	2013-02-08 23:57:47.465504005 +0800
+@@ -103,19 +103,6 @@
+ 
+ 
+         self.__status_icon = gtk.StatusIcon()
+-        # gnome-shell checks XClassHint.res_class with ShellTrayIcon.
+-        # gtk_status_icon_set_name() can set XClassHint.res_class .
+-        # However gtk_status_icon_new() also calls gtk_window_realize() so
+-        # gtk_status_icon_set_visible() needs to be called to set WM_CLASS
+-        # so that gtk_window_realize() is called later again.
+-        # set_title is for gnome-shell notificationDaemon in bottom right.
+-        self.__status_icon.set_visible(False)
+-        # gtk_status_icon_set_name() is not available in pygtk2 2.17
+-        if hasattr(self.__status_icon, 'set_name'):
+-            self.__status_icon.set_name('ibus-ui-gtk')
+-        self.__status_icon.set_title(_("IBus Panel"))
+-        # Hide icon until bus get the name owner.
+-        #self.__status_icon.set_visible(True)
+         self.__status_icon.connect("popup-menu", self.__status_icon_popup_menu_cb)
+         self.__status_icon.connect("activate", self.__status_icon_activate_cb)
+         self.__status_icon.set_from_icon_name(ICON_KEYBOARD)

ibus.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Feb  9 13:13:13 CST 2013 - hillwood@linuxfans.org
+
+- fix bnc#802967
+  * fix ibus's tray icon can't show in gnome-shell 3.6 for openSUSE 12.3,
+    add ibus-fix-tray-icon-on-gnome-3.6.patch
+
 -------------------------------------------------------------------
 Thu Jan 10 12:50:49 UTC 2013 - ftake@geeko.jp
 

ibus.spec

@@ -33,6 +33,7 @@ Patch0:         ibus-python-install-dir.patch
 Patch1:         ibus-fix-default-preload-engines.patch
 # PATCH-FIX-OPENSUSE ibus-fix-docs-build-error.patch
 Patch2:         ibus-fix-docs-build-error.patch
+Patch3:         ibus-fix-tray-icon-on-gnome-3.6.patch
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPL-2.1+
 Group:          System/I18n/Chinese
@@ -131,6 +132,9 @@ docs for ibus.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%if 0%{suse_version} >= 1230
+%patch3 -p1
+%endif
 
 %build
 autoreconf -fi