[chronojump] disabled not working json stuff
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] disabled not working json stuff
- Date: Fri, 13 Mar 2015 09:41:58 +0000 (UTC)
commit 44f4a9a60472a67fa87fd078c62def4ff7cdd383
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Mar 13 10:13:32 2015 +0100
disabled not working json stuff
glade/chronojump.glade | 58 +++++++++++++++++++++++++++++++++++++++++++++++-
src/chronojump.cs | 3 ++
src/json.cs | 21 +++++++++++++++++
3 files changed, 81 insertions(+), 1 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 83d967e..7eacb46 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -388,7 +388,6 @@
</child>
<child>
<widget class="GtkMenuItem" id="menuitem_check_last_version">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Check last version</property>
<property name="use_underline">True</property>
@@ -6604,6 +6603,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -7457,6 +7459,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -8562,6 +8567,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -9308,6 +9316,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -19786,6 +19797,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -20440,6 +20454,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -21586,6 +21603,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -21789,6 +21809,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -31652,6 +31675,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -33686,6 +33727,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -34378,6 +34422,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -37036,6 +37083,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -37354,6 +37404,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -37687,6 +37740,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/chronojump.cs b/src/chronojump.cs
index 4eaab87..106a099 100644
--- a/src/chronojump.cs
+++ b/src/chronojump.cs
@@ -370,6 +370,8 @@ public class ChronoJump
//doing ping using json methods
+ /*
+ * temporarily disabled on start
string machineID = SqlitePreferences.Select("machineID", false);
Json js = new Json();
bool success = js.Ping(UtilAll.GetOS(), progVersion, machineID);
@@ -377,6 +379,7 @@ public class ChronoJump
LogB.Information(js.ResultMessage);
else
LogB.Error(js.ResultMessage);
+ */
allSQLCallsDoneOnSqliteThingsThread = false;
diff --git a/src/json.cs b/src/json.cs
index 8ae409b..7237ae0 100644
--- a/src/json.cs
+++ b/src/json.cs
@@ -41,6 +41,13 @@ public class Json
public bool PostCrashLog(string email, string comments)
{
+ //not working on mac right now
+ if(UtilAll.GetOSEnum() == UtilAll.OperatingSystems.MACOSX) {
+ this.ResultMessage = "Sorry, deactivated in this version.";
+ return false;
+ }
+
+
string filePath = UtilAll.GetLogFileOld();
if(! File.Exists(filePath)) {
@@ -124,6 +131,13 @@ public class Json
public bool GetLastVersion()
{
+ //not working on mac right now
+ if(UtilAll.GetOSEnum() == UtilAll.OperatingSystems.MACOSX) {
+ this.ResultMessage = "Sorry, deactivated in this version.";
+ return false;
+ }
+
+
// Create a request using a URL that can receive a post.
WebRequest request = WebRequest.Create (serverUrl + "/version");
@@ -156,6 +170,13 @@ public class Json
public bool Ping(string osVersion, string cjVersion, string machineID)
{
+ //not working on mac right now
+ if(UtilAll.GetOSEnum() == UtilAll.OperatingSystems.MACOSX) {
+ this.ResultMessage = "Sorry, deactivated in this version.";
+ return false;
+ }
+
+
// Create a request using a URL that can receive a post.
WebRequest request = WebRequest.Create (serverUrl + "/ping");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
