summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsje <sje@4f64403b-2f21-0410-a795-97e2b3489a10>2007-02-20 13:37:34 +0000
committersje <sje@4f64403b-2f21-0410-a795-97e2b3489a10>2007-02-20 13:37:34 +0000
commit8289b5770dcd59a911c7372a471ffb7b3f34df9b (patch)
tree5ea2686e18e9cb602aa3df233e430b8d9a1f5162
parentc8c5f2edbcddc14e4bc16f9dc8f6774a7fe9c73e (diff)
fix handling of fingerprint strings in options
git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@124 4f64403b-2f21-0410-a795-97e2b3489a10
-rw-r--r--otr/options.cpp1
-rw-r--r--otr/otr.mdsp14
-rw-r--r--otr/otr_private.h2
3 files changed, 10 insertions, 7 deletions
diff --git a/otr/options.cpp b/otr/options.cpp
index 650da18..fd7d5bc 100644
--- a/otr/options.cpp
+++ b/otr/options.cpp
@@ -494,6 +494,7 @@ INT_PTR CALLBACK DlgProcOpts1(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
for(std::map<HANDLE, char *>::iterator i = strlist.begin(); i != strlist.end(); i++)
free(i->second);
+ strlist.clear();
}
}
diff --git a/otr/otr.mdsp b/otr/otr.mdsp
index 8bbb2bb..0b8b6b2 100644
--- a/otr/otr.mdsp
+++ b/otr/otr.mdsp
@@ -99,14 +99,16 @@ extraResourceOptions=
2=resource.rc
[Other]
[History]
-options.cpp,6634
-common.h,1749
-dllmain.cpp,1960
+options.cpp,17104
+common.h,1699
+dllmain.cpp,1959
libotr\src\privkey.h,0
libotr\src\context.h,6126
libotr\src\userstate.h,0
libotr\src\privkey-t.h,0
-libotr\src\privkey.c,15492
-libotr\src\context.c,4882
+libotr\src\privkey.c,15456
+libotr\src\context.c,4830
..\..\include\m_folders.h,0
-otr_private.h,0
+otr_private.h,149
+.svn\text-base\options.cpp.svn-base,4330
+.svn\text-base\dllmain.cpp.svn-base,31704
diff --git a/otr/otr_private.h b/otr/otr_private.h
index bd4895d..a02a091 100644
--- a/otr/otr_private.h
+++ b/otr/otr_private.h
@@ -5,7 +5,7 @@
#define VER_MAJOR 0
#define VER_MINOR 4
#define VER_RELEASE 4
-#define VER_BUILD 0
+#define VER_BUILD 1
#define __STRINGIZE(x) #x
#define VER_STRING __STRINGIZE( VER_MAJOR.VER_MINOR.VER_RELEASE.VER_BUILD )