linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2575
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2011-07-03 18:15:56 +0200
message:
  misc
modified:
  installer/SConscript
  win32/CrashLogger.cpp
  win32/WinUtil.h


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'installer/SConscript'
--- installer/SConscript	2011-06-24 18:55:47 +0000
+++ installer/SConscript	2011-07-03 16:15:56 +0000
@@ -86,7 +86,7 @@
 		name = os.path.basename(node.path)
 
 		if name == 'DCPlusPlus.exe':
-			env.Execute('strip "' + nixify(node.path) + '" -o "' + build_path + name + '"')
+			env.Execute(env['strip'] + ' "' + nixify(node.path) + '" -o "' + build_path + name + '"')
 
 		elif name[-3:] == '.po' or name[-4:] == '.pot':
 			# find the corresponding name among the NSIS language files

=== modified file 'win32/CrashLogger.cpp'
--- win32/CrashLogger.cpp	2011-06-27 15:44:45 +0000
+++ win32/CrashLogger.cpp	2011-07-03 16:15:56 +0000
@@ -264,6 +264,8 @@
 									int d = addr - lineaddr;
 									if(d >= 0 && d < delta) {
 										best = l;
+										if(d == 0) // found a perfect match.
+											break;
 										delta = d;
 									}
 								}

=== modified file 'win32/WinUtil.h'
--- win32/WinUtil.h	2011-06-28 20:07:49 +0000
+++ win32/WinUtil.h	2011-07-03 16:15:56 +0000
@@ -156,7 +156,6 @@
 		};
 	};
 
-	static void initFonts();
 	static void init();
 	static void uninit();