rpms/ibus-sayura/F-11 dual_matra_problem.patch, 1.2, 1.3 ibus-sayura.spec, 1.3, 1.4

[Pravin Satpute]

Author: pravins

Update of /cvs/pkgs/rpms/ibus-sayura/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28487

Modified Files:
	dual_matra_problem.patch ibus-sayura.spec 
Log Message:
* Thu Jul 2 2009 Pravin Satpute <psatpute at redhat.com> - @VERSON at -4
- bugfix 507209, 509347, 509346


dual_matra_problem.patch:

Index: dual_matra_problem.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-sayura/F-11/dual_matra_problem.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dual_matra_problem.patch	29 Jun 2009 07:23:35 -0000	1.2
+++ dual_matra_problem.patch	2 Jul 2009 12:57:48 -0000	1.3
@@ -1,32 +1,49 @@
 diff -rup ibus-sayura-1.0.0.20090326/src/engine.c ibus-sayura-1.0.0.20090326_mod/src/engine.c
 --- ibus-sayura-1.0.0.20090326/src/engine.c	2009-03-26 16:01:40.000000000 +0530
-+++ ibus-sayura-1.0.0.20090326_mod/src/engine.c	2009-06-26 18:31:48.000000000 +0530
-@@ -204,7 +204,7 @@ ibus_sinhala_engine_init (IBusSinhalaEng
- 
-     sinhala->prop_list = ibus_prop_list_new ();
-     ibus_prop_list_append (sinhala->prop_list,  sinhala->sinhala_mode_prop);
--    sinhala->buffer = g_array_new (TRUE, TRUE, sizeof(gunichar *));
-+    sinhala->buffer = g_array_new (TRUE, TRUE, sizeof(gunichar));
- }
- 
- static GObject*
++++ ibus-sayura-1.0.0.20090326_mod/src/engine.c	2009-07-02 17:27:17.000000000 +0530
 @@ -252,8 +252,8 @@ ibus_sinhala_engine_update_preedit_text 
      if(sinhala->buffer->len>0){
          uni_array = (gunichar *)sinhala->buffer->data;
          text = ibus_text_new_from_ucs4(uni_array);
 -        ibus_text_append_attribute (text, IBUS_ATTR_TYPE_FOREGROUND, 0x00ffffff, 0, -1);
 -	ibus_text_append_attribute (text, IBUS_ATTR_TYPE_BACKGROUND, 0x00000000, 0, -1);
-+//        ibus_text_append_attribute (text, IBUS_ATTR_TYPE_FOREGROUND, 0x00ffffff, 0, -1);
++        ibus_text_append_attribute (text, IBUS_ATTR_TYPE_UNDERLINE, 1, 0, -1);
 +//	ibus_text_append_attribute (text, IBUS_ATTR_TYPE_BACKGROUND, 0x00000000, 0, -1);
  	ibus_engine_update_preedit_text ((IBusEngine *)sinhala,
  	    	                                         text,
  		                                         ibus_text_get_length (text),
-@@ -564,7 +564,7 @@ static gboolean ibus_sinhala_handle_vowe
+@@ -295,10 +295,9 @@ ibus_sinhala_engine_process_key_event (I
+     }
+ 
+ 
+-
+     if (keyval == IBUS_space && modifiers == 0 && sinhala->buffer->len >0) {
+         ibus_sinhala_commit_preedit_to_ibus(sinhala);
+-        return TRUE;
++        return FALSE;
+     }
+ 
+     c = ibus_sinhala_find_consonent_by_key(keyval);
+@@ -309,6 +308,13 @@ ibus_sinhala_engine_process_key_event (I
+     if (c >= 0) /* a consonent is pressed. */
+         return ibus_sinhala_handle_vowel_pressed (sinhala, keyval, c);
+ 
++    if (keyval == IBUS_Shift_L || keyval == IBUS_Shift_L ) {
++        return FALSE;
++    }
++
++    if (sinhala->buffer->len >0)
++	        ibus_sinhala_commit_preedit_to_ibus(sinhala);
++
+     return FALSE;
+ }
+ 
+@@ -564,7 +570,7 @@ static gboolean ibus_sinhala_handle_vowe
  	}        
          else { 
              /* look for a previous character first. */
 -		c1 = g_array_index(sinhala->buffer, gunichar,0);
-+		c1 = g_array_index(sinhala->buffer, gunichar,sinhala->buffer->len-1);
++		c1 = g_array_index(sinhala->buffer, gunichar,(sinhala->buffer->len-1));
  
  		if (ibus_sinhala_is_consonent(c1)) {
  			g_array_append_val(sinhala->buffer, vowels[c].single1);


Index: ibus-sayura.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-sayura/F-11/ibus-sayura.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ibus-sayura.spec	29 Jun 2009 07:23:36 -0000	1.3
+++ ibus-sayura.spec	2 Jul 2009 12:57:48 -0000	1.4
@@ -45,8 +45,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
-* Mon Jun 29 2009 Pravin Satpute <pravin.d.s at gmail.com> - @VERSON at -4
-- fix for bug 507209
+* Thu Jul 2 2009 Pravin Satpute <psatpute at redhat.com> - @VERSON at -4
+- bugfix 507209, 509347, 509346
 
 * Thu Mar 26 2009 Pravin Satpute <pravin.d.s at gmail.com> - @VERSON at -2
 - updated as per fedora spec review