~ubuntu-branches/debian/sid/filezilla/sid

Viewing changes to src/interface/cmdline.cpp

Committer: Bazaar Package Importer
Author(s): Adrien Cunin
Date: 2009-08-20 00:38:30 UTC
mfrom: (1.3.3 upstream)
Revision ID: james.westby@ubuntu.com-20090820003830-0prw6uzkgv06kbkh

http://bugs.debian.org/529822

http://bugs.debian.org/529701

* New upstream release (LP: #389525)
   - New feature: remote file search
   - pkg-config is now used to search for gnutls (Closes: #529822)
* Changed package descriptions, not mentioning Windows anymore
* Updated features list in package description
* Added pkg-config to the build-dependencies
* Build-Depend on libgnutls-dev version >= 2.8.3, as required by upstream
* Updated Standards-Version to 3.8.3
* debian/rules: touch magic on configure and configure.in to make sure the
  first has a more recent timestamp than the second (Closes: #529701)

files added:
locales/hr.po

locales/oc.po

src/dbus/power_management_inhibitor.cpp

src/dbus/power_management_inhibitor.h

src/interface/filter_conditions_dialog.cpp

src/interface/filter_conditions_dialog.h

src/interface/power_management.cpp

src/interface/power_management.h

src/interface/resources/16x16/find.png

src/interface/resources/minimal/16x16/find.png

src/interface/resources/opencrystal/16x16/find.png

src/interface/resources/opencrystal/32x32/find.png

src/interface/resources/opencrystal/48x48/find.png

src/interface/resources/settings.xrc

src/interface/search.cpp

src/interface/search.h

src/interface/settings

src/interface/settings/optionspage.cpp

src/interface/settings/optionspage.h

src/interface/settings/optionspage_connection.cpp

src/interface/settings/optionspage_connection.h

src/interface/settings/optionspage_connection_active.cpp

src/interface/settings/optionspage_connection_active.h

src/interface/settings/optionspage_connection_ftp.cpp

src/interface/settings/optionspage_connection_ftp.h

src/interface/settings/optionspage_connection_passive.cpp

src/interface/settings/optionspage_connection_passive.h

src/interface/settings/optionspage_connection_sftp.cpp

src/interface/settings/optionspage_connection_sftp.h

src/interface/settings/optionspage_dateformatting.cpp

src/interface/settings/optionspage_dateformatting.h

src/interface/settings/optionspage_debug.cpp

src/interface/settings/optionspage_debug.h

src/interface/settings/optionspage_edit.cpp

src/interface/settings/optionspage_edit.h

src/interface/settings/optionspage_edit_associations.cpp

src/interface/settings/optionspage_edit_associations.h

src/interface/settings/optionspage_fileexists.cpp

src/interface/settings/optionspage_fileexists.h

src/interface/settings/optionspage_filelists.cpp

src/interface/settings/optionspage_filelists.h

src/interface/settings/optionspage_filetype.cpp

src/interface/settings/optionspage_filetype.h

src/interface/settings/optionspage_ftpproxy.cpp

src/interface/settings/optionspage_ftpproxy.h

src/interface/settings/optionspage_interface.cpp

src/interface/settings/optionspage_interface.h

src/interface/settings/optionspage_language.cpp

src/interface/settings/optionspage_language.h

src/interface/settings/optionspage_logging.cpp

src/interface/settings/optionspage_logging.h

src/interface/settings/optionspage_proxy.cpp

src/interface/settings/optionspage_proxy.h

src/interface/settings/optionspage_sizeformatting.cpp

src/interface/settings/optionspage_sizeformatting.h

src/interface/settings/optionspage_themes.cpp

src/interface/settings/optionspage_themes.h

src/interface/settings/optionspage_transfer.cpp

src/interface/settings/optionspage_transfer.h

src/interface/settings/optionspage_updatecheck.cpp

src/interface/settings/optionspage_updatecheck.h

src/interface/settings/settingsdialog.cpp

src/interface/settings/settingsdialog.h

src/interface/verifyhostkeydialog.cpp

src/interface/verifyhostkeydialog.h

src/interface/volume_enumerator.cpp

src/interface/volume_enumerator.h

files removed:
src/interface/optionspage.cpp

src/interface/optionspage.h

src/interface/optionspage_connection.cpp

src/interface/optionspage_connection.h

src/interface/optionspage_connection_active.cpp

src/interface/optionspage_connection_active.h

src/interface/optionspage_connection_ftp.cpp

src/interface/optionspage_connection_ftp.h

src/interface/optionspage_connection_passive.cpp

src/interface/optionspage_connection_passive.h

src/interface/optionspage_connection_sftp.cpp

src/interface/optionspage_connection_sftp.h

src/interface/optionspage_dateformatting.cpp

src/interface/optionspage_dateformatting.h

src/interface/optionspage_debug.cpp

src/interface/optionspage_debug.h

src/interface/optionspage_edit.cpp

src/interface/optionspage_edit.h

src/interface/optionspage_fileexists.cpp

src/interface/optionspage_fileexists.h

src/interface/optionspage_filelists.cpp

src/interface/optionspage_filelists.h

src/interface/optionspage_filetype.cpp

src/interface/optionspage_filetype.h

src/interface/optionspage_ftpproxy.cpp

src/interface/optionspage_ftpproxy.h

src/interface/optionspage_interface.cpp

src/interface/optionspage_interface.h

src/interface/optionspage_language.cpp

src/interface/optionspage_language.h

src/interface/optionspage_logging.cpp

src/interface/optionspage_logging.h

src/interface/optionspage_proxy.cpp

src/interface/optionspage_proxy.h

src/interface/optionspage_sizeformatting.cpp

src/interface/optionspage_sizeformatting.h

src/interface/optionspage_themes.cpp

src/interface/optionspage_themes.h

src/interface/optionspage_transfer.cpp

src/interface/optionspage_transfer.h

src/interface/optionspage_updatecheck.cpp

src/interface/optionspage_updatecheck.h

src/interface/settingsdialog.cpp

src/interface/settingsdialog.h

files modified:
AUTHORS

INSTALL

NEWS

README

configure

configure.in

debian/changelog

debian/control

debian/rules

locales/ar.po

locales/bg_BG.po

locales/ca.po

locales/ca_ES@valencia.po

locales/da_DK.po

locales/de.po

locales/el.po

locales/es.po

locales/et_EE.po

locales/fi_FI.po

locales/filezilla.pot

locales/fr.po

locales/hu_HU.po

locales/id_ID.po

locales/it.po

locales/ja_JP.po

locales/lt_LT.po

locales/lv_LV.po

locales/nl.po

locales/pl_PL.po

locales/ro_RO.po

locales/sk_SK.po

locales/sl_SI.po

locales/sv.po

locales/tr.po

locales/vi_VN.po

locales/zh_CN.po

locales/zh_TW.po

src/FileZilla.sln

src/dbus/Makefile.am

src/dbus/Makefile.in

src/dbus/wxdbusconnection.cpp

src/engine/directorylistingparser.cpp

src/engine/engine.vcproj

src/engine/engineprivate.cpp

src/engine/externalipresolver.cpp

src/engine/ftpcontrolsocket.cpp

src/engine/httpcontrolsocket.cpp

src/engine/httpcontrolsocket.h

src/engine/misc.cpp

src/engine/notification.cpp

src/engine/server.cpp

src/engine/serverpath.cpp

src/engine/socket.cpp

src/engine/tlssocket.cpp

src/engine/tlssocket.h

src/engine/transfersocket.cpp

src/fzshellext/fzshellext.rc

src/fzshellext/fzshellext.vcproj

src/fzshellext/fzshellext_64.dll

src/fzshellext/shellext.cpp

src/fzshellext/version.rc.in

src/include/externalipresolver.h

src/include/local_path.h

src/include/misc.h

src/include/notification.h

src/include/optionsbase.h

src/include/refcount.h

src/include/server.h

src/include/serverpath.h

src/include/socket.h

src/interface/LocalListView.cpp

src/interface/LocalListView.h

src/interface/LocalTreeView.cpp

src/interface/LocalTreeView.h

src/interface/Mainfrm.cpp

src/interface/Mainfrm.h

src/interface/Makefile.am

src/interface/Makefile.in

src/interface/Options.cpp

src/interface/Options.h

src/interface/QueueView.cpp

src/interface/QueueView.h

src/interface/RemoteListView.cpp

src/interface/RemoteListView.h

src/interface/RemoteTreeView.cpp

src/interface/RemoteTreeView.h

src/interface/aboutdialog.cpp

src/interface/asyncrequestqueue.cpp

src/interface/bookmarks_dialog.cpp

src/interface/chmoddialog.cpp

src/interface/chmoddialog.h

src/interface/cmdline.cpp

src/interface/cmdline.h

src/interface/customheightlistctrl.cpp

src/interface/customheightlistctrl.h

src/interface/dialogex.cpp

src/interface/dialogex.h

src/interface/edithandler.cpp

src/interface/edithandler.h

src/interface/filelist_statusbar.cpp

src/interface/filelist_statusbar.h

src/interface/filelistctrl.cpp

src/interface/filelistctrl.h

src/interface/filter.cpp

src/interface/filter.h

src/interface/filteredit.cpp

src/interface/filteredit.h

src/interface/interface.vcproj

src/interface/listingcomparison.cpp

src/interface/listingcomparison.h

src/interface/loginmanager.cpp

src/interface/netconfwizard.cpp

src/interface/queue.cpp

src/interface/queueview_failed.cpp

src/interface/quickconnectbar.cpp

src/interface/recursive_operation.cpp

src/interface/recursive_operation.h

src/interface/resources/16x16/Makefile.am

src/interface/resources/16x16/Makefile.in

src/interface/resources/Makefile.am

src/interface/resources/Makefile.in

src/interface/resources/dialogs.xrc

src/interface/resources/filezilla.rc

src/interface/resources/menus.xrc

src/interface/resources/minimal/Makefile.am

src/interface/resources/minimal/Makefile.in

src/interface/resources/opencrystal/16x16/cancel.png

src/interface/resources/opencrystal/16x16/compare.png

src/interface/resources/opencrystal/16x16/filter.png

src/interface/resources/opencrystal/16x16/localtreeview.png

src/interface/resources/opencrystal/16x16/reconnect.png

src/interface/resources/opencrystal/16x16/refresh.png

src/interface/resources/opencrystal/16x16/uploadadd.png

src/interface/resources/opencrystal/48x48/ascii.png

src/interface/resources/opencrystal/Makefile.am

src/interface/resources/opencrystal/Makefile.in

src/interface/resources/toolbar.xrc

src/interface/sitemanager.cpp

src/interface/state.cpp

src/interface/state.h

src/interface/updatewizard.cpp

src/interface/updatewizard.h

src/interface/verifycertdialog.cpp

src/interface/verifycertdialog.h

src/interface/viewheader.cpp

src/interface/viewheader.h

src/interface/window_state_manager.cpp

src/interface/window_state_manager.h

src/interface/xmlfunctions.cpp

src/putty/psftp.c

src/putty/sshsh512.c

tests/dirparsertest.cpp

Show diffs side-by-side

added added

removed removed

src/interface/cmdline.cpp

m_parser.AddSwitch(_T("h"), _T("help"), _("Shows this help dialog"), wxCMD_LINE_OPTION_HELP);

m_parser.AddSwitch(_T("s"), _T("site-manager"), _("Start with opened Site Manager"));

m_parser.AddOption(_T("c"), _T("site"), _("Connect to specified Site Manager site"));

m_parser.AddOption(_T("l"), _T("logontype"), _("Logontype, can only be used together with FTP URL. Argument has to be either 'ask' or 'interactive'"));

#ifdef __WXMSW__

m_parser.AddSwitch(_T(""), _T("close"), _("Close all running instances of FileZilla"));

#endif

if (m_parser.Found(_T("c"), &value))

return value;

break;

case logontype:

if (m_parser.Found(_T("l"), &value))

return value;

break;

}

return _T("");

return false;

}

wxString type = GetOption(logontype);

if (type != _T(""))

{

if (!m_parser.GetParamCount())

{

wxMessageBox(_("-l can only be used together with an FTP URL."), _("Syntax error in command line"));

return false;

}

if (type != _T("ask") && type != _T("interactive"))

{

wxMessageBox(_("Logontype has to be either 'ask' or 'interactive' (without the quotes)."), _("Syntax error in command line"));

return false;

}

if (m_parser.Found(_T("verbose")))

wxLog::SetVerbose(true);

Older »