From 8ae9d64d2d64dbe7e1b619ebfe38385b61486ef7 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 27 Feb 2015 22:58:18 +0100 Subject: [PATCH] Install license file when building with CMake + fix license display when building with Visual Studio. --- gtk/CMakeLists.txt | 3 ++- gtk/main.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt index 3839b6097..8957458eb 100644 --- a/gtk/CMakeLists.txt +++ b/gtk/CMakeLists.txt @@ -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 ) diff --git a/gtk/main.c b/gtk/main.c index f6ddb0931..af2847dba 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -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); }