forked from mirrors/linphone-iphone
Fix definition and usage of LIBLINPHONE_GIT_VERSION.
This commit is contained in:
parent
32292aea4b
commit
f77a2ada0a
2 changed files with 3 additions and 9 deletions
|
|
@ -52,13 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#ifndef ANDROID /*on Android LIBLINPHONE version is passed from root Makefile*/
|
||||
#include "liblinphone_gitversion.h"
|
||||
#endif
|
||||
#else
|
||||
#ifndef LIBLINPHONE_GIT_VERSION
|
||||
#define LIBLINPHONE_GIT_VERSION "unknown"
|
||||
#endif
|
||||
#include "liblinphone_gitversion.h"
|
||||
#endif
|
||||
|
||||
#ifdef __APPLE__
|
||||
|
|
|
|||
|
|
@ -502,7 +502,7 @@ void linphone_gtk_show_about(void){
|
|||
}
|
||||
g_free(license);
|
||||
}
|
||||
gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about),LIBLINPHONE_GIT_VERSION);
|
||||
gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about),linphone_core_get_version());
|
||||
gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(about),linphone_gtk_get_ui_config("title","Linphone"));
|
||||
gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(about),linphone_gtk_get_ui_config("home","http://www.linphone.org"));
|
||||
if (logo) {
|
||||
|
|
@ -2190,7 +2190,7 @@ int main(int argc, char *argv[]){
|
|||
return -1;
|
||||
}
|
||||
if(version) {
|
||||
g_message("Linphone version %s.", LIBLINPHONE_GIT_VERSION);
|
||||
g_message("Linphone version %s.", linphone_core_get_version());
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue