author | deller <deller> | 2005-04-05 21:10:11 (UTC) |
---|---|---|
committer | deller <deller> | 2005-04-05 21:10:11 (UTC) |
commit | f0000ae8e62df9606160ab683ae163ddc40c32c4 (patch) (unidiff) | |
tree | 642a8b7927c7ff77d196399d4498559e585a2487 | |
parent | e9f44f94ac905e49ea5def24532ac2d3bf4ed053 (diff) | |
download | opie-f0000ae8e62df9606160ab683ae163ddc40c32c4.zip opie-f0000ae8e62df9606160ab683ae163ddc40c32c4.tar.gz opie-f0000ae8e62df9606160ab683ae163ddc40c32c4.tar.bz2 |
crash-fix in odevice.cpp while scanning the distribution table (#1565)
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -1,31 +1,32 @@ | |||
1 | 2005-??-??Opie 1.2.1 | 1 | 2005-??-??Opie 1.2.1 |
2 | 2 | ||
3 | Fixed Bugs | 3 | Fixed Bugs |
4 | ---------- | 4 | ---------- |
5 | * n.a.- scale O-Menu-Applets appropriately (mickeyl) | 5 | * n.a.- scale O-Menu-Applets appropriately (mickeyl) |
6 | * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller) | 6 | * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller) |
7 | * n.a.- always show volume and wireless applet popups inside visible screen (deller) | 7 | * n.a.- always show volume and wireless applet popups inside visible screen (deller) |
8 | * #1565- crash-fix in odevice.cpp while scanning the distribution table (deller) | ||
8 | 9 | ||
9 | 2005-03-25Opie 1.2.0 | 10 | 2005-03-25Opie 1.2.0 |
10 | 11 | ||
11 | Fixed Bugs | 12 | Fixed Bugs |
12 | ---------- | 13 | ---------- |
13 | * #1613 - AdvancedFM - scale toolbar icons appropriately (drw) | 14 | * #1613 - AdvancedFM - scale toolbar icons appropriately (drw) |
14 | * #1620 - OFileSelector - show the button on press and not on press on hold (alwin) | 15 | * #1620 - OFileSelector - show the button on press and not on press on hold (alwin) |
15 | * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke) | 16 | * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke) |
16 | * n.a. - PackageManager - fix bug where messages show up multiple times in install dialog (drw) | 17 | * n.a. - PackageManager - fix bug where messages show up multiple times in install dialog (drw) |
17 | * n.a. - make qpeglobal.h include qglobal.h (zecke) | 18 | * n.a. - make qpeglobal.h include qglobal.h (zecke) |
18 | 19 | ||
19 | 2005-03-20Opie 1.2.0-rc1 | 20 | 2005-03-20Opie 1.2.0-rc1 |
20 | 21 | ||
21 | 22 | ||
22 | New Features | 23 | New Features |
23 | ------------ | 24 | ------------ |
24 | * Launcher: Support a static background pixmap (mickeyl) | 25 | * Launcher: Support a static background pixmap (mickeyl) |
25 | * LauncherSettings: Choose whether to have a static background pixmap (mickeyl) | 26 | * LauncherSettings: Choose whether to have a static background pixmap (mickeyl) |
26 | * PackageManager supports the 'lists_dir' ipkg configuration option (drw) | 27 | * PackageManager supports the 'lists_dir' ipkg configuration option (drw) |
27 | * Added hi-res inline images for large resolution devices (drw) | 28 | * Added hi-res inline images for large resolution devices (drw) |
28 | * Improved launcher icons for consistency (ar) | 29 | * Improved launcher icons for consistency (ar) |
29 | * Datebook: Added plugin system to datebook so holidays and birthdays from contacts may displayed in datebook (alwin) | 30 | * Datebook: Added plugin system to datebook so holidays and birthdays from contacts may displayed in datebook (alwin) |
30 | 31 | ||
31 | Fixed Bugs | 32 | Fixed Bugs |
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp index af77ed1..fcdbf45 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp | |||
@@ -170,49 +170,49 @@ ODevice::ODevice() | |||
170 | d->m_model = Model_Unknown; | 170 | d->m_model = Model_Unknown; |
171 | d->m_vendorstr = "Unknown"; | 171 | d->m_vendorstr = "Unknown"; |
172 | d->m_vendor = Vendor_Unknown; | 172 | d->m_vendor = Vendor_Unknown; |
173 | d->m_systemstr = "Unknown"; | 173 | d->m_systemstr = "Unknown"; |
174 | d->m_system = System_Unknown; | 174 | d->m_system = System_Unknown; |
175 | d->m_sysverstr = "0.0"; | 175 | d->m_sysverstr = "0.0"; |
176 | d->m_rotation = Rot0; | 176 | d->m_rotation = Rot0; |
177 | d->m_direction = CW; | 177 | d->m_direction = CW; |
178 | 178 | ||
179 | d->m_holdtime = 1000; // 1000ms | 179 | d->m_holdtime = 1000; // 1000ms |
180 | d->m_buttons = 0; | 180 | d->m_buttons = 0; |
181 | d->m_cpu_frequencies = new QStrList; | 181 | d->m_cpu_frequencies = new QStrList; |
182 | 182 | ||
183 | 183 | ||
184 | /* mixer */ | 184 | /* mixer */ |
185 | d->m_sound = d->m_vol = d->m_mixer = -1; | 185 | d->m_sound = d->m_vol = d->m_mixer = -1; |
186 | 186 | ||
187 | /* System QCopChannel created */ | 187 | /* System QCopChannel created */ |
188 | d->m_initializedButtonQcop = false; | 188 | d->m_initializedButtonQcop = false; |
189 | 189 | ||
190 | // New distribution detection code first checks for legacy distributions, | 190 | // New distribution detection code first checks for legacy distributions, |
191 | // identified by /etc/familiar-version or /etc/oz_version. | 191 | // identified by /etc/familiar-version or /etc/oz_version. |
192 | // Then check for OpenEmbedded and lastly, read /etc/issue | 192 | // Then check for OpenEmbedded and lastly, read /etc/issue |
193 | 193 | ||
194 | for ( unsigned int i = 0; i < sizeof distributions; ++i ) | 194 | for ( unsigned int i = 0; i < sizeof(distributions)/sizeof(ODistribution); ++i ) |
195 | { | 195 | { |
196 | if ( QFile::exists( distributions[i].sysvfile ) ) | 196 | if ( QFile::exists( distributions[i].sysvfile ) ) |
197 | { | 197 | { |
198 | d->m_systemstr = distributions[i].sysstr; | 198 | d->m_systemstr = distributions[i].sysstr; |
199 | d->m_system = distributions[i].system; | 199 | d->m_system = distributions[i].system; |
200 | d->m_sysverstr = "<Unknown>"; | 200 | d->m_sysverstr = "<Unknown>"; |
201 | QFile f( distributions[i].sysvfile ); | 201 | QFile f( distributions[i].sysvfile ); |
202 | if ( f.open( IO_ReadOnly ) ) | 202 | if ( f.open( IO_ReadOnly ) ) |
203 | { | 203 | { |
204 | QTextStream ts( &f ); | 204 | QTextStream ts( &f ); |
205 | d->m_sysverstr = ts.readLine().replace( QRegExp( "\\\\." ), "" ); | 205 | d->m_sysverstr = ts.readLine().replace( QRegExp( "\\\\." ), "" ); |
206 | } | 206 | } |
207 | break; | 207 | break; |
208 | } | 208 | } |
209 | } | 209 | } |
210 | } | 210 | } |
211 | 211 | ||
212 | void ODevice::systemMessage( const QCString &msg, const QByteArray & ) | 212 | void ODevice::systemMessage( const QCString &msg, const QByteArray & ) |
213 | { | 213 | { |
214 | if ( msg == "deviceButtonMappingChanged()" ) { | 214 | if ( msg == "deviceButtonMappingChanged()" ) { |
215 | reloadButtonMapping(); | 215 | reloadButtonMapping(); |
216 | } | 216 | } |
217 | } | 217 | } |
218 | 218 | ||