release: prepare 2.4 release

ringmail · Oct 5, 2015 · 9193727 · 9193727
1 parent 924ea29
commit 9193727
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Classes/Utils/Utils.m b/Classes/Utils/Utils.m
@@ -29,13 +29,14 @@ + (void)log:(OrtpLogLevel)severity file:(const char *)file line:(int)line format
 	va_start(args, format);
 	NSString *str = [[NSString alloc] initWithFormat:format arguments:args];
 	int filesize = 20;
+	const char *filename = strchr(file, '/') ? strrchr(file, '/') + 1 : file;
 	if (severity <= ORTP_DEBUG) {
 		// lol: ortp_debug(XXX) can be disabled at compile time, but ortp_log(ORTP_DEBUG, xxx) will always be valid even
 		//      not in debug build...
-		ortp_debug("%*s:%3d - %s", filesize, file + MAX((int)strlen(file) - filesize, 0), line, [str UTF8String]);
+		ortp_debug("%*s:%3d - %s", filesize, filename + MAX((int)strlen(filename) - filesize, 0), line, str.UTF8String);
 	} else {
-		ortp_log(severity, "%*s:%3d - %s", filesize, file + MAX((int)strlen(file) - filesize, 0), line,
-				 [str UTF8String]);
+		ortp_log(severity, "%*s:%3d - %s", filesize, filename + MAX((int)strlen(filename) - filesize, 0), line,
+				 str.UTF8String);
 	}
 	va_end(args);
 }

diff --git a/linphone-Info.plist b/linphone-Info.plist
@@ -53,7 +53,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.3</string>
+	<string>2.4</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationExitsOnSuspend</key>

diff --git a/submodules/linphone b/submodules/linphone