rhodes 3.3.2.beta.6 → 3.3.2.beta.7
Sign up to get free protection for your applications and to get access to all the features.
|
@@ -31,6 +31,7 @@
|
|
|
31
31
|
#include "common/RhoFilePath.h"
|
|
32
32
|
#include "common/RhoConf.h"
|
|
33
33
|
#include "common/Tokenizer.h"
|
|
34
|
+
#include "common/app_build_capabilities.h"
|
|
34
35
|
|
|
35
36
|
#ifndef RHO_NO_RUBY
|
|
36
37
|
#include "ruby/ext/rho/rhoruby.h"
|
|
@@ -77,8 +78,8 @@ void LogSettings::closeRemoteLog()
|
|
|
77
78
|
|
|
78
79
|
void LogSettings::initRemoteLog()
|
|
79
80
|
{
|
|
80
|
-
#
|
|
81
|
-
//TODO: remote log prevent loading app - stuck on loading.png
|
|
81
|
+
#if defined( OS_PLATFORM_MOTCE ) && !defined (APP_BUILD_CAPABILITY_BARCODE)
|
|
82
|
+
//TODO: remote log prevent loading app - stuck on loading.png when no barcode. very strange!
|
|
82
83
|
OSVERSIONINFO osv = {0};
|
|
83
84
|
osv.dwOSVersionInfoSize = sizeof(osv);
|
|
84
85
|
if (GetVersionEx(&osv) && osv.dwMajorVersion == 5)
|
|
@@ -175,7 +175,7 @@ CLogSocketSink::CLogSocketSink(const LogSettings& oSettings)
|
|
|
175
175
|
CLogSocketSink::~CLogSocketSink()
|
|
176
176
|
{
|
|
177
177
|
//wait till all commands will be sent to server
|
|
178
|
-
CRhoThread::stop(
|
|
178
|
+
CRhoThread::stop(2000);
|
|
179
179
|
}
|
|
180
180
|
|
|
181
181
|
void CLogSocketSink::writeLogMessage( String& strMsg )
|
|
@@ -81,7 +81,7 @@ HREGNOTIFY g_hNotify = NULL, g_hNotifyCell = NULL;
|
|
|
81
81
|
#endif
|
|
82
82
|
|
|
83
83
|
//This is hack. MC4900 device failed to enable barcode after webkit initialization. So we enable it before.
|
|
84
|
-
#if defined(APP_BUILD_CAPABILITY_BARCODE) && defined(APP_BUILD_CAPABILITY_MOTOROLA)
|
|
84
|
+
#if defined(APP_BUILD_CAPABILITY_BARCODE) && defined(APP_BUILD_CAPABILITY_MOTOROLA) && defined (OS_PLATFORM_MOTCE)
|
|
85
85
|
extern "C" void rho_scanner_before_webkit();
|
|
86
86
|
extern "C" void rho_scanner_after_webkit();
|
|
87
87
|
struct CBarcodeInit
|
data/version
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
3.3.2.beta.
|
|
1
|
+
3.3.2.beta.7
|
metadata
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: rhodes
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 62196461
|
|
5
5
|
prerelease: true
|
|
6
6
|
segments:
|
|
7
7
|
- 3
|
|
8
8
|
- 3
|
|
9
9
|
- 2
|
|
10
10
|
- beta
|
|
11
|
-
-
|
|
12
|
-
version: 3.3.2.beta.
|
|
11
|
+
- 7
|
|
12
|
+
version: 3.3.2.beta.7
|
|
13
13
|
platform: ruby
|
|
14
14
|
authors:
|
|
15
15
|
- Rhomobile
|
|
@@ -17,7 +17,7 @@ autorequire:
|
|
|
17
17
|
bindir: bin
|
|
18
18
|
cert_chain: []
|
|
19
19
|
|
|
20
|
-
date: 2012-02-
|
|
20
|
+
date: 2012-02-07 00:00:00 -08:00
|
|
21
21
|
default_executable:
|
|
22
22
|
dependencies:
|
|
23
23
|
- !ruby/object:Gem::Dependency
|