From 7a52852f72f634278a8cabc245b40b61897488d4 Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Mon, 28 Mar 2011 12:22:50 +0900
Subject: [PATCH] Use input-keyboard-symbolic for ibus panel icon.

---
 ibus-HEAD.patch | 13 +++++++++++--
 ibus.spec       |  8 +++-----
 sources         |  1 -
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index 197b8dc..4d47b17 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -389,13 +389,22 @@ 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(-)
+ ui/gtk/panel.py |   11 ++++++++++-
+ 1 files changed, 11 insertions(+), 1 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
+@@ -37,7 +37,7 @@
+ 
+ from i18n import _, N_
+ 
+-ICON_KEYBOARD = "ibus-keyboard"
++ICON_KEYBOARD = "input-keyboard-symbolic"
+ ICON_ENGINE = "ibus-engine"
+ 
+ def show_uri(screen, link):
 @@ -103,6 +103,16 @@ class Panel(ibus.PanelBase):
  
  
diff --git a/ibus.spec b/ibus.spec
index 36b2598..41bbdaf 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -13,7 +13,7 @@
 
 Name:       ibus
 Version:    1.3.99.20110228
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -23,7 +23,6 @@ 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
@@ -71,6 +70,7 @@ Requires:   GConf2
 Requires:   notify-python
 Requires:   librsvg2
 Requires:   gnome-icon-theme-legacy >= %{gnome_icon_theme_legacy_version}
+Requires:   gnome-icon-theme-symbolic
 
 Requires(post):  desktop-file-utils
 Requires(postun):  desktop-file-utils
@@ -146,7 +146,6 @@ 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
@@ -333,13 +332,12 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Fri Mar 25 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110228-5
+* Mon Mar 28 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110228-6
 - 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
diff --git a/sources b/sources
index 81febf4..617504f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 223ce787c5357f833ba34cdaf502ef76  ibus-1.3.99.20110228.tar.gz
 2d6991ca7d3147aa486b6297872bed5f  gnome-shell-ibus-plugins-20110317.tar.bz2
-d75ed741b6fd3d82549e742162fa7785  ibus-icons-20110325.tar.bz2