diff options
| author | Bignaux Ronan <ronan@aimao.org> | 2018-11-01 22:23:55 +0100 |
|---|---|---|
| committer | jkoan <jkoan@users.noreply.github.com> | 2019-05-24 10:11:52 +0200 |
| commit | bbff86825991abb7408abf1691118b112c83bed2 (patch) | |
| tree | 4a2257eaa6aab2d71d32dfe0304824dd5b5ec4b0 /navit/gui | |
| parent | b2205d39d2864f4ed7fd3d931b2e6b8f06a6b38b (diff) | |
| download | navit-bbff86825991abb7408abf1691118b112c83bed2.tar.gz | |
Refactoring:cmake:simplify version management
Diffstat (limited to 'navit/gui')
| -rw-r--r-- | navit/gui/internal/gui_internal_command.c | 4 | ||||
| -rw-r--r-- | navit/gui/internal/gui_internal_menu.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/navit/gui/internal/gui_internal_command.c b/navit/gui/internal/gui_internal_command.c index acf250408..011d78908 100644 --- a/navit/gui/internal/gui_internal_command.c +++ b/navit/gui/internal/gui_internal_command.c @@ -41,8 +41,6 @@ #include <arpa/inet.h> #endif -extern char *version; - /** * @brief Converts a WGS84 coordinate pair to its string representation. * @@ -198,7 +196,7 @@ static void gui_internal_cmd2_about(struct gui_priv *this, char *function, struc g_free(text); //Version - text=g_strdup_printf("%s",version); + text=g_strdup_printf("%s",NAVIT_VERSION); gui_internal_widget_append(wb, w=gui_internal_label_new(this, text)); w->flags=gravity_top_center|orientation_horizontal|flags_expand; g_free(text); diff --git a/navit/gui/internal/gui_internal_menu.c b/navit/gui/internal/gui_internal_menu.c index 6a0d6a52b..3caae2800 100644 --- a/navit/gui/internal/gui_internal_menu.c +++ b/navit/gui/internal/gui_internal_menu.c @@ -15,7 +15,6 @@ #include "gui_internal_search.h" #include "gui_internal_menu.h" -extern char *version; /** * @brief Utility function to check if a menu widget is adapted to the display size or needs resizing (if so, the widget dimensions will be set to match those of the display @@ -486,7 +485,7 @@ gui_internal_top_bar(struct gui_priv *this) { l=g_list_next(l); } if (this->flags & 32) { - char *version_text=g_strdup_printf("Navit %s",version); + char *version_text=g_strdup_printf("Navit %s",NAVIT_VERSION); wcn=gui_internal_label_new(this, version_text); g_free(version_text); wcn->flags=gravity_right_center|flags_expand; |