← Back to branch summary

~ubuntu-branches/ubuntu/saucy/filezilla/saucy-proposed

~ubuntu-branches/ubuntu/saucy/filezilla/saucy-proposed

« back to all changes in this revision

Viewing changes to src/interface/sitemanager_dialog.cpp

Committer: Package Import Robot
Author(s): Adrien Cunin
Date: 2011-12-23 22:57:59 UTC
mfrom: (1.1.29)
Revision ID: package-import@ubuntu.com-20111223225759-2zxn4dlhkaedq219

Tags: 3.5.2-1ubuntu1

* Sync from Debian unstable
* Re-added debian/patches/02_use-decimal-si-by-default.patch in order to
comply with UnitsPolicy (the patch got lost in the previous Ubuntu upload)

files added:
.pc/02_use-decimal-si-by-default.patch

.pc/02_use-decimal-si-by-default.patch/src

.pc/02_use-decimal-si-by-default.patch/src/interface

.pc/02_use-decimal-si-by-default.patch/src/interface/Options.cpp

debian/patches/02_use-decimal-si-by-default.patch

src/engine/option_change_event_handler.cpp

src/include/option_change_event_handler.h

src/interface/textctrlex.cpp

src/interface/textctrlex.h

src/interface/xh_text_ex.cpp

src/interface/xh_text_ex.h

files removed:
.pc/02_dbus_utf8.patch

.pc/02_dbus_utf8.patch/src

.pc/02_dbus_utf8.patch/src/dbus

.pc/02_dbus_utf8.patch/src/dbus/desktop_notification.cpp

debian/patches/02_dbus_utf8.patch

src/interface/option_change_event_handler.cpp

src/interface/option_change_event_handler.h

files modified:
.pc/01_remove-xdg-check.patch/configure

.pc/01_remove-xdg-check.patch/configure.in

.pc/applied-patches

NEWS

autogen.sh

configure

configure.in

data/install.nsi.in

debian/changelog

debian/patches/01_remove-xdg-check.patch

debian/patches/series

debian/rules

locales/ar.po

locales/bg_BG.po

locales/cs_CZ.po

locales/da_DK.po

locales/de.po

locales/el.po

locales/es.po

locales/fi_FI.po

locales/filezilla.pot

locales/fr.po

locales/hy.po

locales/id_ID.po

locales/it.po

locales/lt_LT.po

locales/nb_NO.po

locales/nn_NO.po

locales/pl_PL.po

locales/pt_BR.po

locales/ro_RO.po

locales/sv.po

locales/tr.po

locales/vi_VN.po

locales/zh_CN.po

locales/zh_TW.po

src/engine/ControlSocket.cpp

src/engine/Makefile.am

src/engine/Makefile.in

src/engine/directorylistingparser.cpp

src/engine/engine.vcproj

src/engine/server.cpp

src/fzshellext/version.rc.in

src/include/Makefile.am

src/include/Makefile.in

src/include/socket.h

src/interface/FileZilla.cpp

src/interface/LocalListView.cpp

src/interface/LocalTreeView.cpp

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/RemoteListView.cpp

src/interface/RemoteTreeView.cpp

src/interface/filelist_statusbar.h

src/interface/filter_conditions_dialog.cpp

src/interface/filteredit.cpp

src/interface/interface.vcproj

src/interface/menu_bar.cpp

src/interface/menu_bar.h

src/interface/queue_storage.cpp

src/interface/recentserverlist.cpp

src/interface/resources/menus.xrc

src/interface/resources/settings.xrc

src/interface/resources/version.rc.in

src/interface/resources/windows_manifest.xml

src/interface/settings/optionspage_interface.cpp

src/interface/sitemanager.cpp

src/interface/sitemanager_dialog.cpp

src/interface/statusbar.h

src/interface/themeprovider.h

src/interface/timeformatting.cpp

src/interface/toolbar.cpp

src/interface/toolbar.h

src/interface/viewheader.cpp

src/putty/cmdline.c

src/putty/import.c

src/putty/logging.c

src/putty/misc.c

src/putty/network.h

src/putty/portfwd.c

src/putty/psftp.c

src/putty/putty.h

src/putty/puttyps.h

src/putty/settings.c

src/putty/ssh.c

src/putty/ssh.h

src/putty/sshaes.c

src/putty/sshbn.c

src/putty/sshrand.c

src/putty/sshrsa.c

src/putty/sshzlib.c

src/putty/unix/unix.h

src/putty/unix/uxcons.c

src/putty/unix/uxmisc.c

src/putty/unix/uxnet.c

src/putty/unix/uxnoise.c

src/putty/unix/uxproxy.c

src/putty/unix/uxstore.c

src/putty/version.c

src/putty/windows/Makefile.am

src/putty/windows/Makefile.in

src/putty/windows/wincons.c

src/putty/windows/windows_manifest.xml

src/putty/windows/winhandl.c

src/putty/windows/winmisc.c

src/putty/windows/winnet.c

src/putty/windows/winpgntc.c

src/putty/windows/winsftp.c

src/putty/windows/winstore.c

src/putty/windows/winstuff.h

src/putty/x11fwd.c

src/tinyxml/tinystr.cpp

src/tinyxml/tinystr.h

src/tinyxml/tinyxml.cpp

src/tinyxml/tinyxml.h

src/tinyxml/tinyxmlerror.cpp

src/tinyxml/tinyxmlparser.cpp

tests/dirparsertest.cpp

Show diffs side-by-side

added added

removed removed

src/interface/sitemanager_dialog.cpp

4

4

#include "conditionaldialog.h"

5

5

#include "filezillaapp.h"

6

6

#include "ipcmutex.h"

7

#include "Options.h"

7

8

#include "themeprovider.h"

8

9

#include "window_state_manager.h"

9

10

#include "wrapengine.h"

Older »