ooo-build r14670 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Mon Dec  1 13:41:18 2008
New Revision: 14670
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14670&view=rev

Log:
2008-12-01  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply
	* patches/dev300/accept-underscores-in-hostnames.diff
	* patches/dev300/accept-underscores-in-hostnames-m35.diff:
	Differentiate for m35 vs. m36 and later.



Added:
   trunk/patches/dev300/accept-underscores-in-hostnames-m35.diff
      - copied unchanged from r14669, /trunk/patches/dev300/accept-underscores-in-hostnames.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/accept-underscores-in-hostnames.diff
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/accept-underscores-in-hostnames.diff
==============================================================================
--- trunk/patches/dev300/accept-underscores-in-hostnames.diff	(original)
+++ trunk/patches/dev300/accept-underscores-in-hostnames.diff	Mon Dec  1 13:41:18 2008
@@ -83,18 +83,18 @@
  					++nLabels;
  					eState = STATE_LABEL;
 @@ -5324,7 +5324,7 @@
- 
  			case STATE_LABEL:
  				if (p != pEnd)
+                 {
 -					if (INetMIME::isAlphanumeric(*p))
 +					if (INetMIME::isAlphanumeric(*p) || *p == '_')
  						break;
  					else if (*p == '.')
  					{
 @@ -5342,7 +5342,7 @@
- 
  			case STATE_HYPHEN:
  				if (p != pEnd)
+                 {
 -					if (INetMIME::isAlphanumeric(*p))
 +					if (INetMIME::isAlphanumeric(*p) || *p == '_')
  					{

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Dec  1 13:41:18 2008
@@ -540,8 +540,10 @@
 ooo80816.selinux.bridges.diff, i#80816
 
 
-[ Win32Only ]
+[ Win32Only < dev300-m36 ]
+accept-underscores-in-hostnames-m35.diff, n#182422, tml
 
+[ Win32Only >= dev300-m36 ]
 accept-underscores-in-hostnames.diff, n#182422, tml