[chronojump] Adedd json again



commit eab11e2f6f3581a4b679a5216dac820e6993a71e
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Mar 9 00:29:04 2015 +0100

    Adedd json again

 build/build.environment.mk |    4 +++-
 src/Makefile.am            |    1 +
 src/chronojump.cs          |    2 --
 src/gui/chronojump.cs      |    8 ++++----
 src/gui/error.cs           |    6 ++----
 5 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 9b4a519..3cf85d3 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -25,6 +25,7 @@ LINK_GLADE = $(GLADE_SHARP_20_LIBS)
 LINK_CESARPLAYER = -r:$(DIR_BIN)/CesarPlayer.dll
 LINK_RDOTNET = -r:$(DIR_BIN)/RDotNet.dll
 LINK_RDOTNET_NATIVE = -r:$(DIR_BIN)/RDotNet.NativeLibrary.dll
+LINK_JSON = -r:System.Json.dll
 
 REF_DEP_CHRONOJUMP = \
        $(LINK_SYSTEM) \
@@ -39,7 +40,8 @@ REF_DEP_CHRONOJUMP = \
        $(LINK_GTK) \
        $(LINK_CESARPLAYER) \
        $(LINK_RDOTNET) \
-       $(LINK_RDOTNET_NATIVE)
+       $(LINK_RDOTNET_NATIVE) \
+       $(LINK_JSON)
 
 REF_DEP_CESARPLAYER = \
        $(LINK_SYSTEM) \
diff --git a/src/Makefile.am b/src/Makefile.am
index ef17539..18ebead 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -122,6 +122,7 @@ SOURCES = \
        event.cs\
        eventType.cs\
        genericObjects.cs\
+       json.cs\
        jump.cs\
        jumpType.cs\
        networks.cs\
diff --git a/src/chronojump.cs b/src/chronojump.cs
index 26ec1c3..d59d824 100644
--- a/src/chronojump.cs
+++ b/src/chronojump.cs
@@ -369,7 +369,6 @@ public class ChronoJump
                versionAvailable = Constants.ServerOffline;
        
 
-               /*
                //doing ping using json methods
                Json js = new Json();
                bool success = js.Ping(UtilAll.GetOS(), progVersion);
@@ -377,7 +376,6 @@ public class ChronoJump
                        LogB.Information(js.ResultMessage);
                else
                        LogB.Error(js.ResultMessage);
-                       */
 
                
                allSQLCallsDoneOnSqliteThingsThread = false;
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index e987890..95c69b8 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -5960,7 +5960,6 @@ LogB.Debug("X");
        }
        
        private void on_menuitem_check_last_version_activate (object o, EventArgs args) {
-               /*
                Json js = new Json();
                bool success = js.GetLastVersion();
 
@@ -5978,15 +5977,15 @@ LogB.Debug("X");
                                        Constants.MessageTypes.WARNING, 
                                        js.ResultMessage);
                }
-               */
+               /*
                new DialogMessage(
                                "Chronojump",
                                Constants.MessageTypes.INFO, 
                                "Temporarily Disabled");
+               */
        }
        
        private void on_menuitem_ping_activate (object o, EventArgs args) {
-               /*
                Json js = new Json();
                bool success = js.Ping(UtilAll.GetOS(), UtilAll.ReadVersion());
 
@@ -6004,11 +6003,12 @@ LogB.Debug("X");
                                        Constants.MessageTypes.WARNING, 
                                        js.ResultMessage);
                }
-               */
+               /*
                new DialogMessage(
                                "Chronojump",
                                Constants.MessageTypes.INFO, 
                                "Temporarily Disabled");
+               */
        }
 
 
diff --git a/src/gui/error.cs b/src/gui/error.cs
index 34c3525..7b9d09b 100644
--- a/src/gui/error.cs
+++ b/src/gui/error.cs
@@ -96,12 +96,11 @@ public class ErrorWindow
                
                hbox_send_log.Show();
                
-               button_send_log.Label = "Disabled";
-               button_send_log.Sensitive = false;
+               //button_send_log.Label = "Disabled";
+               //button_send_log.Sensitive = false;
        }
        private void on_button_send_log_clicked (object o, EventArgs args)
        {
-               /*
                string email = entry_send_log.Text.ToString();
                //email can be validated with Util.IsValidEmail(string)
                //or other methods, but maybe there's no need of complexity now 
@@ -133,7 +132,6 @@ public class ErrorWindow
                }
 
                label_send_log_message.Text = js.ResultMessage;
-               */
        }
 
        public void Show_button_open_database_folder () {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]