This commit was manufactured by cvs2git to create branch 'AC-branch'.

Sprout from master 2006-03-01 02:58:21 UTC aredridel <aredridel@pld-linux.org> '- up to 0.10'
Cherrypick from master 2004-11-12 23:10:46 UTC aredridel <aredridel@pld-linux.org> '- added.':
    xchat-domains.patch -> 1.1
Delete:
    xchat-gnome-gtk-2.8.9.patch

diff --git a/xchat-domains.patch b/xchat-domains.patch
index 4d0daa1fee0191c1860eadd7ebaa93c78542e8a6..30393b39a59a6a685c35a5d99469213b123f64dc 100644 (file)
--- a/xchat-domains.patch
+++ b/xchat-domains.patch
@@ -1,10 +1,31 @@
---- xchat-2.6.0/src/common/url.c~      2005-11-07 14:34:00.810809152 +0100
-+++ xchat-2.6.0/src/common/url.c       2005-11-07 14:35:17.607134336 +0100
-@@ -150,6 +150,7 @@
-               { D(".html") },
-               { D(".info") },
-               { D(".name") },
-+              { D(".biz") },
-       };
- #undef D
-       const char *at, *dot;
+diff -ur o-xchat-2.4.0/src/common/text.c xchat-2.4.0/src/common/text.c
+--- o-xchat-2.4.0/src/common/text.c    2004-08-11 05:00:42.000000000 -0600
++++ xchat-2.4.0/src/common/text.c      2004-11-12 16:04:19.470096463 -0700
+@@ -178,9 +178,27 @@
+       if (!strncasecmp (word + len - 4, ".com", 4))
+               return WORD_HOST;
+ 
++      if (!strncasecmp (word + len - 4, ".biz", 4))
++              return WORD_HOST;
++
++      if (!strncasecmp (word + len - 5, ".name", 5))
++              return WORD_HOST;
++
++      if (!strncasecmp (word + len - 5, ".info", 5))
++              return WORD_HOST;
++
+       if (!strncasecmp (word + len - 4, ".edu", 4))
+               return WORD_HOST;
+ 
++      if (!strncasecmp (word + len - 3, ".us", 3))
++              return WORD_HOST;
++
++      if (!strncasecmp (word + len - 3, ".uk", 3))
++              return WORD_HOST;
++
++      if (!strncasecmp (word + len - 3, ".jp", 3))
++              return WORD_HOST;
++
+       if (len > 5)
+       {
+               if (word[len - 3] == '.' &&

diff --git a/xchat-gnome-gtk-2.8.9.patch b/xchat-gnome-gtk-2.8.9.patch
deleted file mode 100644 (file)
index 3150c8b..0000000
--- a/xchat-gnome-gtk-2.8.9.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur xchat-gnome-0.7-0/src/fe-gnome/navigation-tree.c xchat-gnome-0.7/src/fe-gnome/navigation-tree.c
---- xchat-gnome-0.7-0/src/fe-gnome/navigation-tree.c   2005-11-13 23:50:10.000000000 -0700
-+++ xchat-gnome-0.7/src/fe-gnome/navigation-tree.c     2005-12-17 19:00:21.000000000 -0700
-@@ -1053,7 +1053,7 @@
- 
-       treeview = GTK_TREE_VIEW (glade_xml_get_widget (gui.xml, "userlist"));
- 
--      if (gui.server_tree->current_path != NULL)
-+      if (gui.server_tree && gui.server_tree->current_path != NULL)
-               navigation_model_path_deref (gui.server_tree->model, gui.server_tree->current_path);
- 
-       /* XXX: This sets model to be the GtkTreeModelSort used by the NavTree, it is