diff --git a/Classes/Utils/Utils.m b/Classes/Utils/Utils.m index 227a06989..06ba6f344 100644 --- a/Classes/Utils/Utils.m +++ b/Classes/Utils/Utils.m @@ -29,13 +29,14 @@ 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 index cefdb0428..fb0c22ce2 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -53,7 +53,7 @@ CFBundleVersion - 2.3 + 2.4 LSRequiresIPhoneOS UIApplicationExitsOnSuspend diff --git a/submodules/linphone b/submodules/linphone index 6f44bbcc5..c0d58391e 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 6f44bbcc56a477489013bca7244805e371095f4d +Subproject commit c0d58391e938eb3a5d53d2d855b29e22ff865c7b