SOURCES: xchat-gnome-long-delimiter.patch - up for 0.14

[aredridel]

Author: aredridel                    Date: Sun Oct 29 04:34:37 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up for 0.14

---- Files affected:
SOURCES:
   xchat-gnome-long-delimiter.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/xchat-gnome-long-delimiter.patch
diff -u SOURCES/xchat-gnome-long-delimiter.patch:1.1 SOURCES/xchat-gnome-long-delimiter.patch:1.2
--- SOURCES/xchat-gnome-long-delimiter.patch:1.1	Wed Dec 21 05:40:15 2005
+++ SOURCES/xchat-gnome-long-delimiter.patch	Sun Oct 29 05:34:32 2006
@@ -1,8 +1,8 @@
-diff -ur xchat-gnome-0.8-o/src/fe-gnome/xtext.c xchat-gnome-0.8/src/fe-gnome/xtext.c
---- xchat-gnome-0.8-o/src/fe-gnome/xtext.c	2005-11-26 16:26:03.000000000 -0700
-+++ xchat-gnome-0.8/src/fe-gnome/xtext.c	2005-12-20 21:36:01.000000000 -0700
-@@ -80,9 +80,16 @@
- #include "marshallers.h"
+diff -ur xchat-gnome-0.14-o/src/fe-gnome/xtext.c xchat-gnome-0.14/src/fe-gnome/xtext.c
+--- xchat-gnome-0.14-o/src/fe-gnome/xtext.c	2006-10-15 17:19:09.000000000 -0600
++++ xchat-gnome-0.14/src/fe-gnome/xtext.c	2006-10-28 21:55:54.000000000 -0600
+@@ -64,9 +64,16 @@
+ #include "xg-marshal.h"
  
  /* is delimiter */
 -#define is_del(c) \
@@ -19,9 +19,9 @@
 +	return ret;
 +}
  
- #ifdef SCROLL_HACK
  /* force scrolling off */
-@@ -1802,6 +1809,7 @@
+ #define dontscroll(buf) (buf)->last_pixel_pos = 0x7fffffff
+@@ -1576,6 +1583,7 @@
  	int offset;
  	unsigned char *str;
  	unsigned char *word;
@@ -29,37 +29,39 @@
  	int len;
  	int out_of_bounds = 0;
  
-@@ -1822,16 +1830,17 @@
+@@ -1586,16 +1594,16 @@
  
  	str = ent->str + offset;
  
--	while (!is_del (*str) && str != ent->str)
+-	while (!is_del (*str) && str != ent->str) {
 -		str--;
+-	}
 -	word = str + 1;
-+	while (!is_del(str))
-+		str = g_utf8_prev_char(str);
-+	word = g_utf8_next_char(str);
++ 	while (!is_del(str))
++ 		str = g_utf8_prev_char(str);
++ 	word = g_utf8_next_char(str);
  
  	len = 0;
  	str = word;
--	while (!is_del (*str) && len != ent->str_len)
-+	while (!is_del(str) && len != ent->str_len)
- 	{
+-	while (!is_del (*str) && len != ent->str_len) {
 -		str++;
 -		len++;
-+		nstr = g_utf8_next_char(str);
-+		len += nstr - str;
-+		str = nstr;
++ 	while (!is_del(str) && len != ent->str_len) {
++ 		nstr = g_utf8_next_char(str);
++ 		len += nstr - str;
++ 		str = nstr;
  	}
  
- 	if (len > 0 && word[len-1]=='.')
-@@ -3835,7 +3844,7 @@
+ 	if (len > 0 && word[len-1]=='.') {
+@@ -3452,7 +3460,7 @@
  				}
  
  				/* keep a record of the last space, for wordwrapping */
--				if (is_del (*str))
-+				if (g_unichar_isspace(g_utf8_get_char(str)))
- 				{
+-				if (is_del (*str)) {
++ 				if (g_unichar_isspace(g_utf8_get_char(str))) {
  					last_space = str;
  					limit_offset = 0;
-Only in xchat-gnome-0.8/src/fe-gnome: xtext.c.orig
+ 				}
+Only in xchat-gnome-0.14/src/fe-gnome: xtext.c~
+Only in xchat-gnome-0.14/src/fe-gnome: xtext.c.orig
+Only in xchat-gnome-0.14/src/fe-gnome: xtext.c.rej
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/xchat-gnome-long-delimiter.patch?r1=1.1&r2=1.2&f=u