[or-cvs] r14340: Set eol-style:native on patch file (torbrowser/trunk/src/current-patches)

[sjm217@xxxxxxxx]

Author: sjm217
Date: 2008-04-09 17:21:45 -0400 (Wed, 09 Apr 2008)
New Revision: 14340

Modified:
   torbrowser/trunk/src/current-patches/vidalia-miniupnp.patch
Log:
Set eol-style:native on patch file

Modified: torbrowser/trunk/src/current-patches/vidalia-miniupnp.patch
===================================================================
--- torbrowser/trunk/src/current-patches/vidalia-miniupnp.patch	2008-04-09 20:43:21 UTC (rev 14339)
+++ torbrowser/trunk/src/current-patches/vidalia-miniupnp.patch	2008-04-09 21:21:45 UTC (rev 14340)
@@ -1,8 +1,8 @@
-Index: src/vidalia/config/serversettings.cpp
-===================================================================
---- src/vidalia/config/serversettings.cpp	(revision 2498)
-+++ src/vidalia/config/serversettings.cpp	(working copy)
-@@ -137,7 +137,7 @@
+Index: src/vidalia/config/serversettings.cpp
+===================================================================
+--- src/vidalia/config/serversettings.cpp	(revision 2498)
++++ src/vidalia/config/serversettings.cpp	(working copy)
+@@ -137,7 +137,7 @@
    if (isServerEnabled()) {
      /* Configure UPnP device to forward DirPort and OrPort */
      /* TODO: does isServerEnabled() return true when a server is just set up? */
@@ -11,7 +11,7 @@
      rc = torControl()->setConf(confValues(), errmsg);
    } else { 
      QStringList resetKeys;
-@@ -156,6 +156,7 @@
+@@ -156,6 +156,7 @@
                  << SETTING_BANDWIDTH_BURST;
      }
      rc = torControl()->resetConf(resetKeys, errmsg);
@@ -19,7 +19,7 @@
    }
    return rc;
  }
-@@ -165,11 +166,16 @@
+@@ -165,11 +166,16 @@
  /* TODO: init_upnp() will block for up to 2 seconds. We should fire off a thread */
  /** Configure UPnP device to forward DirPort and ORPort */
  void
@@ -38,11 +38,11 @@
  #endif
  }
  
-Index: src/vidalia/config/serversettings.h
-===================================================================
---- src/vidalia/config/serversettings.h	(revision 2498)
-+++ src/vidalia/config/serversettings.h	(working copy)
-@@ -93,7 +93,7 @@
+Index: src/vidalia/config/serversettings.h
+===================================================================
+--- src/vidalia/config/serversettings.h	(revision 2498)
++++ src/vidalia/config/serversettings.h	(working copy)
+@@ -93,7 +93,7 @@
    QHash<QString,QString> confValues();
  
    /** Configure UPnP device to forward DirPort and ORPort */
@@ -51,11 +51,11 @@
  };
  
  #endif
-Index: src/vidalia/config/upnpcontrol.cpp
-===================================================================
---- src/vidalia/config/upnpcontrol.cpp	(revision 2498)
-+++ src/vidalia/config/upnpcontrol.cpp	(working copy)
-@@ -27,6 +27,7 @@
+Index: src/vidalia/config/upnpcontrol.cpp
+===================================================================
+--- src/vidalia/config/upnpcontrol.cpp	(revision 2498)
++++ src/vidalia/config/upnpcontrol.cpp	(working copy)
+@@ -27,6 +27,7 @@
  UPNPControl::UPNPControl()
  {
    init_upnp();
@@ -63,7 +63,7 @@
  }
  
  int
-@@ -68,9 +69,42 @@
+@@ -68,9 +69,42 @@
    
    // Output the mapping
    printf("(external):%s -> %s:%s\n", sPort, intClient, intPort);
@@ -106,7 +106,7 @@
  /** Based on http://miniupnp.free.fr/files/download.php?file=xchat-upnp20061022.patch */
  void
  UPNPControl::init_upnp()
-@@ -78,52 +112,13 @@
+@@ -78,52 +112,13 @@
    struct UPNPDev * devlist;
    int retval;
  
@@ -161,11 +161,11 @@
 -	sprintf(port_str, "%d", port);
 -	UPNP_DeletePortMapping(urls.controlURL, data.servicetype, port_str, "TCP");
 -}
-Index: src/vidalia/config/upnpcontrol.h
-===================================================================
---- src/vidalia/config/upnpcontrol.h	(revision 2498)
-+++ src/vidalia/config/upnpcontrol.h	(working copy)
-@@ -31,6 +31,7 @@
+Index: src/vidalia/config/upnpcontrol.h
+===================================================================
+--- src/vidalia/config/upnpcontrol.h	(revision 2498)
++++ src/vidalia/config/upnpcontrol.h	(working copy)
+@@ -31,6 +31,7 @@
  public:
    static UPNPControl* Instance();
    int forwardPort(quint16 port);
@@ -173,7 +173,7 @@
  protected:
    UPNPControl();
  private:
-@@ -43,6 +44,9 @@
+@@ -43,6 +44,9 @@
    void init_upnp();
    void upnp_add_redir (const char * addr, int port);
    void upnp_rem_redir(int port);


Property changes on: torbrowser/trunk/src/current-patches/vidalia-miniupnp.patch
___________________________________________________________________
Name: svn:eol-style
   + native