From 49beef1defd12ed621bb712fb81cd78248da44f2 Mon Sep 17 00:00:00 2001 From: Alan Fitton Date: Thu, 1 Sep 2011 21:33:24 +0000 Subject: issue 69 - use rpc-version instead of version to show/hide tracker changing features --- src/session-get.c | 5 +++++ src/session-get.h | 2 ++ src/trg-client.c | 6 ++++++ src/trg-client.h | 1 + src/trg-trackers-tree-view.c | 17 +++++++++-------- 5 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/session-get.c b/src/session-get.c index bbb230a..4251749 100644 --- a/src/session-get.c +++ b/src/session-get.c @@ -31,6 +31,11 @@ int session_get_version(JsonObject * s, float *version) return sscanf(versionStr, "%g", version); } +gint64 session_get_rpc_version(JsonObject * s) +{ + return json_object_get_int_member(s, SGET_RPC_VERSION); +} + gboolean session_get_pex_enabled(JsonObject * s) { return json_object_get_boolean_member(s, SGET_PEX_ENABLED); diff --git a/src/session-get.h b/src/session-get.h index 9153580..98448cc 100644 --- a/src/session-get.h +++ b/src/session-get.h @@ -52,6 +52,7 @@ #define SGET_SPEED_LIMIT_UP "speed-limit-up" #define SGET_SPEED_LIMIT_UP_ENABLED "speed-limit-up-enabled" #define SGET_VERSION "version" +#define SGET_RPC_VERSION "rpc-version" #define SGET_TRASH_ORIGINAL_TORRENT_FILES "trash-original-torrent-files" #define SGET_START_ADDED_TORRENTS "start-added-torrents" #define SGET_RENAME_PARTIAL_FILES "rename-partial-files" @@ -97,5 +98,6 @@ gboolean session_get_download_queue_enabled(JsonObject * s); gint64 session_get_download_queue_size(JsonObject * s); gboolean session_get_seed_queue_enabled(JsonObject * s); gint64 session_get_seed_queue_size(JsonObject * s); +gint64 session_get_rpc_version(JsonObject * s); #endif /* SESSION_GET_H_ */ diff --git a/src/trg-client.c b/src/trg-client.c index 713de55..244361e 100644 --- a/src/trg-client.c +++ b/src/trg-client.c @@ -128,6 +128,12 @@ float trg_client_get_version(TrgClient *tc) return priv->version; } +gint64 trg_client_get_rpc_version(TrgClient *tc) +{ + TrgClientPrivate *priv = TRG_CLIENT_GET_PRIVATE(tc); + return session_get_rpc_version(priv->session); +} + void trg_client_set_session(TrgClient * tc, JsonObject * session) { TrgClientPrivate *priv = TRG_CLIENT_GET_PRIVATE(tc); diff --git a/src/trg-client.h b/src/trg-client.h index e737afb..a562f68 100644 --- a/src/trg-client.h +++ b/src/trg-client.h @@ -71,6 +71,7 @@ TrgPrefs* trg_client_get_prefs(TrgClient *tc); int trg_client_populate_with_settings(TrgClient * tc); void trg_client_set_session(TrgClient * tc, JsonObject * session); float trg_client_get_version(TrgClient *tc); +gint64 trg_client_get_rpc_version(TrgClient *tc); gchar *trg_client_get_password(TrgClient *tc); gchar *trg_client_get_username(TrgClient *tc); gchar *trg_client_get_url(TrgClient *tc); diff --git a/src/trg-trackers-tree-view.c b/src/trg-trackers-tree-view.c index e0a458e..4919bcf 100644 --- a/src/trg-trackers-tree-view.c +++ b/src/trg-trackers-tree-view.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include #include #include @@ -52,7 +53,7 @@ trg_trackers_tree_view_class_init(TrgTrackersTreeViewClass * klass) static gboolean is_tracker_edit_supported(TrgClient *tc) { - return trg_client_get_version(tc) >= 2.10; + return trg_client_get_rpc_version(tc) >= 10; } static void @@ -181,20 +182,20 @@ static void trg_trackers_tree_view_init(TrgTrackersTreeView * self) self); desc->out = &priv->announceColumn; - trg_tree_view_reg_column(ttv, TRG_COLTYPE_TEXT, TRACKERCOL_SCRAPE, - _("Scrape URL"), "scrape-url", 0); trg_tree_view_reg_column(ttv, TRG_COLTYPE_NUMGTZERO, TRACKERCOL_LAST_ANNOUNCE_PEER_COUNT, - _("Peer Count"), "last-announce-peer-count", 0); - trg_tree_view_reg_column(ttv, TRG_COLTYPE_EPOCH, TRACKERCOL_LAST_ANNOUNCE_TIME, - _("Last Announce"), "last-announce-time", 0); + _("Peers"), "last-announce-peer-count", 0); trg_tree_view_reg_column(ttv, TRG_COLTYPE_NUMGTZERO, TRACKERCOL_SEEDERCOUNT, _("Seeder Count"), "seeder-count", 0); trg_tree_view_reg_column(ttv, TRG_COLTYPE_NUMGTZERO, TRACKERCOL_LEECHERCOUNT, _("Leecher Count"), "leecher-count", 0); - trg_tree_view_reg_column(ttv, TRG_COLTYPE_TEXT, TRACKERCOL_HOST, - _("Host"), "host", 0); + trg_tree_view_reg_column(ttv, TRG_COLTYPE_EPOCH, TRACKERCOL_LAST_ANNOUNCE_TIME, + _("Last Announce"), "last-announce-time", 0); trg_tree_view_reg_column(ttv, TRG_COLTYPE_TEXT, TRACKERCOL_LAST_ANNOUNCE_RESULT, _("Last Result"), "last-result", 0); + trg_tree_view_reg_column(ttv, TRG_COLTYPE_TEXT, TRACKERCOL_SCRAPE, + _("Scrape URL"), "scrape-url", 0); + trg_tree_view_reg_column(ttv, TRG_COLTYPE_TEXT, TRACKERCOL_HOST, + _("Host"), "host", TRG_COLUMN_EXTRA); } static void add_tracker(GtkWidget * w, gpointer data) -- cgit v1.2.3