rpms/scim-bridge/F-9 scim-bridge-0.4.15-hotkey-help.patch, 1.1, 1.2 scim-bridge.spec, 1.63, 1.64
Huang Peng
phuang at fedoraproject.org
Sun Sep 28 05:53:30 UTC 2008
Author: phuang
Update of /cvs/pkgs/rpms/scim-bridge/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27299
Modified Files:
scim-bridge-0.4.15-hotkey-help.patch scim-bridge.spec
Log Message:
Back port from devel branch
scim-bridge-0.4.15-hotkey-help.patch:
Index: scim-bridge-0.4.15-hotkey-help.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/F-9/scim-bridge-0.4.15-hotkey-help.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-bridge-0.4.15-hotkey-help.patch 7 Mar 2008 07:27:27 -0000 1.1
+++ scim-bridge-0.4.15-hotkey-help.patch 28 Sep 2008 05:53:00 -0000 1.2
@@ -1,6 +1,37 @@
-diff -up scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp.hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp
---- scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp.hotkey-help 2007-11-07 18:48:45.000000000 +0800
-+++ scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp 2008-03-07 15:21:25.000000000 +0800
+diff -up scim-bridge-0.4.15/agent/scim-bridge-agent.cpp.1-hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent.cpp
+--- scim-bridge-0.4.15/agent/scim-bridge-agent.cpp.1-hotkey-help 2008-02-24 10:08:43.000000000 +1000
++++ scim-bridge-0.4.15/agent/scim-bridge-agent.cpp 2008-06-23 10:55:39.000000000 +1000
+@@ -529,6 +529,27 @@ void ScimBridgeAgentImpl::slot_reload_co
+ scim_global_config_flush ();
+
+ scim_keyboard_layout = scim_get_default_keyboard_layout ();
++
++ // Hot key name, hot key config key.
++ // ! Update hotkey_list_length according to updated list length.
++ int hotkey_list_length = 6;
++ String hotkey_list[][2] = {
++ { _("Toggle on/off - "), "/Hotkeys/FrontEnd/Trigger" },
++ { _("Turn on - "), "/Hotkeys/FrontEnd/On" },
++ { _("Turn off - "), "/Hotkeys/FrontEnd/Off" },
++ { _("Next input method - "), "/Hotkeys/FrontEnd/NextFactory" },
++ { _("Previous input method - "), "/Hotkeys/FrontEnd/PreviousFactory" },
++ { _("Show input method menu - "), "/Hotkeys/FrontEnd/ShowFactoryMenu" }
++ };
++
++ // Undefined hot keys are hidden from help window.
++ String help_hotkeys = "\nGlobal Hotkeys:";
++ for ( int i = 0; i < hotkey_list_length; i++ ) {
++ String tmp_hotkeys = scim_config->read (String (hotkey_list[i][1]), String (""));
++ if ( tmp_hotkeys != "" )
++ help_hotkeys += "\n" + hotkey_list[i][0] + "<" + tmp_hotkeys + ">";
++ }
++ ScimBridgeAgentIMContext::set_help_hotkeys (help_hotkeys);
+ }
+
+
+diff -up scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp.1-hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp
+--- scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp.1-hotkey-help 2007-11-07 20:48:45.000000000 +1000
++++ scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp 2008-06-23 09:44:58.000000000 +1000
@@ -60,6 +60,8 @@ static unsigned int imengine_id = 0;
static bool on_the_spot_enabled = true;
@@ -10,15 +41,7 @@
/* Class definition */
class ScimBridgeAgentIMContextImpl: public ScimBridgeAgentIMContext
{
-@@ -137,6 +139,7 @@ class ScimBridgeAgentIMContextImpl: publ
- void alloc_imengine ();
- void free_imengine ();
-
-+
- private:
-
- scim_bridge_imcontext_id_t id;
-@@ -273,6 +276,17 @@ void ScimBridgeAgentIMContext::set_on_th
+@@ -273,6 +275,12 @@ void ScimBridgeAgentIMContext::set_on_th
}
@@ -27,29 +50,28 @@
+ help_hotkeys = hotkey_str;
+}
+
-+String ScimBridgeAgentIMContext::get_help_hotkeys ()
-+{
-+ return help_hotkeys;
-+}
-+
+
ScimBridgeAgentIMContextImpl::ScimBridgeAgentIMContextImpl (ScimBridgeAgentClientListener *new_client_listener):
client_listener (new_client_listener), imengine (NULL), enabled (false), preedit_mode (PREEDIT_ANY),
preedit_shown (false), preedit_cursor_position (0)
-@@ -917,7 +931,9 @@ void ScimBridgeAgentIMContextImpl::panel
+@@ -915,9 +923,11 @@ void ScimBridgeAgentIMContextImpl::panel
+
+ void ScimBridgeAgentIMContextImpl::panel_request_help ()
{
- String help = String (_ ("Smart Common Input Method platform ")) +
- String (SCIM_VERSION) +
+- String help = String (_ ("Smart Common Input Method platform ")) +
+- String (SCIM_VERSION) +
- String (_ ("\n(C) 2002-2005 James Su <suzhe at tsinghua.org.cn>\n\n"));
-+ String (_ ("\n(C) 2002-2005 James Su <suzhe at tsinghua.org.cn>\n\n")) +
++ String help = String (_ ("SCIM Bridge")) +
++ String (VERSION) +
++ String (_ ("\n(C) 2006-2008 Ryo Dairiki <ryo-dairiki at users.sourceforge.net>\n")) +
+ help_hotkeys +
+ String ("\n\n");
IMEngineFactoryPointer factory = scim_backend->get_factory (get_imengine ()->get_factory_uuid ());
if (factory.null ()) factory = fallback_imengine_factory;
-diff -up scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h.hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h
---- scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h.hotkey-help 2007-06-02 11:33:48.000000000 +0800
-+++ scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h 2008-03-07 15:19:12.000000000 +0800
+diff -up scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h.1-hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h
+--- scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h.1-hotkey-help 2007-06-02 13:33:48.000000000 +1000
++++ scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h 2008-06-23 09:44:58.000000000 +1000
@@ -130,6 +130,21 @@ class ScimBridgeAgentIMContext
static void set_enabled_by_default (bool enabled);
@@ -72,30 +94,3 @@
* Destructor.
*/
virtual ~ScimBridgeAgentIMContext () {}
-diff -up scim-bridge-0.4.15/agent/scim-bridge-agent.cpp.hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent.cpp
---- scim-bridge-0.4.15/agent/scim-bridge-agent.cpp.hotkey-help 2008-02-24 08:08:43.000000000 +0800
-+++ scim-bridge-0.4.15/agent/scim-bridge-agent.cpp 2008-03-07 15:22:27.000000000 +0800
-@@ -529,6 +529,23 @@ void ScimBridgeAgentImpl::slot_reload_co
- scim_global_config_flush ();
-
- scim_keyboard_layout = scim_get_default_keyboard_layout ();
-+
-+ String help_hotkeys;
-+
-+ help_hotkeys = String (_ ("\nGlobal Hotkeys:")) +
-+ String (_ ("\n\nTrigger: ")) +
-+ scim_config->read (String ("/Hotkeys/FrontEnd/Trigger"), String ("Unable to be loaded.")) +
-+ String (_ ("\n\nTurn on: ")) +
-+ scim_config->read (String ("/Hotkeys/FrontEnd/On"), String ("Unable to be loaded.")) +
-+ String (_ ("\n\nTurn off: ")) +
-+ scim_config->read (String ("/Hotkeys/FrontEnd/Off"), String ("Unable to be loaded.")) +
-+ String (_ ("\n\nNext input method: ")) +
-+ scim_config->read (String ("/Hotkeys/FrontEnd/NextFactory"), String ("Unable to be loaded.")) +
-+ String (_ ("\n\nPrevious input method: ")) +
-+ scim_config->read (String ("/Hotkeys/FrontEnd/PreviousFactory"), String ("Unable to be loaded."));
-+ String (_ ("\n\nShow input method menu: ")) +
-+ scim_config->read (String ("/Hotkeys/FrontEnd/ShowFactoryMenu"), String ("Unable to be loaded."));
-+ ScimBridgeAgentIMContext::set_help_hotkeys (help_hotkeys);
- }
-
-
Index: scim-bridge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/F-9/scim-bridge.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- scim-bridge.spec 3 Apr 2008 06:52:30 -0000 1.63
+++ scim-bridge.spec 28 Sep 2008 05:53:00 -0000 1.64
@@ -6,7 +6,7 @@
Name: scim-bridge
Version: 0.4.15
-Release: 5%{?dist}
+Release: 7%{?dist}
Summary: SCIM Bridge Gtk IM module
Group: System Environment/Libraries
@@ -25,6 +25,7 @@
Requires: scim >= 1.4.6
Patch0: scim-bridge-0.4.15-fix-gdm.patch
Patch1: scim-bridge-0.4.15-hotkey-help.patch
+Patch2: scim-bridge-0.4.15-bz461373.patch
%description
@@ -77,6 +78,7 @@
%setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}}
%patch0 -p1 -b .0-fix-gdm
%patch1 -p1 -b .1-hotkey-help
+%patch2 -p1 -b .2-bz461373
%if %{snapshot}
mkdir m4
@@ -147,6 +149,12 @@
%changelog
+* Tue Sep 16 2008 Huang Peng <phuang at redhat.com> - 0.4.15-7
+- Resolves: bug 461373 (Focus switch causes selected text to be deleted)
+
+* Mon Apr 21 2008 Caius Chance <cchance at redhat.com> - 0.4.15-6
+- Resolves: rhbz#199389 (Add global hotkey list in help window.)
+
* Thu Apr 03 2008 Huang Peng <phuang at redhat.com> -0.4.15-5
- Updated Obsoletes in spec file to fix some potential problems.
More information about the fedora-extras-commits
mailing list