Accepting request 202973 from home:ftake:branches:M17N

fix bug in the patch added by the previous commit

OBS-URL: https://build.opensuse.org/request/show/202973
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=78
This commit is contained in:
Fuminobu Takeyama 2013-10-11 12:05:43 +00:00 committed by Git OBS Bridge
parent 521e2d454a
commit 091af5e71b
2 changed files with 16 additions and 7 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Oct 10 17:50:08 UTC 2013 - ftake@geeko.jp
- Update show-input-mode-icon.patch
* fix ibus-ui-gtk3 hangs up
* fix icons are cropped on KDE
-------------------------------------------------------------------
Sun Oct 6 13:43:39 UTC 2013 - ftake@geeko.jp
@ -5,7 +12,7 @@ Sun Oct 6 13:43:39 UTC 2013 - ftake@geeko.jp
* Add "address" command to command line interface
* Support content-type of input context
* Replace ibus-config with gsettings
* Supprt using a different IM engine state for each window
* Support using a different IM engine state for each window
* Support show-icon-on-systray in ibus-ui-gtk3
* Fix no output when ibus-daemon is runnin on another display
* Update translations and fix build errors

View File

@ -1,18 +1,18 @@
From f671355e97f7de3e866f942e5c69f72b0c97fddb Mon Sep 17 00:00:00 2001
From 8dcad73926dfed30b1aae6bcb6c0ecae35d13777 Mon Sep 17 00:00:00 2001
From: Fuminobu TAKEYAMA <ftake@geeko.jp>
Date: Sun, 6 Oct 2013 15:29:43 +0900
Subject: [PATCH] If icons for input modes are available, use those icons
instead of engine's icons.
---
ui/gtk3/panel.vala | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
ui/gtk3/panel.vala | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 9c1fef5..51864c4 100644
index 9c1fef5..1d38bfe 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -1098,10 +1098,49 @@ class Panel : IBus.PanelService {
@@ -1098,10 +1098,51 @@ class Panel : IBus.PanelService {
public override void register_properties(IBus.PropList props) {
m_property_manager.set_properties(props);
@ -25,6 +25,7 @@ index 9c1fef5..51864c4 100644
+ update_input_mode_icon(prop.icon);
+ break;
+ }
+ i++;
+ }
}
@ -46,7 +47,8 @@ index 9c1fef5..51864c4 100644
+ if (icon_name[0] == '/') {
+ try {
+ // resize icon because icons were desinged for ibus tool bar of 1.4.x
+ var icon_img = new Gdk.Pixbuf.from_file_at_size(icon_name, m_status_icon.size, m_status_icon.size);
+ // use 24 px because icons are wrongly cropped on KDE
+ var icon_img = new Gdk.Pixbuf.from_file_at_size(icon_name, 24, 24);
+ m_status_icon.set_from_pixbuf(icon_img);
+ } catch (Error e) {
+ warning("could not load icon: %s", icon_name);