rpms/kazehakase/devel kazehakase-rev3773-gtk021705.patch, NONE, 1.1 kazehakase.spec, 1.85, 1.86

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17206

Modified Files:
	kazehakase.spec 
Added Files:
	kazehakase-rev3773-gtk021705.patch 
Log Message:
* Tue Jul 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-14.svn3773_trunk
- Attempt to compile with GTK 2.17.5


kazehakase-rev3773-gtk021705.patch:
 kz-entry.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE kazehakase-rev3773-gtk021705.patch ---
Index: src/widget/kz-entry.c
===================================================================
--- src/widget/kz-entry.c	(revision 3773)
+++ src/widget/kz-entry.c	(working copy)
@@ -514,7 +514,7 @@
       
 		if (entry->visible)
 		{
-			g_string_prepend_len (tmp_string, entry->text, entry->n_bytes);
+			g_string_prepend_len (tmp_string, entry->text, -1);
 			g_string_insert (tmp_string, cursor_index, preedit_string);
 		}
 		else
@@ -523,7 +523,7 @@
 			gint preedit_len_chars;
 			gunichar invisible_char;
           
-			ch_len = g_utf8_strlen (entry->text, entry->n_bytes);
+			ch_len = g_utf8_strlen (entry->text, -1);
 			preedit_len_chars = g_utf8_strlen (preedit_string, -1);
 			ch_len += preedit_len_chars;
 
@@ -555,9 +555,9 @@
 	}
 	else
 	{
-		if (entry->visible)
+		if (entry->visible && entry->text)
 		{
-		pango_layout_set_text (layout, entry->text, entry->n_bytes);
+		pango_layout_set_text (layout, entry->text, -1);
 		}
 		else
 		{
@@ -1372,7 +1372,7 @@
 		
 		if (entry->backtext && 
 		    !GTK_WIDGET_HAS_FOCUS(widget) &&
-		    GTK_ENTRY(entry)->text[0] == '\0')
+		    ((! GTK_ENTRY(entry)->text) || GTK_ENTRY(entry)->text[0] == '\0'))
 		{
 			PangoLayout *layout;
 			layout = gtk_widget_create_pango_layout (widget, 


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- kazehakase.spec	1 Jul 2009 02:09:59 -0000	1.85
+++ kazehakase.spec	20 Jul 2009 18:01:30 -0000	1.86
@@ -34,7 +34,7 @@
 %define		svnver		3773_trunk
 
 
-%define		fedorarel	13
+%define		fedorarel	14
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -54,6 +54,7 @@ URL:		http://kazehakase.sourceforge.jp/
 Source0:	http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
 Patch11:	kazehakase-svn3756_trunk-workaround-rh447444.patch
 Patch14:	kazehakase-0.5.6-rev3769-embed-vendor-version.patch
+Patch15:	kazehakase-rev3773-gtk021705.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -181,6 +182,7 @@ This package uses WebKit for HTML render
 
 %patch11 -p0 -b .rhbug
 %patch14 -p1 -b .evr
+%patch15 -p0 -b .gtk
 
 %if %{need_autogen}
 sh autogen.sh
@@ -319,6 +321,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Tue Jul 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-14.svn3773_trunk
+- Attempt to compile with GTK 2.17.5
+
 * Wed Jul  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Rebuild