rpms/scim-bridge/devel .cvsignore, 1.32, 1.33 scim-bridge-0.4.15-hotkey-help.patch, 1.3, 1.4 scim-bridge.spec, 1.69, 1.70 sources, 1.32, 1.33

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/scim-bridge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12548

Modified Files:
	.cvsignore scim-bridge-0.4.15-hotkey-help.patch 
	scim-bridge.spec sources 
Log Message:
- update to 0.4.16
- recreate scim-bridge-0.4.15-hotkey-help.patch




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	29 Jan 2009 08:47:36 -0000	1.32
+++ .cvsignore	1 May 2009 23:57:02 -0000	1.33
@@ -1 +1 @@
-scim-bridge-0.4.15.2.tar.gz
+scim-bridge-0.4.16.tar.gz

scim-bridge-0.4.15-hotkey-help.patch:

Index: scim-bridge-0.4.15-hotkey-help.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/devel/scim-bridge-0.4.15-hotkey-help.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- scim-bridge-0.4.15-hotkey-help.patch	29 Jan 2009 08:37:09 -0000	1.3
+++ scim-bridge-0.4.15-hotkey-help.patch	1 May 2009 23:57:02 -0000	1.4
@@ -1,7 +1,7 @@
-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
+diff -up scim-bridge-0.4.16/agent/scim-bridge-agent.cpp.1-hotkey-help scim-bridge-0.4.16/agent/scim-bridge-agent.cpp
+--- scim-bridge-0.4.16/agent/scim-bridge-agent.cpp.1-hotkey-help	2009-03-08 23:07:29.000000000 +1000
++++ scim-bridge-0.4.16/agent/scim-bridge-agent.cpp	2009-05-02 09:49:03.000000000 +1000
+@@ -542,6 +542,27 @@ void ScimBridgeAgentImpl::slot_reload_co
      scim_global_config_flush ();
  
      scim_keyboard_layout = scim_get_default_keyboard_layout ();
@@ -29,9 +29,9 @@ diff -up scim-bridge-0.4.15/agent/scim-b
  }
  
  
-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
+diff -up scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.cpp.1-hotkey-help scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.cpp
+--- scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.cpp.1-hotkey-help	2009-02-04 00:36:14.000000000 +1000
++++ scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.cpp	2009-05-02 09:51:26.000000000 +1000
 @@ -60,6 +60,8 @@ static unsigned int imengine_id = 0;
  
  static bool on_the_spot_enabled = true;
@@ -41,7 +41,7 @@ diff -up scim-bridge-0.4.15/agent/scim-b
  /* Class definition */
  class ScimBridgeAgentIMContextImpl: public ScimBridgeAgentIMContext
  {
-@@ -273,6 +275,12 @@ void ScimBridgeAgentIMContext::set_on_th
+@@ -274,6 +276,12 @@ void ScimBridgeAgentIMContext::set_on_th
  }
  
  
@@ -52,9 +52,9 @@ diff -up scim-bridge-0.4.15/agent/scim-b
 +
 +
  ScimBridgeAgentIMContextImpl::ScimBridgeAgentIMContextImpl (ScimBridgeAgentClientListener *new_client_listener):
- client_listener (new_client_listener), imengine (NULL), enabled (false), preedit_mode (PREEDIT_ANY),
+ client_listener (new_client_listener), imengine (NULL), enabled (false), focused(false) ,preedit_mode (PREEDIT_ANY),
  preedit_shown (false), preedit_cursor_position (0)
-@@ -915,9 +923,11 @@ void ScimBridgeAgentIMContextImpl::panel
+@@ -923,9 +931,11 @@ void ScimBridgeAgentIMContextImpl::panel
  
  void ScimBridgeAgentIMContextImpl::panel_request_help ()
  {
@@ -69,9 +69,9 @@ diff -up scim-bridge-0.4.15/agent/scim-b
  
          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.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
+diff -up scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.h.1-hotkey-help scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.h
+--- scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.h.1-hotkey-help	2008-11-02 16:44:49.000000000 +1000
++++ scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.h	2009-05-02 09:49:03.000000000 +1000
 @@ -130,6 +130,21 @@ class ScimBridgeAgentIMContext
          static void set_enabled_by_default (bool enabled);
  


Index: scim-bridge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/devel/scim-bridge.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- scim-bridge.spec	3 Mar 2009 14:27:46 -0000	1.69
+++ scim-bridge.spec	1 May 2009 23:57:02 -0000	1.70
@@ -5,8 +5,8 @@
 
 Name:           scim-bridge
 
-Version:        0.4.15.2
-Release:        3%{?dist}
+Version:        0.4.16
+Release:        1%{?dist}
 Summary:        SCIM Bridge Gtk IM module
 
 Group:          System Environment/Libraries
@@ -76,7 +76,7 @@ This package provides the SCIM Bridge Qt
 
 
 %prep
-%setup -q -n %{name}-0.4.15
+%setup -q
 %patch0 -p1 -b .0-fix-gdm
 %patch1 -p1 -b .1-hotkey-help
 %patch2 -p1 -b .2-bz461373
@@ -151,6 +151,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat May  2 2009 Jens Petersen <petersen at redhat.com> - 0.4.16-1
+- update to 0.4.16
+- recreate scim-bridge-0.4.15-hotkey-help.patch
+
 * Tue Mar 03 2009 Caolán McNamara <caolanm at redhat.com> - 0.4.15.2-3
 - use -1 instead of EOF for ret of getopt_long
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	29 Jan 2009 08:47:36 -0000	1.32
+++ sources	1 May 2009 23:57:02 -0000	1.33
@@ -1 +1 @@
-9b401f68bbb6e4eb70cc043b52a75592  scim-bridge-0.4.15.2.tar.gz
+0011b178c4a0d2b0de26e7a14545323c  scim-bridge-0.4.16.tar.gz