Changeset 2639

Show
Ignore:
Timestamp:
06/01/08 19:42:57 (6 months ago)
Author:
edmanm
Message:

r413@thebe: edmanm | 2008-06-01 19:31:12 -0400
Merge the UPnP test dialog and related files into trunk.

Location:
vidalia/trunk
Files:
3 modified
5 copied

Legend:

Unmodified
Added
Removed
  • vidalia/trunk/LICENSE

    r2362 r2639  
    7373 
    7474http://creativecommons.org/licenses/by-sa/2.5/legalcode 
     75 
     76=================================================================== 
     77 
     78Vidalia incorporates icons from KDE's Oxygen icon theme. It is 
     79licensed as follows: 
     80 
     81    Copyright (C) 2007 David Vignoni <david@icon-king.com> 
     82    Copyright (C) 2007 Johann Ollivier Lapeyre <johann@oxygen-icons.org> 
     83    Copyright (C) 2007 Kenneth Wimer <kwwii@bootsplash.org> 
     84    Copyright (C) 2007 Nuno Fernades Pinheiro <nf.pinheiro@gmail.com> 
     85    Copyright (C) 2007 Riccardo Iaconelli <riccardo@oxygen-icons.org> 
     86    Copyright (C) 2007 David Miller <miller@oxygen-icons.org> 
     87 
     88and others 
     89 
     90This library is free software; you can redistribute it and/or 
     91modify it under the terms of the GNU Library General Public 
     92License as published by the Free Software Foundation; either 
     93version 3 of the License, or (at your option) any later version. 
     94 
     95This library is distributed in the hope that it will be useful, 
     96but WITHOUT ANY WARRANTY; without even the implied warranty of 
     97MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
     98Library General Public License for more details. 
     99 
     100You should have received a copy of the GNU Library General Public 
     101License along with this library. If not, see <http://www.gnu.org/licenses/>. 
    75102 
    76103=================================================================== 
     
    204231DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
    205232 
     233=============================================================================== 
     234 
     235Vidalia uses the MiniUPnPc library for UPnP support. It is licensed as 
     236follows: 
     237 
     238  Copyright (c) 2005-2007, Thomas BERNARD  
     239 
     240Redistribution and use in source and binary forms, with or without 
     241modification, are permitted provided that the following conditions are 
     242met: 
     243 
     244    * Redistributions of source code must retain the above copyright 
     245      notice, this list of conditions and the following disclaimer. 
     246 
     247    * Redistributions in binary form must reproduce the above 
     248      copyright notice, this list of conditions and the following 
     249      disclaimer in the documentation and/or other materials 
     250      provided with the distribution. 
     251 
     252    * Neither the names of the copyright owners nor the names of its 
     253      contributors may be used to endorse or promote products derived from 
     254      this software without specific prior written permission. 
     255 
     256THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
     257"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
     258LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
     259A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
     260OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
     261SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
     262LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
     263DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
     264THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
     265(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
     266OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
     267 
  • vidalia/trunk/src/vidalia/CMakeLists.txt

    r2638 r2639  
    9595    config/upnpcontrol.cpp 
    9696    config/upnpcontrolthread.cpp 
     97    config/upnptestdialog.cpp 
    9798  ) 
    9899  qt4_wrap_cpp(vidalia_SRCS 
    99100    config/upnpcontrol.h 
    100101    config/upnpcontrolthread.h 
     102    config/upnptestdialog.h 
    101103  ) 
    102104endif(USE_MINIUPNPC) 
     
    205207  network/netviewer.ui 
    206208) 
     209if (USE_MINIUPNPC) 
     210  qt4_wrap_ui(vidalia_SRCS config/upnptestdialog.ui) 
     211endif(USE_MINIUPNPC) 
    207212 
    208213## Add the resource files (icons, etc.) 
  • vidalia/trunk/src/vidalia/res/vidalia_common.qrc

    r2504 r2639  
    8484    <qresource prefix="/images"> 
    8585        <file>48x48/applications-internet.png</file> 
     86        <file>48x48/modem.png</file> 
    8687        <file>48x48/network-server.png</file> 
    8788        <file>48x48/start-tor.png</file>