libopiecore: /etc/oz_version renamed to /etc/openzaurus-version

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index a0e5edc..ccec044 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,72 +1,76 @@
 2005-??-??	Opie 1.2.2
 	
 	
 	New Features
 	------------
 	* Appearance: Added configuration options to set smallIconSize, bigIconSize, useBigPixmaps (hrw, drw)
 	* Opie-Notes: Notes application based on NoteZ (hrw)
 	* OPIE-PackageManager: Added two configuration options: "Force recursive", "Verbose fetch" (hrw)
 
 	Fixed Bugs
 	----------
 	* #1695 - Date selector use too small fontsize on VGA screen (hrw)
 	* #1686 - opie-console lack UI setting for switching scrollbar (hrw)
 	* #1647 - Opie-console doesn't respect scroll-bar on left side (hrw)
 	* #1624 - Button settngs changes are applied only after restart (hrw)
 	* #1492 - Backup and Restore does not show list of backups to restore on start (hrw)
 	* n.a.  - remove hardcoded font size from wellenreiter (hrw)
 	* n.a.  - added patch to build QT/E 2.3.10 with gcc 4.x.x (hrw)
 	* n.a.  - make blue-pin UI resizable to looks good in any resolution (hrw)
 	* n.a.  - fix a problem with vCard send to Sony Ericsson k600i (ar)
 	* n.a.  - add a patch to build Qt/E 2.3.10 on amd64 with gcc 4.x.x (ar)
 	* n.a.  - Opie-console fallback to FixedFont settings from qpe.conf in config (hrw)
 	* n.a.  - Set version to 1.2.1 in About applet (hrw)
 
+	Internal
+	--------
+    * libopiecore: /etc/oz_version renamed to /etc/openzaurus-version (hrw)
+	
 2005-09-11	Opie 1.2.1
 	
 	
 	New Features
 	------------
 	* OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker)
 	* Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly)
 	* Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer)
 	* Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl)
 	* Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl)
 	* Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl)
 	* Checkbook: Added configuration option to use smaller font for checkbook transaction tab (hrw)
 	* ZSafe: Made UI conform to Opie standards (drw)
 	* Today Addressbook plugin: Fixed configuration to show/not show birthdays, use checkboxes for selection (hrw)
 	* Opie-Console: Read initial fixed font configuration from qpe.conf (mickeyl)
 	* Opie-PcmciaApplet: Configure insert/resume actions and bind unsupported cards (mickeyl)
 	* SysInfo: Remove CPU tab and add Devices tab instead (mickeyl)
 	* Opie-smb: Added Opie front end for Samba (ljp)
 	* Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie)
 	* Opieplayer: rudimentary podcast support (ljp)
 	
 	Fixed Bugs
 	----------
 	* #1377 - Suspend Powermanagement when switched to another VT (mickeyl)
 	        - We actually suspend the complete Opie now in that case.
 	* #1384 - Battery status updated improperly when charging (skyhusker)
 	* #1476 - Wrong order of application entries in the O-menu (skyhusker)
 	* #1514 - Remove usage of cardmon/pcmcia picture in applications. pcmcia is now an inline picture (mickeyl)
 	* #1535	- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
 	* #1543 - Time Settings: "predict" tab is displayed twice after reopen (hrw)
 	* #1546 - Battery applet popup is not always large enough to show jacket remaining info (skyhusker)
 	* #1557 - Light&Power-Settings don't store warning intervall and warning levels (skyhusker)
 	* #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller)
 	* #1614 - Make Opie-console start in $HOME instead of / (skyhusker)
 	* #1635 - opie-today, datebook-plugin does not show notes (skyhusker)
 	* #1665 - Opie-IRC displays the host prepended to the message when peer is using and ipv6 address (skyhusker)
 	* #1666 - Opie-IRC does not allow to add !channels in config as	autojoin ones (skyhusker)
 	* #1667 - Opie-IRC does not show messages from !channel (skyhusker)
 	* #1679 - Security PIN plugin is QVGA sized (hrw)
 	* #1682 - Properly resize tab control in OTabWidget (drw)
 	* n.a.  - always show volume and wireless applet popups inside visible screen (deller)
 	* n.a.  - scale O-Menu-Applets appropriately (mickeyl)
 	* n.a.  - libopienet: fix bugs in wireless scanning and setting SSID (skyhusker)
 	* n.a.  - Wellenreiter: relax WE version matching test a bit (mickeyl)
 	* n.a.  - scale BluezApplet appropriately and use larger icons (mickeyl)
 	* n.a.  - memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
 	* n.a.  - networksettings: ignore hostap control interfaces wifi* (mickeyl)
 	* n.a.  - Today Addressbook plugin fix configuration to show/not show birthdays, use checkboxes for selection (hrw)
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index 62bb68a..7b99eb4 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -29,97 +29,97 @@
 
 
 #include "odevice_beagle.h"
 #include "odevice_ipaq.h"
 #include "odevice_mypal.h"
 #include "odevice_jornada.h"
 #include "odevice_ramses.h"
 #include "odevice_simpad.h"
 #include "odevice_yopy.h"
 #include "odevice_zaurus.h"
 #include "odevice_genuineintel.h"
 
 /* QT */
 #include <qapplication.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qwindowsystem_qws.h>
 
 /* OPIE */
 #include <qpe/config.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/sound.h>
 
 #include <opie2/okeyfilter.h>
 #include <opie2/oresource.h>
 
 /* STD */
 #include <fcntl.h>
 #include <math.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <unistd.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
 #endif
 
 namespace Opie {
 namespace Core {
 
 static const char* PATH_PROC_CPUINFO = "/proc/cpuinfo";
 
 
 /* STATIC and common implementation */
 /* EXPORT */ ODistribution distributions[] = {
     { System_Familiar,        "FamiliarLinux",   "/etc/familiar-version" },
-    { System_OpenZaurus,      "OpenZaurus",      "/etc/oz_version" },
+    { System_OpenZaurus,      "OpenZaurus",      "/etc/openzaurus-version" },
     { System_OpenEmbedded,    "OpenEmbedded",    "/etc/oe-version" },
     { System_Unknown,         "Linux",           "/etc/issue" },
 };
 
 
 /* EXPORT */ bool isQWS(){
     return qApp ? ( qApp->type() == QApplication::GuiServer ) : false;
 }
 
 /* EXPORT */ QCString makeChannel ( const char *str ){
     if ( str && !::strchr ( str, '/' ))
         return QCString ( "QPE/Application/" ) + str;
     else
         return str;
 }
 
 
 
 /* Now the default implementation of ODevice */
 
 struct default_button default_buttons [] =  {
     { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
     "devicebuttons/z_calendar",
     "datebook", "nextView()",
     "today", "raise()" },
     { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
     "devicebuttons/z_contact",
     "addressbook", "raise()",
     "addressbook", "beamBusinessCard()" },
     { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
     "devicebuttons/z_home",
     "QPE/Launcher", "home()",
     "buttonsettings", "raise()" },
     { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"),
     "devicebuttons/z_menu",
     "QPE/TaskBar", "toggleMenu()",
     "QPE/TaskBar", "toggleStartMenu()" },
     { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"),
     "devicebuttons/z_mail",
     "opiemail", "raise()",
     "opiemail", "newMail()" },
 };
 
 ODevice *ODevice::inst()
 {
     static ODevice *dev = 0;
     QString cpu_info;