- up for 0.14

Changed files:
    xchat-gnome-long-delimiter.patch -> 1.2

diff --git a/xchat-gnome-long-delimiter.patch b/xchat-gnome-long-delimiter.patch
index 309b164bc79f7f7597bf7bc6a3682fdd771f4efc..fb3e7a6ae80d4b7f20021598f45a387afa1284e3 100644 (file)
--- a/xchat-gnome-long-delimiter.patch
+++ b/xchat-gnome-long-delimiter.patch
@@ -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 @@ diff -ur xchat-gnome-0.8-o/src/fe-gnome/xtext.c xchat-gnome-0.8/src/fe-gnome/xte
 +      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 @@ diff -ur xchat-gnome-0.8-o/src/fe-gnome/xtext.c xchat-gnome-0.8/src/fe-gnome/xte
        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