summaryrefslogtreecommitdiff
authorpaule <paule>2007-06-13 08:44:48 (UTC)
committer paule <paule>2007-06-13 08:44:48 (UTC)
commit4b3ffb4d533f034513d5bd9cae497aa117b2afaf (patch) (unidiff)
tree42d2d51f93eac1b0d53f626327f472a9a71de7b5
parent85dfcf4f5e7fb28990606b83a02043af19a8c15d (diff)
downloadopie-4b3ffb4d533f034513d5bd9cae497aa117b2afaf.zip
opie-4b3ffb4d533f034513d5bd9cae497aa117b2afaf.tar.gz
opie-4b3ffb4d533f034513d5bd9cae497aa117b2afaf.tar.bz2
Set vendor for HTC ODevice - patch by Marex (see bug #1855)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_htc.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libopie2/opiecore/device/odevice_htc.cpp b/libopie2/opiecore/device/odevice_htc.cpp
index 7f82369..4bc8c49 100644
--- a/libopie2/opiecore/device/odevice_htc.cpp
+++ b/libopie2/opiecore/device/odevice_htc.cpp
@@ -121,32 +121,33 @@ struct htc_button htc_buttons_universal [] = {
121// HTC-Universal (PXA-model w/ 480x640 3.6" lcd) 121// HTC-Universal (PXA-model w/ 480x640 3.6" lcd)
122// HTC-Alpine (PXA-model w/ 240x320 3.5" lcd) 122// HTC-Alpine (PXA-model w/ 240x320 3.5" lcd)
123// HTC-Apache (PXA-model w/ 240x320 2.8" lcd) 123// HTC-Apache (PXA-model w/ 240x320 2.8" lcd)
124// HTC-Beetles (PXA-model w/ 240x240 3.0" lcd) 124// HTC-Beetles (PXA-model w/ 240x240 3.0" lcd)
125// HTC-Blueangel (PXA-model w/ 240x320 3.5" lcd) 125// HTC-Blueangel (PXA-model w/ 240x320 3.5" lcd)
126// HTC-Himalaya (PXA-model w/ 240x320 3.5" lcd) 126// HTC-Himalaya (PXA-model w/ 240x320 3.5" lcd)
127// HTC-Magician (PXA-model w/ 240x320 2.8" lcd) 127// HTC-Magician (PXA-model w/ 240x320 2.8" lcd)
128 128
129void HTC::init(const QString& cpu_info) 129void HTC::init(const QString& cpu_info)
130{ 130{
131 qDebug( "HTC::init()" ); 131 qDebug( "HTC::init()" );
132 // Set the time to wait until the system is really suspended 132 // Set the time to wait until the system is really suspended
133 // the delta between apm --suspend and sleeping 133 // the delta between apm --suspend and sleeping
134 setAPMTimeOut( 15000 ); 134 setAPMTimeOut( 15000 );
135 135
136 d->m_vendorstr = "Xanadux Team"; 136 d->m_vendorstr = "Xanadux Team";
137 d->m_vendor = Vendor_HTC;
137 d->m_systemstr = "Familiar"; 138 d->m_systemstr = "Familiar";
138 d->m_system = System_Familiar; 139 d->m_system = System_Familiar;
139 140
140 // check the HTC model 141 // check the HTC model
141 QString model; 142 QString model;
142 int loc = cpu_info.find( ":" ); 143 int loc = cpu_info.find( ":" );
143 if ( loc != -1 ) 144 if ( loc != -1 )
144 model = cpu_info.mid( loc+2 ).simplifyWhiteSpace(); 145 model = cpu_info.mid( loc+2 ).simplifyWhiteSpace();
145 else 146 else
146 model = cpu_info; 147 model = cpu_info;
147 148
148 d->m_model = Model_HTC_Universal; 149 d->m_model = Model_HTC_Universal;
149 d->m_modelstr = "Unknown HTC"; 150 d->m_modelstr = "Unknown HTC";
150 151
151 if ( model == "HTC Universal" ) { 152 if ( model == "HTC Universal" ) {
152 d->m_model = Model_HTC_Universal; 153 d->m_model = Model_HTC_Universal;