Context Navigation

Back to Ticket #8185

Ticket #8185: update_patch

File update_patch, 88.3 KB (added by Rahul Nanwani, 12 years ago)
update patch for save and restore tabs

Line
1	Binary files filezilla-3.5.3/src/dbus/libfzdbus.a and original_filezilla/src/dbus/libfzdbus.a differ
2	Binary files filezilla-3.5.3/src/dbus/libfzdbus_a-desktop_notification.o and original_filezilla/src/dbus/libfzdbus_a-desktop_notification.o differ
3	Binary files filezilla-3.5.3/src/dbus/libfzdbus_a-power_management_inhibitor.o and original_filezilla/src/dbus/libfzdbus_a-power_management_inhibitor.o differ
4	Binary files filezilla-3.5.3/src/dbus/libfzdbus_a-session_manager.o and original_filezilla/src/dbus/libfzdbus_a-session_manager.o differ
5	Binary files filezilla-3.5.3/src/dbus/libfzdbus_a-wxdbusconnection.o and original_filezilla/src/dbus/libfzdbus_a-wxdbusconnection.o differ
6	Binary files filezilla-3.5.3/src/dbus/libfzdbus_a-wxdbusmessage.o and original_filezilla/src/dbus/libfzdbus_a-wxdbusmessage.o differ
7	diff -ur filezilla-3.5.3/src/dbus/Makefile original_filezilla/src/dbus/Makefile
8	--- filezilla-3.5.3/src/dbus/Makefile 2012-08-26 01:39:10.796630681 +0530
9	+++ original_filezilla/src/dbus/Makefile 2012-09-02 21:28:05.541441587 +0530
10	@@ -85,12 +85,12 @@
11	ETAGS = etags
12	CTAGS = ctags
13	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
14	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
15	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
16	AMTAR = $${TAR-tar}
17	AR = ar
18	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
19	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
20	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
21	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
22	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
23	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
24	AWK = mawk
25	CC = gcc
26	CCDEPMODE = depmode=gcc3
27	@@ -144,7 +144,7 @@
28	LIPO =
29	LN_S = ln -s
30	LTLIBOBJS =
31	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
32	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
33	MANIFEST_TOOL = :
34	MKDIR_P = /bin/mkdir -p
35	NM = /usr/bin/nm -B
36	@@ -187,10 +187,10 @@
37	WX_LIBS_STATIC =
38	WX_RESCOMP =
39	WX_VERSION = 2.8.12
40	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src/dbus
41	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src/dbus
42	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
43	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
44	+abs_builddir = /home/rnanwani/original_filezilla/src/dbus
45	+abs_srcdir = /home/rnanwani/original_filezilla/src/dbus
46	+abs_top_builddir = /home/rnanwani/original_filezilla
47	+abs_top_srcdir = /home/rnanwani/original_filezilla
48	ac_ct_AR = ar
49	ac_ct_CC = gcc
50	ac_ct_CXX = g++
51	@@ -220,7 +220,7 @@
52	htmldir = ${docdir}
53	includedir = ${prefix}/include
54	infodir = ${datarootdir}/info
55	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
56	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
57	libdir = ${exec_prefix}/lib
58	libexecdir = ${exec_prefix}/libexec
59	localedir = ${datarootdir}/locale
60	Binary files filezilla-3.5.3/src/engine/filezilla.h.gch and original_filezilla/src/engine/filezilla.h.gch differ
61	Binary files filezilla-3.5.3/src/engine/libengine.a and original_filezilla/src/engine/libengine.a differ
62	Binary files filezilla-3.5.3/src/engine/libengine_a-backend.o and original_filezilla/src/engine/libengine_a-backend.o differ
63	Binary files filezilla-3.5.3/src/engine/libengine_a-commands.o and original_filezilla/src/engine/libengine_a-commands.o differ
64	Binary files filezilla-3.5.3/src/engine/libengine_a-ControlSocket.o and original_filezilla/src/engine/libengine_a-ControlSocket.o differ
65	Binary files filezilla-3.5.3/src/engine/libengine_a-directorycache.o and original_filezilla/src/engine/libengine_a-directorycache.o differ
66	Binary files filezilla-3.5.3/src/engine/libengine_a-directorylisting.o and original_filezilla/src/engine/libengine_a-directorylisting.o differ
67	Binary files filezilla-3.5.3/src/engine/libengine_a-directorylistingparser.o and original_filezilla/src/engine/libengine_a-directorylistingparser.o differ
68	Binary files filezilla-3.5.3/src/engine/libengine_a-engineprivate.o and original_filezilla/src/engine/libengine_a-engineprivate.o differ
69	Binary files filezilla-3.5.3/src/engine/libengine_a-externalipresolver.o and original_filezilla/src/engine/libengine_a-externalipresolver.o differ
70	Binary files filezilla-3.5.3/src/engine/libengine_a-FileZillaEngine.o and original_filezilla/src/engine/libengine_a-FileZillaEngine.o differ
71	Binary files filezilla-3.5.3/src/engine/libengine_a-ftpcontrolsocket.o and original_filezilla/src/engine/libengine_a-ftpcontrolsocket.o differ
72	Binary files filezilla-3.5.3/src/engine/libengine_a-httpcontrolsocket.o and original_filezilla/src/engine/libengine_a-httpcontrolsocket.o differ
73	Binary files filezilla-3.5.3/src/engine/libengine_a-iothread.o and original_filezilla/src/engine/libengine_a-iothread.o differ
74	Binary files filezilla-3.5.3/src/engine/libengine_a-local_filesys.o and original_filezilla/src/engine/libengine_a-local_filesys.o differ
75	Binary files filezilla-3.5.3/src/engine/libengine_a-local_path.o and original_filezilla/src/engine/libengine_a-local_path.o differ
76	Binary files filezilla-3.5.3/src/engine/libengine_a-logging.o and original_filezilla/src/engine/libengine_a-logging.o differ
77	Binary files filezilla-3.5.3/src/engine/libengine_a-misc.o and original_filezilla/src/engine/libengine_a-misc.o differ
78	Binary files filezilla-3.5.3/src/engine/libengine_a-notification.o and original_filezilla/src/engine/libengine_a-notification.o differ
79	Binary files filezilla-3.5.3/src/engine/libengine_a-option_change_event_handler.o and original_filezilla/src/engine/libengine_a-option_change_event_handler.o differ
80	Binary files filezilla-3.5.3/src/engine/libengine_a-pathcache.o and original_filezilla/src/engine/libengine_a-pathcache.o differ
81	Binary files filezilla-3.5.3/src/engine/libengine_a-proxy.o and original_filezilla/src/engine/libengine_a-proxy.o differ
82	Binary files filezilla-3.5.3/src/engine/libengine_a-ratelimiter.o and original_filezilla/src/engine/libengine_a-ratelimiter.o differ
83	Binary files filezilla-3.5.3/src/engine/libengine_a-servercapabilities.o and original_filezilla/src/engine/libengine_a-servercapabilities.o differ
84	Binary files filezilla-3.5.3/src/engine/libengine_a-server.o and original_filezilla/src/engine/libengine_a-server.o differ
85	Binary files filezilla-3.5.3/src/engine/libengine_a-serverpath.o and original_filezilla/src/engine/libengine_a-serverpath.o differ
86	Binary files filezilla-3.5.3/src/engine/libengine_a-sftpcontrolsocket.o and original_filezilla/src/engine/libengine_a-sftpcontrolsocket.o differ
87	Binary files filezilla-3.5.3/src/engine/libengine_a-sizeformatting_base.o and original_filezilla/src/engine/libengine_a-sizeformatting_base.o differ
88	Binary files filezilla-3.5.3/src/engine/libengine_a-socket.o and original_filezilla/src/engine/libengine_a-socket.o differ
89	Binary files filezilla-3.5.3/src/engine/libengine_a-string_coalescer.o and original_filezilla/src/engine/libengine_a-string_coalescer.o differ
90	Binary files filezilla-3.5.3/src/engine/libengine_a-threadex.o and original_filezilla/src/engine/libengine_a-threadex.o differ
91	Binary files filezilla-3.5.3/src/engine/libengine_a-timeex.o and original_filezilla/src/engine/libengine_a-timeex.o differ
92	Binary files filezilla-3.5.3/src/engine/libengine_a-tlssocket.o and original_filezilla/src/engine/libengine_a-tlssocket.o differ
93	Binary files filezilla-3.5.3/src/engine/libengine_a-transfersocket.o and original_filezilla/src/engine/libengine_a-transfersocket.o differ
94	diff -ur filezilla-3.5.3/src/engine/Makefile original_filezilla/src/engine/Makefile
95	--- filezilla-3.5.3/src/engine/Makefile 2012-08-26 01:39:10.760630683 +0530
96	+++ original_filezilla/src/engine/Makefile 2012-09-02 21:28:05.485441586 +0530
97	@@ -109,12 +109,12 @@
98	ETAGS = etags
99	CTAGS = ctags
100	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
101	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
102	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
103	AMTAR = $${TAR-tar}
104	AR = ar
105	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
106	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
107	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
108	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
109	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
110	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
111	AWK = mawk
112	CC = gcc
113	CCDEPMODE = depmode=gcc3
114	@@ -168,7 +168,7 @@
115	LIPO =
116	LN_S = ln -s
117	LTLIBOBJS =
118	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
119	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
120	MANIFEST_TOOL = :
121	MKDIR_P = /bin/mkdir -p
122	NM = /usr/bin/nm -B
123	@@ -211,10 +211,10 @@
124	WX_LIBS_STATIC =
125	WX_RESCOMP =
126	WX_VERSION = 2.8.12
127	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src/engine
128	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src/engine
129	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
130	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
131	+abs_builddir = /home/rnanwani/original_filezilla/src/engine
132	+abs_srcdir = /home/rnanwani/original_filezilla/src/engine
133	+abs_top_builddir = /home/rnanwani/original_filezilla
134	+abs_top_srcdir = /home/rnanwani/original_filezilla
135	ac_ct_AR = ar
136	ac_ct_CC = gcc
137	ac_ct_CXX = g++
138	@@ -244,7 +244,7 @@
139	htmldir = ${docdir}
140	includedir = ${prefix}/include
141	infodir = ${datarootdir}/info
142	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
143	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
144	libdir = ${exec_prefix}/lib
145	libexecdir = ${exec_prefix}/libexec
146	localedir = ${datarootdir}/locale
147	diff -ur filezilla-3.5.3/src/fzshellext/Makefile original_filezilla/src/fzshellext/Makefile
148	--- filezilla-3.5.3/src/fzshellext/Makefile 2012-08-26 01:39:11.164630664 +0530
149	+++ original_filezilla/src/fzshellext/Makefile 2012-09-02 21:28:06.073441598 +0530
150	@@ -111,12 +111,12 @@
151	ETAGS = etags
152	CTAGS = ctags
153	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
154	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
155	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
156	AMTAR = $${TAR-tar}
157	AR = ar
158	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
159	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
160	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
161	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
162	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
163	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
164	AWK = mawk
165	CC = gcc
166	CCDEPMODE = depmode=gcc3
167	@@ -170,7 +170,7 @@
168	LIPO =
169	LN_S = ln -s
170	LTLIBOBJS =
171	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
172	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
173	MANIFEST_TOOL = :
174	MKDIR_P = /bin/mkdir -p
175	NM = /usr/bin/nm -B
176	@@ -213,10 +213,10 @@
177	WX_LIBS_STATIC =
178	WX_RESCOMP =
179	WX_VERSION = 2.8.12
180	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src/fzshellext
181	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src/fzshellext
182	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
183	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
184	+abs_builddir = /home/rnanwani/original_filezilla/src/fzshellext
185	+abs_srcdir = /home/rnanwani/original_filezilla/src/fzshellext
186	+abs_top_builddir = /home/rnanwani/original_filezilla
187	+abs_top_srcdir = /home/rnanwani/original_filezilla
188	ac_ct_AR = ar
189	ac_ct_CC = gcc
190	ac_ct_CXX = g++
191	@@ -246,7 +246,7 @@
192	htmldir = ${docdir}
193	includedir = ${prefix}/include
194	infodir = ${datarootdir}/info
195	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
196	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
197	libdir = ${exec_prefix}/lib
198	libexecdir = ${exec_prefix}/libexec
199	localedir = ${datarootdir}/locale
200	diff -ur filezilla-3.5.3/src/include/Makefile original_filezilla/src/include/Makefile
201	--- filezilla-3.5.3/src/include/Makefile 2012-08-26 01:39:10.860630678 +0530
202	+++ original_filezilla/src/include/Makefile 2012-09-02 21:28:05.645441589 +0530
203	@@ -61,12 +61,12 @@
204	ETAGS = etags
205	CTAGS = ctags
206	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
207	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
208	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
209	AMTAR = $${TAR-tar}
210	AR = ar
211	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
212	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
213	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
214	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
215	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
216	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
217	AWK = mawk
218	CC = gcc
219	CCDEPMODE = depmode=gcc3
220	@@ -120,7 +120,7 @@
221	LIPO =
222	LN_S = ln -s
223	LTLIBOBJS =
224	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
225	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
226	MANIFEST_TOOL = :
227	MKDIR_P = /bin/mkdir -p
228	NM = /usr/bin/nm -B
229	@@ -163,10 +163,10 @@
230	WX_LIBS_STATIC =
231	WX_RESCOMP =
232	WX_VERSION = 2.8.12
233	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src/include
234	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src/include
235	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
236	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
237	+abs_builddir = /home/rnanwani/original_filezilla/src/include
238	+abs_srcdir = /home/rnanwani/original_filezilla/src/include
239	+abs_top_builddir = /home/rnanwani/original_filezilla
240	+abs_top_srcdir = /home/rnanwani/original_filezilla
241	ac_ct_AR = ar
242	ac_ct_CC = gcc
243	ac_ct_CXX = g++
244	@@ -196,7 +196,7 @@
245	htmldir = ${docdir}
246	includedir = ${prefix}/include
247	infodir = ${datarootdir}/info
248	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
249	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
250	libdir = ${exec_prefix}/lib
251	libexecdir = ${exec_prefix}/libexec
252	localedir = ${datarootdir}/locale
253	diff -ur filezilla-3.5.3/src/interface/aui_notebook_ex.cpp original_filezilla/src/interface/aui_notebook_ex.cpp
254	--- filezilla-3.5.3/src/interface/aui_notebook_ex.cpp 2012-08-30 11:49:36.040060576 +0530
255	+++ original_filezilla/src/interface/aui_notebook_ex.cpp 2011-04-27 09:00:17.000000000 +0530
256	@@ -412,31 +412,3 @@
257
258	SetSelection(page);
259	}
260	-
261	-std::vector<int> wxAuiNotebookEx::RevolveTab()
262	-{
263	- int page = GetSelection();
264	- int store_page = page;
265	- int AllTabsCovered = 0;
266	- std::vector<int> TabIndices;
267	- while (AllTabsCovered == 0)
268	- {
269	- TabIndices.push_back(page);
270	- page++;
271	- if (page >= (int)GetPageCount())
272	- page = 0;
273	- else if (page < 0)
274	- page = GetPageCount() - 1;
275	-
276	- if (page == store_page)
277	- AllTabsCovered = 1;
278	- }
279	-
280	- return TabIndices;
281	-}
282	-
283	-void wxAuiNotebookEx::TempSelectTab(int page)
284	-{
285	- SetSelection(page);
286	-}
287	-
288	Only in filezilla-3.5.3/src/interface: aui_notebook_ex.cpp~
289	diff -ur filezilla-3.5.3/src/interface/aui_notebook_ex.h original_filezilla/src/interface/aui_notebook_ex.h
290	--- filezilla-3.5.3/src/interface/aui_notebook_ex.h 2012-08-28 19:12:43.364789796 +0530
291	+++ original_filezilla/src/interface/aui_notebook_ex.h 2010-06-14 00:43:28.000000000 +0530
292	@@ -23,8 +23,6 @@
293	void OnNavigationKey(wxNavigationKeyEvent& event);
294
295	void AdvanceTab(bool forward);
296	- std::vector<int> RevolveTab();
297	- void TempSelectTab(int page);
298
299	protected:
300	std::vector<bool> m_highlighted;
301	Only in filezilla-3.5.3/src/interface: aui_notebook_ex.h~
302	diff -ur filezilla-3.5.3/src/interface/context_control.cpp original_filezilla/src/interface/context_control.cpp
303	--- filezilla-3.5.3/src/interface/context_control.cpp 2012-08-30 23:27:51.785250062 +0530
304	+++ original_filezilla/src/interface/context_control.cpp 2010-06-14 00:43:28.000000000 +0530
305	@@ -14,7 +14,6 @@
306	#include "splitter.h"
307	#include "view.h"
308	#include "viewheader.h"
309	-#include "loginmanager.h"
310
311	DECLARE_EVENT_TYPE(fzEVT_TAB_CLOSING_DEFERRED, -1);
312	DEFINE_EVENT_TYPE(fzEVT_TAB_CLOSING_DEFERRED);
313	@@ -421,140 +420,6 @@
314	return true;
315	}
316
317	-void CContextControl::SaveTab()
318	-{
319	- int response = wxMessageBox( _("Save All Tabs In This Session ?"),_("Save Tabs"), wxYES_NO \| wxICON_INFORMATION);
320	-
321	- if (response == (int)wxYES)
322	- {
323	- //Create New XML File to Store Tab Data
324	- CXmlFile file(_T("sessiontabs"));
325	- TiXmlElement* pDocument = file.CreateEmpty();
326	-
327	- if (!m_tabs) // if we do not have multiple tabs
328	- {
329	- TiXmlElement* pTabs = pDocument->LinkEndChild(new TiXmlElement("Tab"))->ToElement();
330	- CState* tab_state=0;
331	- tab_state = CContextManager::Get()->GetCurrentContext();
332	-
333	- const CServer* tab_server = 0;
334	- if ((tab_server = tab_state->GetServer())) //Do Not Store Empty Tabs
335	- {
336	- wxString tab_host = tab_server->GetHost();
337	- wxString tab_user = tab_server->GetUser();
338	- int tab_port = tab_server->GetPort();
339	- wxString port_string = wxString::Format(wxT("%i"),tab_port);
340	- AddTextElement(pTabs, "Host", tab_host);
341	- AddTextElement(pTabs, "User", tab_user);
342	- AddTextElement(pTabs, "Port", port_string);
343	- file.Save();
344	- }
345	- }
346	- else
347	- {
348	- std::vector<int> TabIndices = m_tabs->RevolveTab(); //Revolve through all open tabs
349	- int tab_iter;
350	- int store_tab = TabIndices[0];
351	-
352	- for (tab_iter = 0; tab_iter < GetTabCount(); tab_iter++)
353	- {
354	- m_tabs->TempSelectTab(tab_iter);
355	- CState* tab_state=0;
356	- tab_state = CContextManager::Get()->GetCurrentContext();
357	-
358	- const CServer* tab_server = 0;
359	- if ((tab_server = tab_state->GetServer()))
360	- {
361	- TiXmlElement* pTabs = pDocument->LinkEndChild(new TiXmlElement("Tab"))->ToElement();
362	- wxString tab_host = tab_server->GetHost();
363	- wxString tab_user = tab_server->GetUser();
364	- int tab_port = tab_server->GetPort();
365	- wxString port_string = wxString::Format(wxT("%i"),tab_port);
366	- AddTextElement(pTabs, "Host", tab_host);
367	- AddTextElement(pTabs, "User", tab_user);
368	- AddTextElement(pTabs, "Port", tab_port);
369	- file.Save();
370	- }
371	-
372	- }
373	-
374	- m_tabs->TempSelectTab(store_tab); //The tab which was selected before all tabs were saved is selected again
375	- }
376	-
377	- wxMessageBox(_("All Tabs Saved."),_("Tabs Saved"), wxOK \| wxICON_INFORMATION);
378	- }
379	-}
380	-
381	-
382	-void CContextControl::RestoreTab()
383	-{
384	- int response = wxMessageBox( _("Restore Tabs Saved from Last Saved Session ?"),_("Restore Tabs"), wxYES_NO \| wxICON_INFORMATION);
385	- std::string tab_data;
386	-
387	- if (response == wxYES)
388	- {
389	- CXmlFile file(_T("sessiontabs"));
390	- TiXmlElement* pDocument = file.Load();
391	-
392	- TiXmlElement* pElement = pDocument->FirstChildElement("Tab");
393	-
394	- if (!pElement)
395	- {
396	- wxMessageBox(_("No Data To Restore."), _("Error"), wxICON_ERROR); //If no Tab Data is stored
397	- }
398	- else
399	- {
400	- while (pElement)
401	- {
402	- wxString hostname = GetTextElement_Trimmed(pElement, "Host");
403	- wxString username = GetTextElement_Trimmed(pElement, "User");
404	- wxString port = GetTextElement_Trimmed(pElement, "Port");
405	- unsigned int port_number = wxAtoi(port);
406	-
407	- CServer server_connection;
408	- if (server_connection.SetHost(hostname, port_number))
409	- {
410	- server_connection.SetLogonType(ASK); //Needed for password dialog box
411	- server_connection.SetUser(username, _T(""));
412	-
413	- CLoginManager login_password;
414	- login_password.GetPassword(server_connection, FALSE); //Get Password from login manager for every saved tab
415	- const wxString pass = server_connection.GetPass();
416	-
417	- if (server_connection.SetUser(username, pass))
418	- {
419	- CMainFrame *new_connect;
420	- const CServerPath server_path;
421	-
422	- CState* tab_state=0;
423	- tab_state = CContextManager::Get()->GetCurrentContext();
424	- const CServer* tab_server = 0;
425	- if ((tab_server = tab_state->GetServer()))
426	- {
427	- CreateTab(); // if the current tab has no connection then we connect in the same tab else create new tab
428	- new_connect->ConnectToServer(server_connection, server_path);
429	- }
430	- else
431	- {
432	- new_connect->ConnectToServer(server_connection, server_path);
433	- }
434	- }
435	- }
436	-
437	- pElement = pElement->NextSiblingElement();
438	- }
439	-
440	- file.Close();
441	- file.CreateEmpty(); // Delete the Restore Tabs file after restore is done.
442	- file.Save();
443	- file.Close();
444	- }
445	-
446	-
447	- }
448	-}
449	-
450	-
451	void CContextControl::OnTabBgDoubleclick(wxAuiNotebookEvent& event)
452	{
453	CreateTab();
454	Only in filezilla-3.5.3/src/interface: context_control.cpp~
455	diff -ur filezilla-3.5.3/src/interface/context_control.h original_filezilla/src/interface/context_control.h
456	--- filezilla-3.5.3/src/interface/context_control.h 2012-08-29 19:26:14.361321638 +0530
457	+++ original_filezilla/src/interface/context_control.h 2010-06-14 00:43:28.000000000 +0530
458	@@ -55,8 +55,6 @@
459
460	void CreateTab();
461	bool CloseTab(int tab);
462	- void SaveTab();
463	- void RestoreTab();
464
465	struct _context_controls* GetCurrentControls();
466	struct _context_controls* GetControlsFromState(CState* pState);
467	Only in filezilla-3.5.3/src/interface: context_control.h~
468	diff -ur filezilla-3.5.3/src/interface/.deps/filezilla-context_control.Po original_filezilla/src/interface/.deps/filezilla-context_control.Po
469	--- filezilla-3.5.3/src/interface/.deps/filezilla-context_control.Po 2012-08-30 23:27:56.023368152 +0530
470	+++ original_filezilla/src/interface/.deps/filezilla-context_control.Po 2012-09-02 21:28:59.217442719 +0530
471	@@ -35,8 +35,7 @@
472	/usr/include/wx-2.8/wx/dialog.h queue_storage.h recursive_operation.h \
473	filter.h /usr/include/wx-2.8/wx/regex.h /usr/include/wx-2.8/wx/string.h \
474	RemoteListView.h RemoteTreeView.h sitemanager.h \
475	- /usr/include/wx-2.8/wx/treectrl.h splitter.h view.h viewheader.h \
476	- loginmanager.h
477	+ /usr/include/wx-2.8/wx/treectrl.h splitter.h view.h viewheader.h
478
479	commandqueue.h:
480
481	@@ -213,5 +212,3 @@
482	view.h:
483
484	viewheader.h:
485	-
486	-loginmanager.h:
487	Only in filezilla-3.5.3/src/interface: filelistctrl.cpp~
488	Binary files filezilla-3.5.3/src/interface/filezilla and original_filezilla/src/interface/filezilla differ
489	Binary files filezilla-3.5.3/src/interface/filezilla-aboutdialog.o and original_filezilla/src/interface/filezilla-aboutdialog.o differ
490	Binary files filezilla-3.5.3/src/interface/filezilla-asyncrequestqueue.o and original_filezilla/src/interface/filezilla-asyncrequestqueue.o differ
491	Binary files filezilla-3.5.3/src/interface/filezilla-aui_notebook_ex.o and original_filezilla/src/interface/filezilla-aui_notebook_ex.o differ
492	Binary files filezilla-3.5.3/src/interface/filezilla-auto_ascii_files.o and original_filezilla/src/interface/filezilla-auto_ascii_files.o differ
493	Binary files filezilla-3.5.3/src/interface/filezilla-bookmarks_dialog.o and original_filezilla/src/interface/filezilla-bookmarks_dialog.o differ
494	Binary files filezilla-3.5.3/src/interface/filezilla-buildinfo.o and original_filezilla/src/interface/filezilla-buildinfo.o differ
495	Binary files filezilla-3.5.3/src/interface/filezilla-chmoddialog.o and original_filezilla/src/interface/filezilla-chmoddialog.o differ
496	Binary files filezilla-3.5.3/src/interface/filezilla-clearprivatedata.o and original_filezilla/src/interface/filezilla-clearprivatedata.o differ
497	Binary files filezilla-3.5.3/src/interface/filezilla-cmdline.o and original_filezilla/src/interface/filezilla-cmdline.o differ
498	Binary files filezilla-3.5.3/src/interface/filezilla-commandqueue.o and original_filezilla/src/interface/filezilla-commandqueue.o differ
499	Binary files filezilla-3.5.3/src/interface/filezilla-conditionaldialog.o and original_filezilla/src/interface/filezilla-conditionaldialog.o differ
500	Binary files filezilla-3.5.3/src/interface/filezilla-context_control.o and original_filezilla/src/interface/filezilla-context_control.o differ
501	Binary files filezilla-3.5.3/src/interface/filezilla-customheightlistctrl.o and original_filezilla/src/interface/filezilla-customheightlistctrl.o differ
502	Binary files filezilla-3.5.3/src/interface/filezilla-defaultfileexistsdlg.o and original_filezilla/src/interface/filezilla-defaultfileexistsdlg.o differ
503	Binary files filezilla-3.5.3/src/interface/filezilla-dialogex.o and original_filezilla/src/interface/filezilla-dialogex.o differ
504	Binary files filezilla-3.5.3/src/interface/filezilla-dndobjects.o and original_filezilla/src/interface/filezilla-dndobjects.o differ
505	Binary files filezilla-3.5.3/src/interface/filezilla-dragdropmanager.o and original_filezilla/src/interface/filezilla-dragdropmanager.o differ
506	Binary files filezilla-3.5.3/src/interface/filezilla-edithandler.o and original_filezilla/src/interface/filezilla-edithandler.o differ
507	Binary files filezilla-3.5.3/src/interface/filezilla-export.o and original_filezilla/src/interface/filezilla-export.o differ
508	Binary files filezilla-3.5.3/src/interface/filezilla-fileexistsdlg.o and original_filezilla/src/interface/filezilla-fileexistsdlg.o differ
509	Binary files filezilla-3.5.3/src/interface/filezilla-filelistctrl.o and original_filezilla/src/interface/filezilla-filelistctrl.o differ
510	Binary files filezilla-3.5.3/src/interface/filezilla-filelist_statusbar.o and original_filezilla/src/interface/filezilla-filelist_statusbar.o differ
511	Binary files filezilla-3.5.3/src/interface/filezilla-FileZilla.o and original_filezilla/src/interface/filezilla-FileZilla.o differ
512	Binary files filezilla-3.5.3/src/interface/filezilla-filter_conditions_dialog.o and original_filezilla/src/interface/filezilla-filter_conditions_dialog.o differ
513	Binary files filezilla-3.5.3/src/interface/filezilla-filteredit.o and original_filezilla/src/interface/filezilla-filteredit.o differ
514	Binary files filezilla-3.5.3/src/interface/filezilla-filter.o and original_filezilla/src/interface/filezilla-filter.o differ
515	Only in filezilla-3.5.3/src/interface: filezilla.h~
516	Binary files filezilla-3.5.3/src/interface/filezilla.h.gch and original_filezilla/src/interface/filezilla.h.gch differ
517	Binary files filezilla-3.5.3/src/interface/filezilla-import.o and original_filezilla/src/interface/filezilla-import.o differ
518	Binary files filezilla-3.5.3/src/interface/filezilla-inputdialog.o and original_filezilla/src/interface/filezilla-inputdialog.o differ
519	Binary files filezilla-3.5.3/src/interface/filezilla-ipcmutex.o and original_filezilla/src/interface/filezilla-ipcmutex.o differ
520	Binary files filezilla-3.5.3/src/interface/filezilla-led.o and original_filezilla/src/interface/filezilla-led.o differ
521	Binary files filezilla-3.5.3/src/interface/filezilla-listctrlex.o and original_filezilla/src/interface/filezilla-listctrlex.o differ
522	Binary files filezilla-3.5.3/src/interface/filezilla-listingcomparison.o and original_filezilla/src/interface/filezilla-listingcomparison.o differ
523	Binary files filezilla-3.5.3/src/interface/filezilla-locale_initializer.o and original_filezilla/src/interface/filezilla-locale_initializer.o differ
524	Binary files filezilla-3.5.3/src/interface/filezilla-LocalListView.o and original_filezilla/src/interface/filezilla-LocalListView.o differ
525	Binary files filezilla-3.5.3/src/interface/filezilla-LocalTreeView.o and original_filezilla/src/interface/filezilla-LocalTreeView.o differ
526	Binary files filezilla-3.5.3/src/interface/filezilla-loginmanager.o and original_filezilla/src/interface/filezilla-loginmanager.o differ
527	Binary files filezilla-3.5.3/src/interface/filezilla-Mainfrm.o and original_filezilla/src/interface/filezilla-Mainfrm.o differ
528	Binary files filezilla-3.5.3/src/interface/filezilla-manual_transfer.o and original_filezilla/src/interface/filezilla-manual_transfer.o differ
529	Binary files filezilla-3.5.3/src/interface/filezilla-menu_bar.o and original_filezilla/src/interface/filezilla-menu_bar.o differ
530	Binary files filezilla-3.5.3/src/interface/filezilla-netconfwizard.o and original_filezilla/src/interface/filezilla-netconfwizard.o differ
531	Binary files filezilla-3.5.3/src/interface/filezilla-Options.o and original_filezilla/src/interface/filezilla-Options.o differ
532	Binary files filezilla-3.5.3/src/interface/filezilla-power_management.o and original_filezilla/src/interface/filezilla-power_management.o differ
533	Binary files filezilla-3.5.3/src/interface/filezilla-prefix.o and original_filezilla/src/interface/filezilla-prefix.o differ
534	Binary files filezilla-3.5.3/src/interface/filezilla-queue.o and original_filezilla/src/interface/filezilla-queue.o differ
535	Binary files filezilla-3.5.3/src/interface/filezilla-queue_storage.o and original_filezilla/src/interface/filezilla-queue_storage.o differ
536	Binary files filezilla-3.5.3/src/interface/filezilla-queueview_failed.o and original_filezilla/src/interface/filezilla-queueview_failed.o differ
537	Binary files filezilla-3.5.3/src/interface/filezilla-QueueView.o and original_filezilla/src/interface/filezilla-QueueView.o differ
538	Binary files filezilla-3.5.3/src/interface/filezilla-queueview_successful.o and original_filezilla/src/interface/filezilla-queueview_successful.o differ
539	Binary files filezilla-3.5.3/src/interface/filezilla-quickconnectbar.o and original_filezilla/src/interface/filezilla-quickconnectbar.o differ
540	Binary files filezilla-3.5.3/src/interface/filezilla-recentserverlist.o and original_filezilla/src/interface/filezilla-recentserverlist.o differ
541	Binary files filezilla-3.5.3/src/interface/filezilla-recursive_operation.o and original_filezilla/src/interface/filezilla-recursive_operation.o differ
542	Binary files filezilla-3.5.3/src/interface/filezilla-RemoteListView.o and original_filezilla/src/interface/filezilla-RemoteListView.o differ
543	Binary files filezilla-3.5.3/src/interface/filezilla-RemoteTreeView.o and original_filezilla/src/interface/filezilla-RemoteTreeView.o differ
544	Binary files filezilla-3.5.3/src/interface/filezilla-search.o and original_filezilla/src/interface/filezilla-search.o differ
545	Binary files filezilla-3.5.3/src/interface/filezilla-sftp_crypt_info_dlg.o and original_filezilla/src/interface/filezilla-sftp_crypt_info_dlg.o differ
546	Binary files filezilla-3.5.3/src/interface/filezilla-sitemanager_dialog.o and original_filezilla/src/interface/filezilla-sitemanager_dialog.o differ
547	Binary files filezilla-3.5.3/src/interface/filezilla-sitemanager.o and original_filezilla/src/interface/filezilla-sitemanager.o differ
548	Binary files filezilla-3.5.3/src/interface/filezilla-sizeformatting.o and original_filezilla/src/interface/filezilla-sizeformatting.o differ
549	Binary files filezilla-3.5.3/src/interface/filezilla-speedlimits_dialog.o and original_filezilla/src/interface/filezilla-speedlimits_dialog.o differ
550	Binary files filezilla-3.5.3/src/interface/filezilla-splitter.o and original_filezilla/src/interface/filezilla-splitter.o differ
551	Binary files filezilla-3.5.3/src/interface/filezilla-state.o and original_filezilla/src/interface/filezilla-state.o differ
552	Binary files filezilla-3.5.3/src/interface/filezilla-statusbar.o and original_filezilla/src/interface/filezilla-statusbar.o differ
553	Binary files filezilla-3.5.3/src/interface/filezilla-statuslinectrl.o and original_filezilla/src/interface/filezilla-statuslinectrl.o differ
554	Binary files filezilla-3.5.3/src/interface/filezilla-StatusView.o and original_filezilla/src/interface/filezilla-StatusView.o differ
555	Binary files filezilla-3.5.3/src/interface/filezilla-systemimagelist.o and original_filezilla/src/interface/filezilla-systemimagelist.o differ
556	Binary files filezilla-3.5.3/src/interface/filezilla-textctrlex.o and original_filezilla/src/interface/filezilla-textctrlex.o differ
557	Binary files filezilla-3.5.3/src/interface/filezilla-themeprovider.o and original_filezilla/src/interface/filezilla-themeprovider.o differ
558	Binary files filezilla-3.5.3/src/interface/filezilla-timeformatting.o and original_filezilla/src/interface/filezilla-timeformatting.o differ
559	Binary files filezilla-3.5.3/src/interface/filezilla-toolbar.o and original_filezilla/src/interface/filezilla-toolbar.o differ
560	Binary files filezilla-3.5.3/src/interface/filezilla-treectrlex.o and original_filezilla/src/interface/filezilla-treectrlex.o differ
561	Binary files filezilla-3.5.3/src/interface/filezilla-updatewizard.o and original_filezilla/src/interface/filezilla-updatewizard.o differ
562	Binary files filezilla-3.5.3/src/interface/filezilla-verifycertdialog.o and original_filezilla/src/interface/filezilla-verifycertdialog.o differ
563	Binary files filezilla-3.5.3/src/interface/filezilla-verifyhostkeydialog.o and original_filezilla/src/interface/filezilla-verifyhostkeydialog.o differ
564	Binary files filezilla-3.5.3/src/interface/filezilla-viewheader.o and original_filezilla/src/interface/filezilla-viewheader.o differ
565	Binary files filezilla-3.5.3/src/interface/filezilla-view.o and original_filezilla/src/interface/filezilla-view.o differ
566	Binary files filezilla-3.5.3/src/interface/filezilla-volume_enumerator.o and original_filezilla/src/interface/filezilla-volume_enumerator.o differ
567	Binary files filezilla-3.5.3/src/interface/filezilla-welcome_dialog.o and original_filezilla/src/interface/filezilla-welcome_dialog.o differ
568	Binary files filezilla-3.5.3/src/interface/filezilla-window_state_manager.o and original_filezilla/src/interface/filezilla-window_state_manager.o differ
569	Binary files filezilla-3.5.3/src/interface/filezilla-wrapengine.o and original_filezilla/src/interface/filezilla-wrapengine.o differ
570	Binary files filezilla-3.5.3/src/interface/filezilla-xh_menu_ex.o and original_filezilla/src/interface/filezilla-xh_menu_ex.o differ
571	Binary files filezilla-3.5.3/src/interface/filezilla-xh_text_ex.o and original_filezilla/src/interface/filezilla-xh_text_ex.o differ
572	Binary files filezilla-3.5.3/src/interface/filezilla-xh_toolb_ex.o and original_filezilla/src/interface/filezilla-xh_toolb_ex.o differ
573	Binary files filezilla-3.5.3/src/interface/filezilla-xmlfunctions.o and original_filezilla/src/interface/filezilla-xmlfunctions.o differ
574	diff -ur filezilla-3.5.3/src/interface/loginmanager.cpp original_filezilla/src/interface/loginmanager.cpp
575	--- filezilla-3.5.3/src/interface/loginmanager.cpp 2012-09-02 22:08:03.553492121 +0530
576	+++ original_filezilla/src/interface/loginmanager.cpp 2011-05-08 09:00:18.000000000 +0530
577	@@ -10,9 +10,8 @@
578	wxASSERT(challenge == _T("") \|\| server.GetLogonType() == INTERACTIVE);
579
580	if (server.GetLogonType() == ASK)
581	- {
582	+ {
583	std::list<t_passwordcache>::const_iterator iter;
584	-
585	for (iter = m_passwordCache.begin(); iter != m_passwordCache.end(); iter++)
586	{
587	if (iter->host != server.GetHost())
588	@@ -21,12 +20,14 @@
589	continue;
590	if (iter->user != server.GetUser())
591	continue;
592	+
593	server.SetUser(server.GetUser(), iter->password);
594	return true;
595	}
596	}
597	if (silent)
598	return false;
599	+
600	return DisplayDialog(server, name, challenge);
601	}
602
603	@@ -34,7 +35,6 @@
604	{
605	wxDialog pwdDlg;
606	wxXmlResource::Get()->LoadDialog(&pwdDlg, wxGetApp().GetTopWindow(), _T("ID_ENTERPASSWORD"));
607	-
608	if (name == _T(""))
609	{
610	pwdDlg.GetSizer()->Show(XRCCTRL(pwdDlg, "ID_NAMELABEL", wxStaticText), false, true);
611	@@ -57,9 +57,9 @@
612	XRCCTRL(pwdDlg, "ID_CHALLENGE", wxTextCtrl)->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
613	}
614	XRCCTRL(pwdDlg, "ID_HOST", wxStaticText)->SetLabel(server.FormatHost());
615	-
616	+
617	if (server.GetUser() == _T(""))
618	- {
619	+ {
620	pwdDlg.SetTitle(_("Enter username and password"));
621	XRCCTRL(pwdDlg, "ID_OLD_USER_LABEL", wxStaticText)->Hide();
622	XRCCTRL(pwdDlg, "ID_OLD_USER", wxStaticText)->Hide();
623	@@ -78,7 +78,7 @@
624	XRCCTRL(pwdDlg, "ID_NEW_USER", wxTextCtrl)->SetFocus();
625	}
626	else
627	- {
628	+ {
629	XRCCTRL(pwdDlg, "ID_OLD_USER", wxStaticText)->SetLabel(server.GetUser());
630	XRCCTRL(pwdDlg, "ID_NEW_USER_LABEL", wxStaticText)->Hide();
631	XRCCTRL(pwdDlg, "ID_NEW_USER", wxTextCtrl)->Hide();
632	Only in filezilla-3.5.3/src/interface: loginmanager.cpp~
633	diff -ur filezilla-3.5.3/src/interface/Mainfrm.cpp original_filezilla/src/interface/Mainfrm.cpp
634	--- filezilla-3.5.3/src/interface/Mainfrm.cpp 2012-08-30 10:55:20.446810128 +0530
635	+++ original_filezilla/src/interface/Mainfrm.cpp 2011-12-29 10:00:18.000000000 +0530
636	@@ -131,8 +131,6 @@
637	EVT_MENU(XRCID("ID_MENU_SERVER_SEARCH"), CMainFrame::OnSearch)
638	EVT_MENU(XRCID("ID_MENU_FILE_NEWTAB"), CMainFrame::OnMenuNewTab)
639	EVT_MENU(XRCID("ID_MENU_FILE_CLOSETAB"), CMainFrame::OnMenuCloseTab)
640	- EVT_MENU(XRCID("ID_MENU_FILE_SAVETAB"), CMainFrame::OnMenuSaveTab)
641	- EVT_MENU(XRCID("ID_MENU_FILE_RESTORETAB"), CMainFrame::OnMenuRestoreTab)
642	END_EVENT_TABLE()
643
644	class CMainFrameStateEventHandler : public CStateEventHandler
645	@@ -2695,21 +2693,6 @@
646	m_pContextControl->CloseTab(m_pContextControl->GetCurrentTab());
647	}
648
649	-
650	-void CMainFrame::OnMenuSaveTab(wxCommandEvent& event)
651	-{
652	- if (m_pContextControl)
653	- m_pContextControl->SaveTab();
654	-}
655	-
656	-
657	-void CMainFrame::OnMenuRestoreTab(wxCommandEvent& event)
658	-{
659	- if (m_pContextControl)
660	- m_pContextControl->RestoreTab();
661	-}
662	-
663	-
664	void CMainFrame::SetBookmarksFromPath(const wxString& path)
665	{
666	if (!m_pContextControl)
667	Only in filezilla-3.5.3/src/interface: Mainfrm.cpp~
668	diff -ur filezilla-3.5.3/src/interface/Mainfrm.h original_filezilla/src/interface/Mainfrm.h
669	--- filezilla-3.5.3/src/interface/Mainfrm.h 2012-08-27 18:49:56.296816083 +0530
670	+++ original_filezilla/src/interface/Mainfrm.h 2011-12-06 10:00:16.000000000 +0530
671	@@ -148,9 +148,7 @@
672	void OnSearch(wxCommandEvent& event);
673	void OnMenuNewTab(wxCommandEvent& event);
674	void OnMenuCloseTab(wxCommandEvent& event);
675	- void OnMenuSaveTab(wxCommandEvent& event);
676	- void OnMenuRestoreTab(wxCommandEvent& event);
677	-
678	+
679	bool m_bInitDone;
680	bool m_bQuit;
681	wxEventType m_closeEvent;
682	Only in filezilla-3.5.3/src/interface: Mainfrm.h~
683	diff -ur filezilla-3.5.3/src/interface/Makefile original_filezilla/src/interface/Makefile
684	--- filezilla-3.5.3/src/interface/Makefile 2012-08-26 01:39:10.828630680 +0530
685	+++ original_filezilla/src/interface/Makefile 2012-09-02 21:28:05.605441589 +0530
686	@@ -264,12 +264,12 @@
687	dir1=`echo "$$dir1" \| sed -e "$$sed_rest"`; \
688	done; \
689	reldir="$$dir2"
690	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
691	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
692	AMTAR = $${TAR-tar}
693	AR = ar
694	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
695	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
696	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
697	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
698	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
699	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
700	AWK = mawk
701	CC = gcc
702	CCDEPMODE = depmode=gcc3
703	@@ -323,7 +323,7 @@
704	LIPO =
705	LN_S = ln -s
706	LTLIBOBJS =
707	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
708	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
709	MANIFEST_TOOL = :
710	MKDIR_P = /bin/mkdir -p
711	NM = /usr/bin/nm -B
712	@@ -366,10 +366,10 @@
713	WX_LIBS_STATIC =
714	WX_RESCOMP =
715	WX_VERSION = 2.8.12
716	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src/interface
717	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src/interface
718	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
719	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
720	+abs_builddir = /home/rnanwani/original_filezilla/src/interface
721	+abs_srcdir = /home/rnanwani/original_filezilla/src/interface
722	+abs_top_builddir = /home/rnanwani/original_filezilla
723	+abs_top_srcdir = /home/rnanwani/original_filezilla
724	ac_ct_AR = ar
725	ac_ct_CC = gcc
726	ac_ct_CXX = g++
727	@@ -399,7 +399,7 @@
728	htmldir = ${docdir}
729	includedir = ${prefix}/include
730	infodir = ${datarootdir}/info
731	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
732	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
733	libdir = ${exec_prefix}/lib
734	libexecdir = ${exec_prefix}/libexec
735	localedir = ${datarootdir}/locale
736	diff -ur filezilla-3.5.3/src/interface/quickconnectbar.cpp original_filezilla/src/interface/quickconnectbar.cpp
737	--- filezilla-3.5.3/src/interface/quickconnectbar.cpp 2012-09-02 22:06:12.169489774 +0530
738	+++ original_filezilla/src/interface/quickconnectbar.cpp 2012-01-08 16:49:37.000000000 +0530
739	@@ -60,7 +60,6 @@
740	return true;
741	}
742
743	-
744	void CQuickconnectBar::OnQuickconnect(wxCommandEvent& event)
745	{
746	CState* pState = CContextManager::Get()->GetCurrentContext();
747	Only in filezilla-3.5.3/src/interface: quickconnectbar.cpp~
748	diff -ur filezilla-3.5.3/src/interface/quickconnectbar.h original_filezilla/src/interface/quickconnectbar.h
749	--- filezilla-3.5.3/src/interface/quickconnectbar.h 2012-08-29 23:32:50.674749896 +0530
750	+++ original_filezilla/src/interface/quickconnectbar.h 2010-01-02 20:12:28.000000000 +0530
751	@@ -2,8 +2,6 @@
752	#define __QUICKCONNECTBAR_H__
753
754	class CMainFrame;
755	-class CState;
756	-
757	class CQuickconnectBar : public wxPanel
758	{
759	public:
760	@@ -11,7 +9,7 @@
761	virtual~CQuickconnectBar();
762
763	bool Create(CMainFrame* pParent);
764	-
765	+
766	void ClearFields();
767
768	protected:
769	@@ -23,7 +21,6 @@
770	void OnQuickconnectDropdown(wxCommandEvent& event);
771	void OnMenu(wxCommandEvent& event);
772	void OnKeyboardNavigation(wxNavigationKeyEvent& event);
773	-
774
775	wxTextCtrl* m_pHost;
776	wxTextCtrl* m_pUser;
777	Only in filezilla-3.5.3/src/interface: quickconnectbar.h~
778	diff -ur filezilla-3.5.3/src/interface/resources/16x16/Makefile original_filezilla/src/interface/resources/16x16/Makefile
779	--- filezilla-3.5.3/src/interface/resources/16x16/Makefile 2012-08-26 01:39:10.896630677 +0530
780	+++ original_filezilla/src/interface/resources/16x16/Makefile 2012-09-02 21:28:05.693441590 +0530
781	@@ -85,12 +85,12 @@
782	am__installdirs = "$(DESTDIR)$(resourcesdir)"
783	DATA = $(dist_resources_DATA)
784	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
785	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
786	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
787	AMTAR = $${TAR-tar}
788	AR = ar
789	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
790	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
791	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
792	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
793	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
794	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
795	AWK = mawk
796	CC = gcc
797	CCDEPMODE = depmode=gcc3
798	@@ -144,7 +144,7 @@
799	LIPO =
800	LN_S = ln -s
801	LTLIBOBJS =
802	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
803	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
804	MANIFEST_TOOL = :
805	MKDIR_P = /bin/mkdir -p
806	NM = /usr/bin/nm -B
807	@@ -187,10 +187,10 @@
808	WX_LIBS_STATIC =
809	WX_RESCOMP =
810	WX_VERSION = 2.8.12
811	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src/interface/resources/16x16
812	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src/interface/resources/16x16
813	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
814	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
815	+abs_builddir = /home/rnanwani/original_filezilla/src/interface/resources/16x16
816	+abs_srcdir = /home/rnanwani/original_filezilla/src/interface/resources/16x16
817	+abs_top_builddir = /home/rnanwani/original_filezilla
818	+abs_top_srcdir = /home/rnanwani/original_filezilla
819	ac_ct_AR = ar
820	ac_ct_CC = gcc
821	ac_ct_CXX = g++
822	@@ -220,7 +220,7 @@
823	htmldir = ${docdir}
824	includedir = ${prefix}/include
825	infodir = ${datarootdir}/info
826	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
827	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
828	libdir = ${exec_prefix}/lib
829	libexecdir = ${exec_prefix}/libexec
830	localedir = ${datarootdir}/locale
831	diff -ur filezilla-3.5.3/src/interface/resources/32x32/Makefile original_filezilla/src/interface/resources/32x32/Makefile
832	--- filezilla-3.5.3/src/interface/resources/32x32/Makefile 2012-08-26 01:39:10.916630676 +0530
833	+++ original_filezilla/src/interface/resources/32x32/Makefile 2012-09-02 21:28:05.721441591 +0530
834	@@ -85,12 +85,12 @@
835	am__installdirs = "$(DESTDIR)$(resourcesdir)"
836	DATA = $(dist_resources_DATA)
837	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
838	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
839	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
840	AMTAR = $${TAR-tar}
841	AR = ar
842	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
843	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
844	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
845	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
846	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
847	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
848	AWK = mawk
849	CC = gcc
850	CCDEPMODE = depmode=gcc3
851	@@ -144,7 +144,7 @@
852	LIPO =
853	LN_S = ln -s
854	LTLIBOBJS =
855	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
856	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
857	MANIFEST_TOOL = :
858	MKDIR_P = /bin/mkdir -p
859	NM = /usr/bin/nm -B
860	@@ -187,10 +187,10 @@
861	WX_LIBS_STATIC =
862	WX_RESCOMP =
863	WX_VERSION = 2.8.12
864	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src/interface/resources/32x32
865	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src/interface/resources/32x32
866	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
867	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
868	+abs_builddir = /home/rnanwani/original_filezilla/src/interface/resources/32x32
869	+abs_srcdir = /home/rnanwani/original_filezilla/src/interface/resources/32x32
870	+abs_top_builddir = /home/rnanwani/original_filezilla
871	+abs_top_srcdir = /home/rnanwani/original_filezilla
872	ac_ct_AR = ar
873	ac_ct_CC = gcc
874	ac_ct_CXX = g++
875	@@ -220,7 +220,7 @@
876	htmldir = ${docdir}
877	includedir = ${prefix}/include
878	infodir = ${datarootdir}/info
879	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
880	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
881	libdir = ${exec_prefix}/lib
882	libexecdir = ${exec_prefix}/libexec
883	localedir = ${datarootdir}/locale
884	diff -ur filezilla-3.5.3/src/interface/resources/blukis/Makefile original_filezilla/src/interface/resources/blukis/Makefile
885	--- filezilla-3.5.3/src/interface/resources/blukis/Makefile 2012-08-26 01:39:10.984630673 +0530
886	+++ original_filezilla/src/interface/resources/blukis/Makefile 2012-09-02 21:28:05.821441593 +0530
887	@@ -89,12 +89,12 @@
888	DATA = $(dist_resources_DATA) $(dist_resources16_DATA) \
889	$(dist_resources32_DATA) $(dist_resources48_DATA)
890	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
891	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
892	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
893	AMTAR = $${TAR-tar}
894	AR = ar
895	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
896	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
897	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
898	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
899	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
900	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
901	AWK = mawk
902	CC = gcc
903	CCDEPMODE = depmode=gcc3
904	@@ -148,7 +148,7 @@
905	LIPO =
906	LN_S = ln -s
907	LTLIBOBJS =
908	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
909	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
910	MANIFEST_TOOL = :
911	MKDIR_P = /bin/mkdir -p
912	NM = /usr/bin/nm -B
913	@@ -191,10 +191,10 @@
914	WX_LIBS_STATIC =
915	WX_RESCOMP =
916	WX_VERSION = 2.8.12
917	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src/interface/resources/blukis
918	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src/interface/resources/blukis
919	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
920	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
921	+abs_builddir = /home/rnanwani/original_filezilla/src/interface/resources/blukis
922	+abs_srcdir = /home/rnanwani/original_filezilla/src/interface/resources/blukis
923	+abs_top_builddir = /home/rnanwani/original_filezilla
924	+abs_top_srcdir = /home/rnanwani/original_filezilla
925	ac_ct_AR = ar
926	ac_ct_CC = gcc
927	ac_ct_CXX = g++
928	@@ -224,7 +224,7 @@
929	htmldir = ${docdir}
930	includedir = ${prefix}/include
931	infodir = ${datarootdir}/info
932	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
933	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
934	libdir = ${exec_prefix}/lib
935	libexecdir = ${exec_prefix}/libexec
936	localedir = ${datarootdir}/locale
937	diff -ur filezilla-3.5.3/src/interface/resources/cyril/16x16/Makefile original_filezilla/src/interface/resources/cyril/16x16/Makefile
938	--- filezilla-3.5.3/src/interface/resources/cyril/16x16/Makefile 2012-08-26 01:39:10.972630673 +0530
939	+++ original_filezilla/src/interface/resources/cyril/16x16/Makefile 2012-09-02 21:28:05.793441592 +0530
940	@@ -85,12 +85,12 @@
941	am__installdirs = "$(DESTDIR)$(resourcesdir)"
942	DATA = $(dist_resources_DATA)
943	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
944	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
945	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
946	AMTAR = $${TAR-tar}
947	AR = ar
948	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
949	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
950	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
951	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
952	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
953	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
954	AWK = mawk
955	CC = gcc
956	CCDEPMODE = depmode=gcc3
957	@@ -144,7 +144,7 @@
958	LIPO =
959	LN_S = ln -s
960	LTLIBOBJS =
961	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
962	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
963	MANIFEST_TOOL = :
964	MKDIR_P = /bin/mkdir -p
965	NM = /usr/bin/nm -B
966	@@ -187,10 +187,10 @@
967	WX_LIBS_STATIC =
968	WX_RESCOMP =
969	WX_VERSION = 2.8.12
970	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src/interface/resources/cyril/16x16
971	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src/interface/resources/cyril/16x16
972	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
973	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
974	+abs_builddir = /home/rnanwani/original_filezilla/src/interface/resources/cyril/16x16
975	+abs_srcdir = /home/rnanwani/original_filezilla/src/interface/resources/cyril/16x16
976	+abs_top_builddir = /home/rnanwani/original_filezilla
977	+abs_top_srcdir = /home/rnanwani/original_filezilla
978	ac_ct_AR = ar
979	ac_ct_CC = gcc
980	ac_ct_CXX = g++
981	@@ -220,7 +220,7 @@
982	htmldir = ${docdir}
983	includedir = ${prefix}/include
984	infodir = ${datarootdir}/info
985	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
986	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
987	libdir = ${exec_prefix}/lib
988	libexecdir = ${exec_prefix}/libexec
989	localedir = ${datarootdir}/locale
990	diff -ur filezilla-3.5.3/src/interface/resources/cyril/Makefile original_filezilla/src/interface/resources/cyril/Makefile
991	--- filezilla-3.5.3/src/interface/resources/cyril/Makefile 2012-08-26 01:39:10.952630674 +0530
992	+++ original_filezilla/src/interface/resources/cyril/Makefile 2012-09-02 21:28:05.773441592 +0530
993	@@ -125,12 +125,12 @@
994	dir1=`echo "$$dir1" \| sed -e "$$sed_rest"`; \
995	done; \
996	reldir="$$dir2"
997	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
998	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
999	AMTAR = $${TAR-tar}
1000	AR = ar
1001	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
1002	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
1003	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
1004	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
1005	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
1006	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
1007	AWK = mawk
1008	CC = gcc
1009	CCDEPMODE = depmode=gcc3
1010	@@ -184,7 +184,7 @@
1011	LIPO =
1012	LN_S = ln -s
1013	LTLIBOBJS =
1014	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
1015	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
1016	MANIFEST_TOOL = :
1017	MKDIR_P = /bin/mkdir -p
1018	NM = /usr/bin/nm -B
1019	@@ -227,10 +227,10 @@
1020	WX_LIBS_STATIC =
1021	WX_RESCOMP =
1022	WX_VERSION = 2.8.12
1023	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src/interface/resources/cyril
1024	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src/interface/resources/cyril
1025	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
1026	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
1027	+abs_builddir = /home/rnanwani/original_filezilla/src/interface/resources/cyril
1028	+abs_srcdir = /home/rnanwani/original_filezilla/src/interface/resources/cyril
1029	+abs_top_builddir = /home/rnanwani/original_filezilla
1030	+abs_top_srcdir = /home/rnanwani/original_filezilla
1031	ac_ct_AR = ar
1032	ac_ct_CC = gcc
1033	ac_ct_CXX = g++
1034	@@ -260,7 +260,7 @@
1035	htmldir = ${docdir}
1036	includedir = ${prefix}/include
1037	infodir = ${datarootdir}/info
1038	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
1039	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
1040	libdir = ${exec_prefix}/lib
1041	libexecdir = ${exec_prefix}/libexec
1042	localedir = ${datarootdir}/locale
1043	Only in filezilla-3.5.3/src/interface/resources: dialogs.xrc~
1044	diff -ur filezilla-3.5.3/src/interface/resources/lone/Makefile original_filezilla/src/interface/resources/lone/Makefile
1045	--- filezilla-3.5.3/src/interface/resources/lone/Makefile 2012-08-26 01:39:11.004630672 +0530
1046	+++ original_filezilla/src/interface/resources/lone/Makefile 2012-09-02 21:28:05.853441594 +0530
1047	@@ -89,12 +89,12 @@
1048	DATA = $(dist_resources_DATA) $(dist_resources16_DATA) \
1049	$(dist_resources32_DATA) $(dist_resources48_DATA)
1050	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1051	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
1052	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
1053	AMTAR = $${TAR-tar}
1054	AR = ar
1055	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
1056	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
1057	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
1058	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
1059	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
1060	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
1061	AWK = mawk
1062	CC = gcc
1063	CCDEPMODE = depmode=gcc3
1064	@@ -148,7 +148,7 @@
1065	LIPO =
1066	LN_S = ln -s
1067	LTLIBOBJS =
1068	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
1069	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
1070	MANIFEST_TOOL = :
1071	MKDIR_P = /bin/mkdir -p
1072	NM = /usr/bin/nm -B
1073	@@ -191,10 +191,10 @@
1074	WX_LIBS_STATIC =
1075	WX_RESCOMP =
1076	WX_VERSION = 2.8.12
1077	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src/interface/resources/lone
1078	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src/interface/resources/lone
1079	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
1080	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
1081	+abs_builddir = /home/rnanwani/original_filezilla/src/interface/resources/lone
1082	+abs_srcdir = /home/rnanwani/original_filezilla/src/interface/resources/lone
1083	+abs_top_builddir = /home/rnanwani/original_filezilla
1084	+abs_top_srcdir = /home/rnanwani/original_filezilla
1085	ac_ct_AR = ar
1086	ac_ct_CC = gcc
1087	ac_ct_CXX = g++
1088	@@ -224,7 +224,7 @@
1089	htmldir = ${docdir}
1090	includedir = ${prefix}/include
1091	infodir = ${datarootdir}/info
1092	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
1093	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
1094	libdir = ${exec_prefix}/lib
1095	libexecdir = ${exec_prefix}/libexec
1096	localedir = ${datarootdir}/locale
1097	diff -ur filezilla-3.5.3/src/interface/resources/Makefile original_filezilla/src/interface/resources/Makefile
1098	--- filezilla-3.5.3/src/interface/resources/Makefile 2012-08-26 01:39:10.848630679 +0530
1099	+++ original_filezilla/src/interface/resources/Makefile 2012-09-02 21:28:05.621441589 +0530
1100	@@ -136,12 +136,12 @@
1101	dir1=`echo "$$dir1" \| sed -e "$$sed_rest"`; \
1102	done; \
1103	reldir="$$dir2"
1104	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
1105	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
1106	AMTAR = $${TAR-tar}
1107	AR = ar
1108	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
1109	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
1110	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
1111	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
1112	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
1113	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
1114	AWK = mawk
1115	CC = gcc
1116	CCDEPMODE = depmode=gcc3
1117	@@ -195,7 +195,7 @@
1118	LIPO =
1119	LN_S = ln -s
1120	LTLIBOBJS =
1121	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
1122	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
1123	MANIFEST_TOOL = :
1124	MKDIR_P = /bin/mkdir -p
1125	NM = /usr/bin/nm -B
1126	@@ -238,10 +238,10 @@
1127	WX_LIBS_STATIC =
1128	WX_RESCOMP =
1129	WX_VERSION = 2.8.12
1130	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src/interface/resources
1131	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src/interface/resources
1132	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
1133	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
1134	+abs_builddir = /home/rnanwani/original_filezilla/src/interface/resources
1135	+abs_srcdir = /home/rnanwani/original_filezilla/src/interface/resources
1136	+abs_top_builddir = /home/rnanwani/original_filezilla
1137	+abs_top_srcdir = /home/rnanwani/original_filezilla
1138	ac_ct_AR = ar
1139	ac_ct_CC = gcc
1140	ac_ct_CXX = g++
1141	@@ -271,7 +271,7 @@
1142	htmldir = ${docdir}
1143	includedir = ${prefix}/include
1144	infodir = ${datarootdir}/info
1145	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
1146	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
1147	libdir = ${exec_prefix}/lib
1148	libexecdir = ${exec_prefix}/libexec
1149	localedir = ${datarootdir}/locale
1150	diff -ur filezilla-3.5.3/src/interface/resources/menus.xrc original_filezilla/src/interface/resources/menus.xrc
1151	--- filezilla-3.5.3/src/interface/resources/menus.xrc 2012-08-27 18:13:01.958302629 +0530
1152	+++ original_filezilla/src/interface/resources/menus.xrc 2011-08-30 09:00:23.000000000 +0530
1153	@@ -22,16 +22,6 @@
1154	<accel>CTRL+W</accel>
1155	<help>Closes current tab</help>
1156	</object>
1157	- <object class="wxMenuItem" name="ID_MENU_FILE_SAVETAB">
1158	- <label>Save All Tabs</label>
1159	- <accel>CTRL+SHIFT+S</accel>
1160	- <help>Saves all tabs currently open in this session</help>
1161	- </object>
1162	- <object class="wxMenuItem" name="ID_MENU_FILE_RESTORETAB">
1163	- <label>Restore Tabs From Last Session</label>
1164	- <accel>CTRL+SHIFT+R</accel>
1165	- <help>Restores all tabs from the last session</help>
1166	- </object>
1167	<object class="separator"/>
1168	<object class="wxMenuItem" name="ID_EXPORT">
1169	<label>&Export...</label>
1170	@@ -607,4 +597,4 @@
1171	<label>&Configure speed limits...</label>
1172	</object>
1173	</object>
1174	-</resource>
1175	+</resource>
1176	\ No newline at end of file
1177	Only in filezilla-3.5.3/src/interface/resources: menus.xrc~
1178	diff -ur filezilla-3.5.3/src/interface/resources/minimal/Makefile original_filezilla/src/interface/resources/minimal/Makefile
1179	--- filezilla-3.5.3/src/interface/resources/minimal/Makefile 2012-08-26 01:39:11.020630671 +0530
1180	+++ original_filezilla/src/interface/resources/minimal/Makefile 2012-09-02 21:28:05.881441595 +0530
1181	@@ -88,12 +88,12 @@
1182	DATA = $(dist_resources_DATA) $(dist_resources16_DATA) \
1183	$(dist_resources32_DATA)
1184	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1185	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
1186	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
1187	AMTAR = $${TAR-tar}
1188	AR = ar
1189	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
1190	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
1191	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
1192	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
1193	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
1194	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
1195	AWK = mawk
1196	CC = gcc
1197	CCDEPMODE = depmode=gcc3
1198	@@ -147,7 +147,7 @@
1199	LIPO =
1200	LN_S = ln -s
1201	LTLIBOBJS =
1202	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
1203	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
1204	MANIFEST_TOOL = :
1205	MKDIR_P = /bin/mkdir -p
1206	NM = /usr/bin/nm -B
1207	@@ -190,10 +190,10 @@
1208	WX_LIBS_STATIC =
1209	WX_RESCOMP =
1210	WX_VERSION = 2.8.12
1211	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src/interface/resources/minimal
1212	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src/interface/resources/minimal
1213	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
1214	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
1215	+abs_builddir = /home/rnanwani/original_filezilla/src/interface/resources/minimal
1216	+abs_srcdir = /home/rnanwani/original_filezilla/src/interface/resources/minimal
1217	+abs_top_builddir = /home/rnanwani/original_filezilla
1218	+abs_top_srcdir = /home/rnanwani/original_filezilla
1219	ac_ct_AR = ar
1220	ac_ct_CC = gcc
1221	ac_ct_CXX = g++
1222	@@ -223,7 +223,7 @@
1223	htmldir = ${docdir}
1224	includedir = ${prefix}/include
1225	infodir = ${datarootdir}/info
1226	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
1227	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
1228	libdir = ${exec_prefix}/lib
1229	libexecdir = ${exec_prefix}/libexec
1230	localedir = ${datarootdir}/locale
1231	diff -ur filezilla-3.5.3/src/interface/resources/opencrystal/Makefile original_filezilla/src/interface/resources/opencrystal/Makefile
1232	--- filezilla-3.5.3/src/interface/resources/opencrystal/Makefile 2012-08-26 01:39:11.040630670 +0530
1233	+++ original_filezilla/src/interface/resources/opencrystal/Makefile 2012-09-02 21:28:05.909441595 +0530
1234	@@ -92,12 +92,12 @@
1235	$(dist_resources20_DATA) $(dist_resources24_DATA) \
1236	$(dist_resources32_DATA) $(dist_resources48_DATA)
1237	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1238	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
1239	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
1240	AMTAR = $${TAR-tar}
1241	AR = ar
1242	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
1243	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
1244	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
1245	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
1246	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
1247	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
1248	AWK = mawk
1249	CC = gcc
1250	CCDEPMODE = depmode=gcc3
1251	@@ -151,7 +151,7 @@
1252	LIPO =
1253	LN_S = ln -s
1254	LTLIBOBJS =
1255	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
1256	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
1257	MANIFEST_TOOL = :
1258	MKDIR_P = /bin/mkdir -p
1259	NM = /usr/bin/nm -B
1260	@@ -194,10 +194,10 @@
1261	WX_LIBS_STATIC =
1262	WX_RESCOMP =
1263	WX_VERSION = 2.8.12
1264	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src/interface/resources/opencrystal
1265	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src/interface/resources/opencrystal
1266	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
1267	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
1268	+abs_builddir = /home/rnanwani/original_filezilla/src/interface/resources/opencrystal
1269	+abs_srcdir = /home/rnanwani/original_filezilla/src/interface/resources/opencrystal
1270	+abs_top_builddir = /home/rnanwani/original_filezilla
1271	+abs_top_srcdir = /home/rnanwani/original_filezilla
1272	ac_ct_AR = ar
1273	ac_ct_CC = gcc
1274	ac_ct_CXX = g++
1275	@@ -227,7 +227,7 @@
1276	htmldir = ${docdir}
1277	includedir = ${prefix}/include
1278	infodir = ${datarootdir}/info
1279	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
1280	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
1281	libdir = ${exec_prefix}/lib
1282	libexecdir = ${exec_prefix}/libexec
1283	localedir = ${datarootdir}/locale
1284	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_connection_active.o and original_filezilla/src/interface/settings/filezilla-optionspage_connection_active.o differ
1285	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_connection_ftp.o and original_filezilla/src/interface/settings/filezilla-optionspage_connection_ftp.o differ
1286	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_connection.o and original_filezilla/src/interface/settings/filezilla-optionspage_connection.o differ
1287	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_connection_passive.o and original_filezilla/src/interface/settings/filezilla-optionspage_connection_passive.o differ
1288	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_connection_sftp.o and original_filezilla/src/interface/settings/filezilla-optionspage_connection_sftp.o differ
1289	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_dateformatting.o and original_filezilla/src/interface/settings/filezilla-optionspage_dateformatting.o differ
1290	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_debug.o and original_filezilla/src/interface/settings/filezilla-optionspage_debug.o differ
1291	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_edit_associations.o and original_filezilla/src/interface/settings/filezilla-optionspage_edit_associations.o differ
1292	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_edit.o and original_filezilla/src/interface/settings/filezilla-optionspage_edit.o differ
1293	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_fileexists.o and original_filezilla/src/interface/settings/filezilla-optionspage_fileexists.o differ
1294	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_filelists.o and original_filezilla/src/interface/settings/filezilla-optionspage_filelists.o differ
1295	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_filetype.o and original_filezilla/src/interface/settings/filezilla-optionspage_filetype.o differ
1296	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_ftpproxy.o and original_filezilla/src/interface/settings/filezilla-optionspage_ftpproxy.o differ
1297	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_interface.o and original_filezilla/src/interface/settings/filezilla-optionspage_interface.o differ
1298	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_language.o and original_filezilla/src/interface/settings/filezilla-optionspage_language.o differ
1299	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_logging.o and original_filezilla/src/interface/settings/filezilla-optionspage_logging.o differ
1300	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage.o and original_filezilla/src/interface/settings/filezilla-optionspage.o differ
1301	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_proxy.o and original_filezilla/src/interface/settings/filezilla-optionspage_proxy.o differ
1302	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_sizeformatting.o and original_filezilla/src/interface/settings/filezilla-optionspage_sizeformatting.o differ
1303	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_themes.o and original_filezilla/src/interface/settings/filezilla-optionspage_themes.o differ
1304	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_transfer.o and original_filezilla/src/interface/settings/filezilla-optionspage_transfer.o differ
1305	Binary files filezilla-3.5.3/src/interface/settings/filezilla-optionspage_updatecheck.o and original_filezilla/src/interface/settings/filezilla-optionspage_updatecheck.o differ
1306	Binary files filezilla-3.5.3/src/interface/settings/filezilla-settingsdialog.o and original_filezilla/src/interface/settings/filezilla-settingsdialog.o differ
1307	Only in filezilla-3.5.3/src/interface: sitemanager_dialog.cpp~
1308	diff -ur filezilla-3.5.3/src/interface/state.cpp original_filezilla/src/interface/state.cpp
1309	--- filezilla-3.5.3/src/interface/state.cpp 2012-08-30 10:54:49.990811302 +0530
1310	+++ original_filezilla/src/interface/state.cpp 2011-04-25 09:00:17.000000000 +0530
1311	@@ -493,7 +493,6 @@
1312	m_pServer = new CServer(*server);
1313
1314	const wxString& name = server->GetName();
1315	-
1316	if (!name.IsEmpty())
1317	m_title = name + _T(" - ") + server->FormatServer();
1318	else
1319	@@ -521,14 +520,14 @@
1320	}
1321
1322	bool CState::Connect(const CServer& server, const CServerPath& path /=CServerPath()/)
1323	-{
1324	+{
1325	if (!m_pEngine)
1326	return false;
1327	if (m_pEngine->IsConnected() \|\| m_pEngine->IsBusy() \|\| !m_pCommandQueue->Idle())
1328	m_pCommandQueue->Cancel();
1329	m_pRecursiveOperation->StopRecursiveOperation();
1330	SetSyncBrowse(false);
1331	-
1332	+
1333	m_pCommandQueue->ProcessCommand(new CConnectCommand(server));
1334	m_pCommandQueue->ProcessCommand(new CListCommand(path, _T(""), LIST_FLAG_FALLBACK_CURRENT));
1335
1336	Only in filezilla-3.5.3/src/interface: state.cpp~
1337	diff -ur filezilla-3.5.3/src/interface/xmlfunctions.cpp original_filezilla/src/interface/xmlfunctions.cpp
1338	--- filezilla-3.5.3/src/interface/xmlfunctions.cpp 2012-08-30 11:14:24.805051987 +0530
1339	+++ original_filezilla/src/interface/xmlfunctions.cpp 2011-12-02 10:00:19.000000000 +0530
1340	@@ -493,6 +493,7 @@
1341	return true;
1342
1343	const wxString& fullPath = file.GetFullPath();
1344	+
1345	TiXmlDocument* pDocument = node->GetDocument();
1346
1347	bool exists = false;
1348	Only in filezilla-3.5.3/src/interface: xmlfunctions.cpp~
1349	diff -ur filezilla-3.5.3/src/Makefile original_filezilla/src/Makefile
1350	--- filezilla-3.5.3/src/Makefile 2012-08-26 01:39:10.740630684 +0530
1351	+++ original_filezilla/src/Makefile 2012-09-02 21:28:05.453441586 +0530
1352	@@ -98,12 +98,12 @@
1353	dir1=`echo "$$dir1" \| sed -e "$$sed_rest"`; \
1354	done; \
1355	reldir="$$dir2"
1356	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
1357	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
1358	AMTAR = $${TAR-tar}
1359	AR = ar
1360	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
1361	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
1362	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
1363	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
1364	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
1365	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
1366	AWK = mawk
1367	CC = gcc
1368	CCDEPMODE = depmode=gcc3
1369	@@ -157,7 +157,7 @@
1370	LIPO =
1371	LN_S = ln -s
1372	LTLIBOBJS =
1373	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
1374	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
1375	MANIFEST_TOOL = :
1376	MKDIR_P = /bin/mkdir -p
1377	NM = /usr/bin/nm -B
1378	@@ -200,10 +200,10 @@
1379	WX_LIBS_STATIC =
1380	WX_RESCOMP =
1381	WX_VERSION = 2.8.12
1382	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src
1383	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src
1384	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
1385	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
1386	+abs_builddir = /home/rnanwani/original_filezilla/src
1387	+abs_srcdir = /home/rnanwani/original_filezilla/src
1388	+abs_top_builddir = /home/rnanwani/original_filezilla
1389	+abs_top_srcdir = /home/rnanwani/original_filezilla
1390	ac_ct_AR = ar
1391	ac_ct_CC = gcc
1392	ac_ct_CXX = g++
1393	@@ -233,7 +233,7 @@
1394	htmldir = ${docdir}
1395	includedir = ${prefix}/include
1396	infodir = ${datarootdir}/info
1397	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
1398	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
1399	libdir = ${exec_prefix}/lib
1400	libexecdir = ${exec_prefix}/libexec
1401	localedir = ${datarootdir}/locale
1402	Binary files filezilla-3.5.3/src/putty/fzputtygen and original_filezilla/src/putty/fzputtygen differ
1403	Binary files filezilla-3.5.3/src/putty/fzputtygen-cmdgen.o and original_filezilla/src/putty/fzputtygen-cmdgen.o differ
1404	Binary files filezilla-3.5.3/src/putty/fzputtygen-import.o and original_filezilla/src/putty/fzputtygen-import.o differ
1405	Binary files filezilla-3.5.3/src/putty/fzputtygen-notiming.o and original_filezilla/src/putty/fzputtygen-notiming.o differ
1406	Binary files filezilla-3.5.3/src/putty/fzputtygen-tree234.o and original_filezilla/src/putty/fzputtygen-tree234.o differ
1407	Binary files filezilla-3.5.3/src/putty/fzsftp and original_filezilla/src/putty/fzsftp differ
1408	Binary files filezilla-3.5.3/src/putty/fzsftp-be_none.o and original_filezilla/src/putty/fzsftp-be_none.o differ
1409	Binary files filezilla-3.5.3/src/putty/fzsftp-cmdline.o and original_filezilla/src/putty/fzsftp-cmdline.o differ
1410	Binary files filezilla-3.5.3/src/putty/fzsftp-cproxy.o and original_filezilla/src/putty/fzsftp-cproxy.o differ
1411	Binary files filezilla-3.5.3/src/putty/fzsftp-fzsftp.o and original_filezilla/src/putty/fzsftp-fzsftp.o differ
1412	Binary files filezilla-3.5.3/src/putty/fzsftp-int64.o and original_filezilla/src/putty/fzsftp-int64.o differ
1413	Binary files filezilla-3.5.3/src/putty/fzsftp-logging.o and original_filezilla/src/putty/fzsftp-logging.o differ
1414	Binary files filezilla-3.5.3/src/putty/fzsftp-pinger.o and original_filezilla/src/putty/fzsftp-pinger.o differ
1415	Binary files filezilla-3.5.3/src/putty/fzsftp-portfwd.o and original_filezilla/src/putty/fzsftp-portfwd.o differ
1416	Binary files filezilla-3.5.3/src/putty/fzsftp-proxy.o and original_filezilla/src/putty/fzsftp-proxy.o differ
1417	Binary files filezilla-3.5.3/src/putty/fzsftp-psftp.o and original_filezilla/src/putty/fzsftp-psftp.o differ
1418	Binary files filezilla-3.5.3/src/putty/fzsftp-settings.o and original_filezilla/src/putty/fzsftp-settings.o differ
1419	Binary files filezilla-3.5.3/src/putty/fzsftp-sftp.o and original_filezilla/src/putty/fzsftp-sftp.o differ
1420	Binary files filezilla-3.5.3/src/putty/fzsftp-ssharcf.o and original_filezilla/src/putty/fzsftp-ssharcf.o differ
1421	Binary files filezilla-3.5.3/src/putty/fzsftp-sshblowf.o and original_filezilla/src/putty/fzsftp-sshblowf.o differ
1422	Binary files filezilla-3.5.3/src/putty/fzsftp-sshcrcda.o and original_filezilla/src/putty/fzsftp-sshcrcda.o differ
1423	Binary files filezilla-3.5.3/src/putty/fzsftp-sshcrc.o and original_filezilla/src/putty/fzsftp-sshcrc.o differ
1424	Binary files filezilla-3.5.3/src/putty/fzsftp-sshdh.o and original_filezilla/src/putty/fzsftp-sshdh.o differ
1425	Binary files filezilla-3.5.3/src/putty/fzsftp-sshdss.o and original_filezilla/src/putty/fzsftp-sshdss.o differ
1426	Binary files filezilla-3.5.3/src/putty/fzsftp-ssh.o and original_filezilla/src/putty/fzsftp-ssh.o differ
1427	Binary files filezilla-3.5.3/src/putty/fzsftp-sshsha.o and original_filezilla/src/putty/fzsftp-sshsha.o differ
1428	Binary files filezilla-3.5.3/src/putty/fzsftp-sshzlib.o and original_filezilla/src/putty/fzsftp-sshzlib.o differ
1429	Binary files filezilla-3.5.3/src/putty/fzsftp-time.o and original_filezilla/src/putty/fzsftp-time.o differ
1430	Binary files filezilla-3.5.3/src/putty/fzsftp-timing.o and original_filezilla/src/putty/fzsftp-timing.o differ
1431	Binary files filezilla-3.5.3/src/putty/fzsftp-tree234.o and original_filezilla/src/putty/fzsftp-tree234.o differ
1432	Binary files filezilla-3.5.3/src/putty/fzsftp-version.o and original_filezilla/src/putty/fzsftp-version.o differ
1433	Binary files filezilla-3.5.3/src/putty/fzsftp-wildcard.o and original_filezilla/src/putty/fzsftp-wildcard.o differ
1434	Binary files filezilla-3.5.3/src/putty/fzsftp-x11fwd.o and original_filezilla/src/putty/fzsftp-x11fwd.o differ
1435	Binary files filezilla-3.5.3/src/putty/libfzputtycommon.a and original_filezilla/src/putty/libfzputtycommon.a differ
1436	Binary files filezilla-3.5.3/src/putty/libfzputtycommon_a-fzprintf.o and original_filezilla/src/putty/libfzputtycommon_a-fzprintf.o differ
1437	Binary files filezilla-3.5.3/src/putty/libfzputtycommon_a-misc.o and original_filezilla/src/putty/libfzputtycommon_a-misc.o differ
1438	Binary files filezilla-3.5.3/src/putty/libfzputtycommon_a-sshaes.o and original_filezilla/src/putty/libfzputtycommon_a-sshaes.o differ
1439	Binary files filezilla-3.5.3/src/putty/libfzputtycommon_a-sshbn.o and original_filezilla/src/putty/libfzputtycommon_a-sshbn.o differ
1440	Binary files filezilla-3.5.3/src/putty/libfzputtycommon_a-sshdes.o and original_filezilla/src/putty/libfzputtycommon_a-sshdes.o differ
1441	Binary files filezilla-3.5.3/src/putty/libfzputtycommon_a-sshdss.o and original_filezilla/src/putty/libfzputtycommon_a-sshdss.o differ
1442	Binary files filezilla-3.5.3/src/putty/libfzputtycommon_a-sshmd5.o and original_filezilla/src/putty/libfzputtycommon_a-sshmd5.o differ
1443	Binary files filezilla-3.5.3/src/putty/libfzputtycommon_a-sshpubk.o and original_filezilla/src/putty/libfzputtycommon_a-sshpubk.o differ
1444	Binary files filezilla-3.5.3/src/putty/libfzputtycommon_a-sshrand.o and original_filezilla/src/putty/libfzputtycommon_a-sshrand.o differ
1445	Binary files filezilla-3.5.3/src/putty/libfzputtycommon_a-sshrsa.o and original_filezilla/src/putty/libfzputtycommon_a-sshrsa.o differ
1446	Binary files filezilla-3.5.3/src/putty/libfzputtycommon_a-sshsh256.o and original_filezilla/src/putty/libfzputtycommon_a-sshsh256.o differ
1447	Binary files filezilla-3.5.3/src/putty/libfzputtycommon_a-sshsh512.o and original_filezilla/src/putty/libfzputtycommon_a-sshsh512.o differ
1448	Binary files filezilla-3.5.3/src/putty/libfzputtycommon_a-sshsha.o and original_filezilla/src/putty/libfzputtycommon_a-sshsha.o differ
1449	diff -ur filezilla-3.5.3/src/putty/Makefile original_filezilla/src/putty/Makefile
1450	--- filezilla-3.5.3/src/putty/Makefile 2012-08-26 01:39:11.064630669 +0530
1451	+++ original_filezilla/src/putty/Makefile 2012-09-02 21:28:05.945441596 +0530
1452	@@ -178,12 +178,12 @@
1453	dir1=`echo "$$dir1" \| sed -e "$$sed_rest"`; \
1454	done; \
1455	reldir="$$dir2"
1456	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
1457	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
1458	AMTAR = $${TAR-tar}
1459	AR = ar
1460	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
1461	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
1462	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
1463	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
1464	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
1465	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
1466	AWK = mawk
1467	CC = gcc
1468	CCDEPMODE = depmode=gcc3
1469	@@ -237,7 +237,7 @@
1470	LIPO =
1471	LN_S = ln -s
1472	LTLIBOBJS =
1473	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
1474	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
1475	MANIFEST_TOOL = :
1476	MKDIR_P = /bin/mkdir -p
1477	NM = /usr/bin/nm -B
1478	@@ -280,10 +280,10 @@
1479	WX_LIBS_STATIC =
1480	WX_RESCOMP =
1481	WX_VERSION = 2.8.12
1482	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src/putty
1483	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src/putty
1484	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
1485	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
1486	+abs_builddir = /home/rnanwani/original_filezilla/src/putty
1487	+abs_srcdir = /home/rnanwani/original_filezilla/src/putty
1488	+abs_top_builddir = /home/rnanwani/original_filezilla
1489	+abs_top_srcdir = /home/rnanwani/original_filezilla
1490	ac_ct_AR = ar
1491	ac_ct_CC = gcc
1492	ac_ct_CXX = g++
1493	@@ -313,7 +313,7 @@
1494	htmldir = ${docdir}
1495	includedir = ${prefix}/include
1496	infodir = ${datarootdir}/info
1497	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
1498	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
1499	libdir = ${exec_prefix}/lib
1500	libexecdir = ${exec_prefix}/libexec
1501	localedir = ${datarootdir}/locale
1502	Binary files filezilla-3.5.3/src/putty/unix/libfzputtycommon_ux.a and original_filezilla/src/putty/unix/libfzputtycommon_ux.a differ
1503	Binary files filezilla-3.5.3/src/putty/unix/libfzputtycommon_ux_a-uxcons.o and original_filezilla/src/putty/unix/libfzputtycommon_ux_a-uxcons.o differ
1504	Binary files filezilla-3.5.3/src/putty/unix/libfzputtycommon_ux_a-uxmisc.o and original_filezilla/src/putty/unix/libfzputtycommon_ux_a-uxmisc.o differ
1505	Binary files filezilla-3.5.3/src/putty/unix/libfzputtycommon_ux_a-uxnoise.o and original_filezilla/src/putty/unix/libfzputtycommon_ux_a-uxnoise.o differ
1506	Binary files filezilla-3.5.3/src/putty/unix/libfzputtycommon_ux_a-uxstore.o and original_filezilla/src/putty/unix/libfzputtycommon_ux_a-uxstore.o differ
1507	Binary files filezilla-3.5.3/src/putty/unix/libfzsftp_ux.a and original_filezilla/src/putty/unix/libfzsftp_ux.a differ
1508	Binary files filezilla-3.5.3/src/putty/unix/libfzsftp_ux_a-uxagentc.o and original_filezilla/src/putty/unix/libfzsftp_ux_a-uxagentc.o differ
1509	Binary files filezilla-3.5.3/src/putty/unix/libfzsftp_ux_a-uxnet.o and original_filezilla/src/putty/unix/libfzsftp_ux_a-uxnet.o differ
1510	Binary files filezilla-3.5.3/src/putty/unix/libfzsftp_ux_a-uxnoise.o and original_filezilla/src/putty/unix/libfzsftp_ux_a-uxnoise.o differ
1511	Binary files filezilla-3.5.3/src/putty/unix/libfzsftp_ux_a-uxproxy.o and original_filezilla/src/putty/unix/libfzsftp_ux_a-uxproxy.o differ
1512	Binary files filezilla-3.5.3/src/putty/unix/libfzsftp_ux_a-uxsel.o and original_filezilla/src/putty/unix/libfzsftp_ux_a-uxsel.o differ
1513	Binary files filezilla-3.5.3/src/putty/unix/libfzsftp_ux_a-uxsftp.o and original_filezilla/src/putty/unix/libfzsftp_ux_a-uxsftp.o differ
1514	diff -ur filezilla-3.5.3/src/putty/unix/Makefile original_filezilla/src/putty/unix/Makefile
1515	--- filezilla-3.5.3/src/putty/unix/Makefile 2012-08-26 01:39:11.080630668 +0530
1516	+++ original_filezilla/src/putty/unix/Makefile 2012-09-02 21:28:05.961441596 +0530
1517	@@ -92,12 +92,12 @@
1518	ETAGS = etags
1519	CTAGS = ctags
1520	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1521	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
1522	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
1523	AMTAR = $${TAR-tar}
1524	AR = ar
1525	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
1526	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
1527	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
1528	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
1529	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
1530	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
1531	AWK = mawk
1532	CC = gcc
1533	CCDEPMODE = depmode=gcc3
1534	@@ -151,7 +151,7 @@
1535	LIPO =
1536	LN_S = ln -s
1537	LTLIBOBJS =
1538	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
1539	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
1540	MANIFEST_TOOL = :
1541	MKDIR_P = /bin/mkdir -p
1542	NM = /usr/bin/nm -B
1543	@@ -194,10 +194,10 @@
1544	WX_LIBS_STATIC =
1545	WX_RESCOMP =
1546	WX_VERSION = 2.8.12
1547	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src/putty/unix
1548	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src/putty/unix
1549	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
1550	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
1551	+abs_builddir = /home/rnanwani/original_filezilla/src/putty/unix
1552	+abs_srcdir = /home/rnanwani/original_filezilla/src/putty/unix
1553	+abs_top_builddir = /home/rnanwani/original_filezilla
1554	+abs_top_srcdir = /home/rnanwani/original_filezilla
1555	ac_ct_AR = ar
1556	ac_ct_CC = gcc
1557	ac_ct_CXX = g++
1558	@@ -227,7 +227,7 @@
1559	htmldir = ${docdir}
1560	includedir = ${prefix}/include
1561	infodir = ${datarootdir}/info
1562	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
1563	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
1564	libdir = ${exec_prefix}/lib
1565	libexecdir = ${exec_prefix}/libexec
1566	localedir = ${datarootdir}/locale
1567	diff -ur filezilla-3.5.3/src/putty/windows/Makefile original_filezilla/src/putty/windows/Makefile
1568	--- filezilla-3.5.3/src/putty/windows/Makefile 2012-08-26 01:39:11.100630667 +0530
1569	+++ original_filezilla/src/putty/windows/Makefile 2012-09-02 21:28:05.985441597 +0530
1570	@@ -95,12 +95,12 @@
1571	ETAGS = etags
1572	CTAGS = ctags
1573	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1574	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
1575	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
1576	AMTAR = $${TAR-tar}
1577	AR = ar
1578	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
1579	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
1580	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
1581	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
1582	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
1583	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
1584	AWK = mawk
1585	CC = gcc
1586	CCDEPMODE = depmode=gcc3
1587	@@ -154,7 +154,7 @@
1588	LIPO =
1589	LN_S = ln -s
1590	LTLIBOBJS =
1591	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
1592	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
1593	MANIFEST_TOOL = :
1594	MKDIR_P = /bin/mkdir -p
1595	NM = /usr/bin/nm -B
1596	@@ -197,10 +197,10 @@
1597	WX_LIBS_STATIC =
1598	WX_RESCOMP =
1599	WX_VERSION = 2.8.12
1600	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src/putty/windows
1601	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src/putty/windows
1602	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
1603	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
1604	+abs_builddir = /home/rnanwani/original_filezilla/src/putty/windows
1605	+abs_srcdir = /home/rnanwani/original_filezilla/src/putty/windows
1606	+abs_top_builddir = /home/rnanwani/original_filezilla
1607	+abs_top_srcdir = /home/rnanwani/original_filezilla
1608	ac_ct_AR = ar
1609	ac_ct_CC = gcc
1610	ac_ct_CXX = g++
1611	@@ -230,7 +230,7 @@
1612	htmldir = ${docdir}
1613	includedir = ${prefix}/include
1614	infodir = ${datarootdir}/info
1615	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
1616	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
1617	libdir = ${exec_prefix}/lib
1618	libexecdir = ${exec_prefix}/libexec
1619	localedir = ${datarootdir}/locale
1620	diff -ur filezilla-3.5.3/src/tinyxml/Makefile original_filezilla/src/tinyxml/Makefile
1621	--- filezilla-3.5.3/src/tinyxml/Makefile 2012-08-26 01:39:10.780630682 +0530
1622	+++ original_filezilla/src/tinyxml/Makefile 2012-09-02 21:28:05.509441586 +0530
1623	@@ -82,12 +82,12 @@
1624	ETAGS = etags
1625	CTAGS = ctags
1626	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1627	-ACLOCAL = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run aclocal-1.11
1628	+ACLOCAL = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run aclocal-1.11
1629	AMTAR = $${TAR-tar}
1630	AR = ar
1631	-AUTOCONF = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoconf
1632	-AUTOHEADER = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run autoheader
1633	-AUTOMAKE = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run automake-1.11
1634	+AUTOCONF = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoconf
1635	+AUTOHEADER = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run autoheader
1636	+AUTOMAKE = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run automake-1.11
1637	AWK = mawk
1638	CC = gcc
1639	CCDEPMODE = depmode=gcc3
1640	@@ -141,7 +141,7 @@
1641	LIPO =
1642	LN_S = ln -s
1643	LTLIBOBJS =
1644	-MAKEINFO = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/missing --run makeinfo
1645	+MAKEINFO = ${SHELL} /home/rnanwani/original_filezilla/config/missing --run makeinfo
1646	MANIFEST_TOOL = :
1647	MKDIR_P = /bin/mkdir -p
1648	NM = /usr/bin/nm -B
1649	@@ -184,10 +184,10 @@
1650	WX_LIBS_STATIC =
1651	WX_RESCOMP =
1652	WX_VERSION = 2.8.12
1653	-abs_builddir = /home/rnanwani/filezilla-3.5.3/src/tinyxml
1654	-abs_srcdir = /home/rnanwani/filezilla-3.5.3/src/tinyxml
1655	-abs_top_builddir = /home/rnanwani/filezilla-3.5.3
1656	-abs_top_srcdir = /home/rnanwani/filezilla-3.5.3
1657	+abs_builddir = /home/rnanwani/original_filezilla/src/tinyxml
1658	+abs_srcdir = /home/rnanwani/original_filezilla/src/tinyxml
1659	+abs_top_builddir = /home/rnanwani/original_filezilla
1660	+abs_top_srcdir = /home/rnanwani/original_filezilla
1661	ac_ct_AR = ar
1662	ac_ct_CC = gcc
1663	ac_ct_CXX = g++
1664	@@ -217,7 +217,7 @@
1665	htmldir = ${docdir}
1666	includedir = ${prefix}/include
1667	infodir = ${datarootdir}/info
1668	-install_sh = ${SHELL} /home/rnanwani/filezilla-3.5.3/config/install-sh
1669	+install_sh = ${SHELL} /home/rnanwani/original_filezilla/config/install-sh
1670	libdir = ${exec_prefix}/lib
1671	libexecdir = ${exec_prefix}/libexec
1672	localedir = ${datarootdir}/locale

Download in other formats:

Original Format