From bdb9737dca8bdcf5779a68d634f3e90bddeedc79be4b52b815ead92102e0cb70 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Sat, 9 Feb 2013 05:44:27 +0000 Subject: [PATCH] Accepting request 154966 from home:hillwood:branches:M17N - fix ibus's tray icon can't show in gnome-shell 3.6 for openSUSE 12.3, add fix-tray-icon-on-gnome-3.6.patch OBS-URL: https://build.opensuse.org/request/show/154966 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=55 --- ibus-fix-tray-icon-on-gnome-3.6.patch | 23 +++++++++++++++++++++++ ibus.changes | 6 ++++++ ibus.spec | 4 ++++ 3 files changed, 33 insertions(+) create mode 100644 ibus-fix-tray-icon-on-gnome-3.6.patch diff --git a/ibus-fix-tray-icon-on-gnome-3.6.patch b/ibus-fix-tray-icon-on-gnome-3.6.patch new file mode 100644 index 0000000..30483fd --- /dev/null +++ b/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) diff --git a/ibus.changes b/ibus.changes index a5c63cc..95c0008 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Feb 9 13:13:13 CST 2013 - hillwood@linuxfans.org + +- fix ibus's tray icon can't show in gnome-shell 3.6 for openSUSE 12.3, + add fix-tray-icon-on-gnome-3.6.patch + ------------------------------------------------------------------- Thu Jan 10 12:50:49 UTC 2013 - ftake@geeko.jp diff --git a/ibus.spec b/ibus.spec index b8a018e..3b6ead8 100644 --- a/ibus.spec +++ b/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