Fixed Bug 657165 - IBus for gnome-shell for Fedora 15.

- Added ibus-icons-20110325.tar.bz2 for GNOME 3 theme
This commit is contained in:
Takao Fujiwara 2011-03-25 14:50:02 +09:00
parent 38ee625d0a
commit 9aff0cb5a7
4 changed files with 41 additions and 2 deletions

1
.gitignore vendored
View File

@ -11,3 +11,4 @@ ibus-1.3.6.tar.gz
/ibus-ui-gjs-plugins-20110214.tar.bz2
/ibus-1.3.99.20110228.tar.gz
/gnome-shell-ibus-plugins-20110317.tar.bz2
/ibus-icons-20110325.tar.bz2

View File

@ -383,3 +383,36 @@ index 15bdf02..159bc24 100644
--
1.7.4.1
From a9a7d77b540826259889aa8c8936b7a3cae1593d Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Fri, 25 Mar 2011 13:57:31 +0900
Subject: [PATCH] Set WM_CLASS name instead of main.py
---
ui/gtk/panel.py | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ui/gtk/panel.py b/ui/gtk/panel.py
index 07b0fa2..9d63a17 100644
--- a/ui/gtk/panel.py
+++ b/ui/gtk/panel.py
@@ -103,6 +103,16 @@ class Panel(ibus.PanelBase):
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)
+ self.__status_icon.set_name('ibus-ui-gtk')
+ self.__status_icon.set_title(_("IBus Panel"))
+ 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)
--
1.7.4.1

View File

@ -13,7 +13,7 @@
Name: ibus
Version: 1.3.99.20110228
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
Group: System Environment/Libraries
@ -23,6 +23,7 @@ Source1: xinput-ibus
%if %have_gjsfile
Source2: http://fujiwara.fedorapeople.org/ibus/gnome-shell/gnome-shell-ibus-plugins-20110317.tar.bz2
%endif
Source3: http://fujiwara.fedorapeople.org/ibus/gnome-shell/ibus-icons-20110325.tar.bz2
Patch0: ibus-HEAD.patch
Patch1: ibus-435880-surrounding-text.patch
Patch2: ibus-541492-xkb.patch
@ -145,6 +146,7 @@ The ibus-devel-docs package contains developer documentation for ibus
%if %have_gjsfile
bzcat %SOURCE2 | tar xf -
%endif
bzcat %SOURCE3 | tar xf -
%patch0 -p1
%patch99 -p1 -b .g-s-typo
# start surrounding patch
@ -331,11 +333,13 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
* Wed Mar 23 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110228-4
* Fri Mar 25 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110228-5
- Updated ibus-HEAD.patch
Fixed Bug 683484 - Timed out SetEngine when select an engine from panel.
Fixed Bug 657165 - IBus for gnome-shell for Fedora 15.
- Updated ibus-657165-panel-libs.patch
- Added ibus-688034-fedora-g-s.patch for Fedora workaround.
- Added ibus-icons-20110325.tar.bz2 for GNOME 3 theme
* Thu Mar 10 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110228-1
- Updated to 1.3.99.20110228

View File

@ -1,2 +1,3 @@
223ce787c5357f833ba34cdaf502ef76 ibus-1.3.99.20110228.tar.gz
2d6991ca7d3147aa486b6297872bed5f gnome-shell-ibus-plugins-20110317.tar.bz2
d75ed741b6fd3d82549e742162fa7785 ibus-icons-20110325.tar.bz2