diff options
| author | Pierre Ossman <ossman@cendio.se> | 2014-09-22 13:13:15 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2014-09-22 13:14:11 +0200 |
| commit | 5945d73be74f5dd087165156e5f588da7f43cf57 (patch) | |
| tree | 0d26502d07980a75d56bd0916594a20fbbda0cbe /vncviewer | |
| parent | 34e12985048e83ea15ed3f626367b437102abcd8 (diff) | |
| download | tigervnc-5945d73be74f5dd087165156e5f588da7f43cf57.tar.gz tigervnc-5945d73be74f5dd087165156e5f588da7f43cf57.zip | |
Fix the build timestamp to be more translation friendly
Diffstat (limited to 'vncviewer')
| -rw-r--r-- | vncviewer/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | vncviewer/buildTime.cxx | 18 | ||||
| -rw-r--r-- | vncviewer/vncviewer.cxx | 10 |
3 files changed, 4 insertions, 25 deletions
diff --git a/vncviewer/CMakeLists.txt b/vncviewer/CMakeLists.txt index ca1fbafe..beca98d1 100644 --- a/vncviewer/CMakeLists.txt +++ b/vncviewer/CMakeLists.txt @@ -3,7 +3,6 @@ include_directories(${GETTEXT_INCLUDE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/common) set(VNCVIEWER_SOURCES - buildTime.cxx menukey.cxx CConn.cxx DesktopWindow.cxx diff --git a/vncviewer/buildTime.cxx b/vncviewer/buildTime.cxx deleted file mode 100644 index 9f37b387..00000000 --- a/vncviewer/buildTime.cxx +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright (C) 2005 RealVNC Ltd. All Rights Reserved. - * - * This is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - */ -const char* buildTime = "Built on " __DATE__ " at " __TIME__; diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx index aa9ae7ff..cf52de5b 100644 --- a/vncviewer/vncviewer.cxx +++ b/vncviewer/vncviewer.cxx @@ -77,14 +77,12 @@ using namespace network; using namespace rfb; using namespace std; -static const char _aboutText[] = N_("TigerVNC Viewer %d-bit v%s (%s)\n" - "%s\n" +static const char _aboutText[] = N_("TigerVNC Viewer %d-bit v%s\n" + "Built on: %s\n" "Copyright (C) 1999-%d TigerVNC Team and many others (see README.txt)\n" "See http://www.tigervnc.org for information on TigerVNC."); static char aboutText[1024]; -extern const char* buildTime; - char vncServerName[VNCSERVERNAMELEN] = { '\0' }; static bool exitMainloop = false; @@ -364,8 +362,8 @@ int main(int argc, char** argv) // Generate the about string now that we get the proper translation snprintf(aboutText, sizeof(aboutText), _aboutText, - (int)sizeof(size_t)*8, PACKAGE_VERSION, __BUILD__, - buildTime, 2014); + (int)sizeof(size_t)*8, PACKAGE_VERSION, + BUILD_TIMESTAMP, 2014); rfb::SecurityClient::setDefaults(); |