Merge pull request #116 from fyraimar/master

Kenneth Rohde Christiansen · Kenneth Rohde Christiansen · commit 45df4ed4c114 · 2013-09-10T03:41:21.000-07:00
[Systeminfo]Fix Desktop Build Error
diff --git a/system_info/system_info_build.h b/system_info/system_info_build.h
@@ -26,7 +26,7 @@ class SysInfoBuild {
   inline void StopListening() {
     if (timeout_cb_id_ > 0)
       g_source_remove(timeout_cb_id_);
-}
+  }
 
  private:
   bool UpdateHardware();
@@ -37,6 +37,9 @@ class SysInfoBuild {
   std::string model_;
   std::string manufacturer_;
   std::string buildversion_;
+#if defined(GENERIC_DESKTOP)
+  bool stopping_;
+#endif
   int timeout_cb_id_;
 
   DISALLOW_COPY_AND_ASSIGN(SysInfoBuild);
diff --git a/system_info/system_info_locale.h b/system_info/system_info_locale.h
@@ -36,6 +36,9 @@ class SysInfoLocale {
   ContextAPI* api_;
   std::string language_;
   std::string country_;
+#if defined(GENERIC_DESKTOP)
+  bool stopping_;
+#endif
   int timeout_cb_id_;
 
   DISALLOW_COPY_AND_ASSIGN(SysInfoLocale);
diff --git a/system_info/system_info_network.cc b/system_info/system_info_network.cc
@@ -7,8 +7,7 @@
 #include "system_info/system_info_utils.h"
 
 SysInfoNetwork::SysInfoNetwork(ContextAPI* api)
-    : type_(SYSTEM_INFO_NETWORK_UNKNOWN),
-      timeout_cb_id_(0) {
+    : type_(SYSTEM_INFO_NETWORK_UNKNOWN) {
   api_ = api;
   PlatformInitialize();
 }
diff --git a/system_info/system_info_network_mobile.cc b/system_info/system_info_network_mobile.cc
@@ -11,7 +11,9 @@ SysInfoNetwork::~SysInfoNetwork() {
       g_source_remove(timeout_cb_id_);
 }
 
-void SysInfoNetwork::PlatformInitialize() { }
+void SysInfoNetwork::PlatformInitialize() {
+  timeout_cb_id_ = 0;
+}
 
 bool SysInfoNetwork::Update(picojson::value& error) {
   int service_type = 0;
diff --git a/system_info/system_info_storage.h b/system_info/system_info_storage.h
@@ -46,6 +46,7 @@ class SysInfoStorage {
                   picojson::value& error,
                   picojson::value& unit);
   std::string GetDevPathFromMountPath(const std::string& mnt_path);
+  bool stopping_;
 
   struct udev* udev_;
 #elif defined(TIZEN_MOBILE)
diff --git a/system_info/system_info_wifi_network.cc b/system_info/system_info_wifi_network.cc
@@ -11,8 +11,7 @@ SysInfoWifiNetwork::SysInfoWifiNetwork(ContextAPI* api)
       ssid_(""),
       ip_address_(""),
       ipv6_address_(""),
-      signal_strength_(0.0),
-      timeout_cb_id_(0) {
+      signal_strength_(0.0) {
   api_ = api;
   PlatformInitialize();
 }
diff --git a/system_info/system_info_wifi_network_mobile.cc b/system_info/system_info_wifi_network_mobile.cc
@@ -16,7 +16,9 @@ SysInfoWifiNetwork::~SysInfoWifiNetwork() {
     }
 }
 
-void SysInfoWifiNetwork::PlatformInitialize() { }
+void SysInfoWifiNetwork::PlatformInitialize() {
+  timeout_cb_id_ = 0;
+}
 
 bool SysInfoWifiNetwork::Update(picojson::value& error) {
   connection_h connect = NULL;

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,7 @@`
`7`	`7`	`#include "system_info/system_info_utils.h"`
`8`	`8`
`9`	`9`	`SysInfoNetwork::SysInfoNetwork(ContextAPI* api)`
`10`		`- : type_(SYSTEM_INFO_NETWORK_UNKNOWN),`
`11`		`- timeout_cb_id_(0) {`
	`10`	`+ : type_(SYSTEM_INFO_NETWORK_UNKNOWN) {`
`12`	`11`	`api_ = api;`
`13`	`12`	`PlatformInitialize();`
`14`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,9 @@ SysInfoNetwork::~SysInfoNetwork() {`
`11`	`11`	`g_source_remove(timeout_cb_id_);`
`12`	`12`	`}`
`13`	`13`
`14`		`-void SysInfoNetwork::PlatformInitialize() { }`
	`14`	`+void SysInfoNetwork::PlatformInitialize() {`
	`15`	`+ timeout_cb_id_ = 0;`
	`16`	`+}`
`15`	`17`
`16`	`18`	`bool SysInfoNetwork::Update(picojson::value& error) {`
`17`	`19`	`int service_type = 0;`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,9 @@ SysInfoWifiNetwork::~SysInfoWifiNetwork() {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`-void SysInfoWifiNetwork::PlatformInitialize() { }`
	`19`	`+void SysInfoWifiNetwork::PlatformInitialize() {`
	`20`	`+ timeout_cb_id_ = 0;`
	`21`	`+}`
`20`	`22`
`21`	`23`	`bool SysInfoWifiNetwork::Update(picojson::value& error) {`
`22`	`24`	`connection_h connect = NULL;`