Merge branch 'master' of git.linphone.org:linphone

build/macos/linphone.bundle

@@ -104,13 +104,13 @@
        want to copy in to the bundle. The "dest" attribute is
        optional, as usual. Bundler will find all translations of that
        library/program under the indicated directory and copy them.-->
-  <translations name="linphone">
+  <data name="linphone">
     ${prefix:linphone}/share/locale
-  </translations>
-<translations name="gdk-pixbuf">
+  </data>
+  <translations name="gdk-pixbuf">
     ${prefix}/share/locale
   </translations>
-<translations name="glib20">
+  <translations name="glib20">
     ${prefix}/share/locale
   </translations>
   <translations name="gtk20">

console/linphonec.c

@@ -1330,11 +1330,7 @@ handle_configfile_migration()
 	char *old_cfg_gui;
 	char *old_cfg_cli;
 	char *new_cfg;
-#if !defined(_WIN32_WCE)
 	const char *home = getenv("HOME");
-#else
-	const char *home = ".";
-#endif /*_WIN32_WCE*/
 	new_cfg = ms_strdup_printf("%s/.linphonerc", home);
 
 	/*

tester/tester.c

@@ -289,6 +289,7 @@ LinphoneCoreManager* linphone_core_manager_init(const char* rc_file) {
 		linphone_core_set_record_file(mgr->lc,recordpath);
 		ms_free(recordpath);
 	}
+	linphone_core_set_user_certificates_path(mgr->lc,bc_tester_writable_dir_prefix);
 
 	if (rc_path) ms_free(rc_path);