rpms/scim-qtimm/devel scim-qtimm-suse116220-keyboard-layout.patch, NONE, 1.1 scim-qtimm-suse206547-scim-qtimm-crash.patch, NONE, 1.1 scim-qtimm.spec, 1.13, 1.14

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/pkgs/rpms/scim-qtimm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22323

Modified Files:
	scim-qtimm.spec 
Added Files:
	scim-qtimm-suse116220-keyboard-layout.patch 
	scim-qtimm-suse206547-scim-qtimm-crash.patch 
Log Message:
- add a couple of patches from openSUSE:
  scim-qtimm-suse116220-keyboard-layout.patch and
  scim-qtimm-suse206547-scim-qtimm-crash.patch


scim-qtimm-suse116220-keyboard-layout.patch:

--- NEW FILE scim-qtimm-suse116220-keyboard-layout.patch ---
--- scim-qtimm/src/qsciminputcontext.cpp.old       2005-09-10 02:01:59.000000000 +0800
+++ scim-qtimm/src/qsciminputcontext.cpp   2005-09-10 02:02:13.000000000 +0800
@@ -714,6 +714,7 @@
     scimkey = scim_x11_keyevent_x11_to_scim(global.display, xkey);

     scimkey.mask  &= global.valid_key_mask;
+    scimkey.layout = global.keyboard_layout;

     return filterScimEvent(scimkey);
 }


scim-qtimm-suse206547-scim-qtimm-crash.patch:

--- NEW FILE scim-qtimm-suse206547-scim-qtimm-crash.patch ---
--- scim-qtimm-0.9.4/src/qsciminputcontext.cpp	2006-12-20 09:56:19.000000000 +0800
+++ scim-qtimm-0.9.4.new/src/qsciminputcontext.cpp	2006-12-20 10:00:55.000000000 +0800
@@ -659,6 +659,9 @@
     if (global.shared_input_method)
         m_is_on = global.config->read (String (SCIM_CONFIG_FRONTEND_IM_OPENED_BY_DEFAULT), m_is_on);
 
+    // Associate this context with the instance.
+    m_instance->set_frontend_data (static_cast<void*> (this));
+
     global.panel_client->prepare (m_id);
     global.panel_client->register_input_context (m_id, m_instance->get_factory_uuid ());
     set_ic_capabilities ();
@@ -902,6 +905,7 @@
         if (!global.panel_exited) {
             global.panel_client->prepare (m_id);
  
+	    m_instance->set_frontend_data (static_cast<void*>(this));
             if (global.focused_ic == this)
                 m_instance->focus_out ();
  
@@ -912,6 +916,7 @@
             QScimInputContext *old_focused = global.focused_ic;
             global.focused_ic = this;
             // XXX: Free the smart pointer, not reset the instance.
+	    m_instance->set_frontend_data (0);
             m_instance.reset ();
             global.focused_ic = old_focused;
  
@@ -923,6 +928,7 @@
             global.panel_client->remove_input_context (m_id);
             global.panel_client->send ();
         } else {
+	    m_instance->set_frontend_data (0);
             m_instance.reset ();
         }
     }


Index: scim-qtimm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-qtimm/devel/scim-qtimm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- scim-qtimm.spec	19 Jun 2007 02:36:50 -0000	1.13
+++ scim-qtimm.spec	1 Aug 2007 04:59:30 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           scim-qtimm
 Version:        0.9.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        SCIM input method module for Qt
 
 License:        GPL
@@ -17,6 +17,8 @@
 Requires:       scim >= 1.4.5-8
 Requires:       qt >= 3.3.6
 Patch1:         scim-qtimm-0.9.4-silence-debug-output-244200.patch
+Patch2:         scim-qtimm-suse116220-keyboard-layout.patch
+Patch3:         scim-qtimm-suse206547-scim-qtimm-crash.patch
 
 %description
 SCIM input method module for Qt
@@ -25,6 +27,8 @@
 %prep
 %setup -q
 %patch1 -p1 -b .1-debug
+%patch2 -p1 -b .2-kbd
+%patch3 -p1 -b .1-crash
 
 
 %build
@@ -52,6 +56,11 @@
 
 
 %changelog
+* Wed Aug  1 2007 Jens Petersen <petersen at dhcp-65.brisbane.redhat.com> - 0.9.4-8
+- add a couple of patches from openSUSE:
+  scim-qtimm-suse116220-keyboard-layout.patch and
+  scim-qtimm-suse206547-scim-qtimm-crash.patch
+
 * Mon Jun 18 2007 Jens Petersen <petersen at redhat.com> - 0.9.4-7
 - add scim-qtimm-0.9.4-silence-debug-output-244200.patch to silence kconfig
   and ScimInputContextPlugin output from KDE apps