Install license file when building with CMake + fix license display when building with Visual Studio.

This commit is contained in:
Ghislain MARY 2015-02-27 22:58:18 +01:00
parent 3b75cab7ce
commit 8ae9d64d2d
2 changed files with 3 additions and 2 deletions

View file

@ -48,6 +48,7 @@ set(UI_FILES
)
set(PIXMAPS stock_people.png)
set(LICENSE ../COPYING)
set(SOURCE_FILES
audio_assistant.c
@ -103,7 +104,7 @@ install(TARGETS linphone-gtk
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
install(FILES ${UI_FILES} ${PIXMAPS}
install(FILES ${UI_FILES} ${PIXMAPS} ${LICENSE}
DESTINATION ${PACKAGE_DATA_DIR}/linphone
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
)

View file

@ -560,7 +560,7 @@ void linphone_gtk_show_about(void){
if (filestat.st_size>0){
char *license=g_malloc(filestat.st_size+1);
FILE *f=fopen(license_file,"r");
if (f && fread(license,filestat.st_size,1,f)==1){
if (f && fread(license,1,filestat.st_size,f)>0){
license[filestat.st_size]='\0';
gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(about),license);
}