10 files changed, 11 insertions, 39 deletions

diff --git a/apps/main.c b/apps/main.c
index e4b9286b4e..e8043a79d4 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -120,8 +120,6 @@
 
 /*#define AUTOROCK*/ /* define this to check for "autostart.rock" on boot */
 
-const char appsversion[]=APPSVERSION;
-
 static void init(void);
 
 #ifdef HAVE_SDL
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 59a72e1ad7..76ceaa483e 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -172,7 +172,7 @@ static const char* info_getname(int selected_item, void *data,
     {
         case INFO_VERSION:
             snprintf(buffer, buffer_len, "%s: %s", 
-                     str(LANG_VERSION), appsversion);
+                     str(LANG_VERSION), rbversion);
             break;
 
         case INFO_BUFFER: /* buffer */
@@ -259,7 +259,7 @@ static int info_speak_item(int selected_item, void * data)
     {
         case INFO_VERSION: /* version */
             talk_id(LANG_VERSION, false);
-            talk_spell(appsversion, true);
+            talk_spell(rbversion, true);
             break;
 
         case INFO_BUFFER: /* buffer */
diff --git a/apps/misc.c b/apps/misc.c
index 95c0dd6e34..747abe076b 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -621,7 +621,7 @@ int show_logo( void )
     char version[32];
     int font_h, font_w;
 
-    snprintf(version, sizeof(version), "Ver. %s", appsversion);
+    snprintf(version, sizeof(version), "Ver. %s", rbversion);
 
     lcd_clear_display();
 #if defined(SANSA_CLIP) || defined(SANSA_CLIPV2) || defined(SANSA_CLIPPLUS)
@@ -646,7 +646,7 @@ int show_logo( void )
     lcd_clear_display();
     lcd_double_height(true);
     lcd_puts(0, 0, rockbox);
-    lcd_puts_scroll(0, 1, appsversion);
+    lcd_puts_scroll(0, 1, rbversion);
 #endif
     lcd_update();
 
diff --git a/apps/plugin.c b/apps/plugin.c
index 83f27ea249..d626ef6488 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -718,7 +718,7 @@ static const struct plugin_api rockbox_api = {
     semaphore_release,
 #endif
 
-    appsversion,
+    rbversion,
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
 };
diff --git a/apps/plugin.h b/apps/plugin.h
index 7e198c97bd..a6b864ba44 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -885,7 +885,7 @@ int (*round_value_to_list32)(unsigned long value,
     void (*semaphore_release)(struct semaphore *s);
 #endif
 
-    const char *appsversion;
+    const char *rbversion;
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
 };
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index 165ce54634..945abe924d 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -546,7 +546,7 @@ int main(void)
                 "will continue.\n\n",BATTERY_LOG);
             rb->fdprintf(fd,
                 "Battery bench run for %s version %s\n\n"
-                ,MODEL_NAME,rb->appsversion);
+                ,MODEL_NAME,rb->rbversion);
 
             rb->fdprintf(fd,
                 "Battery type: %d mAh      Buffer Entries: %d\n"
@@ -578,7 +578,7 @@ int main(void)
         rb->fdprintf(fd, "\n--File already present. Resuming Benchmark--\n");
         rb->fdprintf(fd,
             "Battery bench run for %s version %s\n\n"
-            ,MODEL_NAME,rb->appsversion);
+            ,MODEL_NAME,rb->rbversion);
         rb->close(fd);
     }
     
diff --git a/apps/plugins/iriver_flash.c b/apps/plugins/iriver_flash.c
index 3f5490e754..24542a9398 100644
--- a/apps/plugins/iriver_flash.c
+++ b/apps/plugins/iriver_flash.c
@@ -411,7 +411,7 @@ int flash_rockbox(const char *filename, int section)
     rb->memset(&hdr, 0, sizeof(struct flash_header));
     hdr.magic = FLASH_MAGIC;
     hdr.length = len;
-    // rb->strncpy(hdr.version, APPSVERSION, sizeof(hdr.version)-1);
+    // rb->strncpy(hdr.version, rb->rbversion , sizeof(hdr.version)-1);
     p16 = (uint16_t *)&hdr;
     
     rb->snprintf(buf, sizeof(buf), "Programming...");
diff --git a/apps/plugins/settings_dumper.c b/apps/plugins/settings_dumper.c
index ea69353e17..93c4f67657 100644
--- a/apps/plugins/settings_dumper.c
+++ b/apps/plugins/settings_dumper.c
@@ -129,7 +129,7 @@ enum plugin_status plugin_start(
         return PLUGIN_ERROR;
     list = rb->get_settings_list(&setting_count);
     rb->fdprintf(fd, "# .cfg file created by rockbox %s - "
-            "http://www.rockbox.org\r\n\r\n", rb->appsversion);
+            "http://www.rockbox.org\r\n\r\n", rb->rbversion);
     
     rb->fdprintf(fd, "# -- Sound settings -- #\r\n");
     for(i=0;i<setting_count;i++)
diff --git a/apps/settings.c b/apps/settings.c
index 6349372326..25593e55ac 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -536,7 +536,7 @@ static bool settings_write_config(const char* filename, int options)
     if (fd < 0)
         return false;
     fdprintf(fd, "# .cfg file created by rockbox %s - "
-                 "http://www.rockbox.org\r\n\r\n", appsversion);
+                 "http://www.rockbox.org\r\n\r\n", rbversion);
     for(i=0; i<nb_settings; i++)
     {
         if (settings[i].cfg_name == NULL)
diff --git a/apps/version.h b/apps/version.h
deleted file mode 100644
index 73828ddfc5..0000000000
--- a/apps/version.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2002 Björn Stenberg
- *
- * This program 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 on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-#ifndef _VERSION_H_
-#define _VERSION_H_
-
-extern const char appsversion[];
-
-#endif