minor

7 files changed, 22 insertions, 16 deletions

diff --git a/src/torrent.c b/src/torrent.c
index 585c14b..032e9b7 100644
--- a/src/torrent.c
+++ b/src/torrent.c
@@ -222,21 +222,26 @@ gchar *torrent_get_status_string(gint64 value)
 
 gboolean torrent_has_tracker(JsonObject * t, GRegex * rx, gchar * search)
 {
-    JsonArray *trackers = torrent_get_trackers(t);
-    int i;
+    GList *trackers = json_array_get_elements(torrent_get_trackers(t));
+    gboolean ret = FALSE;
+    GList *li;
 
-    for (i = 0; i < json_array_get_length(trackers); i++) {
-        JsonObject *tracker = json_array_get_object_element(trackers, i);
+    for (li = trackers; li; li = g_list_next(li)) {
+        JsonObject *tracker = json_node_get_object((JsonNode*)li->data);
         const gchar *trackerAnnounce = tracker_get_announce(tracker);
         gchar *trackerAnnounceHost =
             trg_gregex_get_first(rx, trackerAnnounce);
         int cmpResult = g_strcmp0(trackerAnnounceHost, search);
         g_free(trackerAnnounceHost);
-        if (cmpResult == 0)
-            return TRUE;
+        if (!cmpResult) {
+            ret = TRUE;
+            break;
+        }
     }
 
-    return FALSE;
+    g_list_free(trackers);
+
+    return ret;
 }
 
 gint64 tracker_get_id(JsonObject * t)
diff --git a/src/trg-cell-renderer-epoch.c b/src/trg-cell-renderer-epoch.c
index f8d8499..a44971a 100644
--- a/src/trg-cell-renderer-epoch.c
+++ b/src/trg-cell-renderer-epoch.c
@@ -70,10 +70,10 @@ trg_cell_renderer_epoch_set_property(GObject * object, guint property_id,
                 g_object_set(object, "text", timestring, NULL);
                 g_free(timestring);
                 g_date_time_unref(dt);
-                priv->epoch_value = new_value;
             } else {
                 g_object_set(object, "text", "", NULL);
             }
+            priv->epoch_value = new_value;
         }
     } else {
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
diff --git a/src/trg-files-tree-view.c b/src/trg-files-tree-view.c
index 78e7735..432c5b8 100644
--- a/src/trg-files-tree-view.c
+++ b/src/trg-files-tree-view.c
@@ -289,7 +289,7 @@ static void trg_files_tree_view_init(TrgFilesTreeView * self)
         trg_tree_view_reg_column(ttv, TRG_COLTYPE_ICONTEXT, FILESCOL_NAME,
                                  _("Name"), "name", 0);
     desc->model_column_icon = FILESCOL_ICON;
-    desc->defaultWidth = 300;
+    desc->defaultWidth = 500;
 
     trg_tree_view_reg_column(ttv, TRG_COLTYPE_SIZE, FILESCOL_SIZE,
                              _("Size"), "size", 0);
diff --git a/src/trg-torrent-tree-view.c b/src/trg-torrent-tree-view.c
index 29f1162..ad63597 100644
--- a/src/trg-torrent-tree-view.c
+++ b/src/trg-torrent-tree-view.c
@@ -83,7 +83,7 @@ static void trg_torrent_tree_view_init(TrgTorrentTreeView * tttv)
                              TORRENT_COLUMN_BANDWIDTH_PRIORITY,
                              _("Priority"), "priority", TRG_COLUMN_EXTRA);
     trg_tree_view_reg_column(ttv, TRG_COLTYPE_EPOCH,
-                             TORRENT_COLUMN_DONE_DATE, _("Done Date"),
+                             TORRENT_COLUMN_DONE_DATE, _("Completed"),
                              "done-date", TRG_COLUMN_EXTRA);
 
     gtk_tree_view_set_search_column(GTK_TREE_VIEW(tttv),
diff --git a/src/trg-trackers-tree-view.c b/src/trg-trackers-tree-view.c
index ccf10b9..88632e2 100644
--- a/src/trg-trackers-tree-view.c
+++ b/src/trg-trackers-tree-view.c
@@ -152,13 +152,13 @@ static void trg_trackers_tree_view_init(TrgTrackersTreeView * self)
 
     desc =
         trg_tree_view_reg_column(ttv, TRG_COLTYPE_ICONTEXT,
-                                 TRACKERCOL_TIER, _("Tier"), "tier", 0);
+                                 TRACKERCOL_TIER, _("Tier"), "tier", TRG_COLUMN_UNREMOVABLE);
     desc->model_column_icon = TRACKERCOL_ICON;
 
     desc =
         trg_tree_view_reg_column(ttv, TRG_COLTYPE_TEXT,
                                  TRACKERCOL_ANNOUNCE, _("Announce URL"),
-                                 "announce-url", TRG_COLUMN_ALWAYS);
+                                 "announce-url", TRG_COLUMN_UNREMOVABLE);
     priv->announceRenderer = desc->customRenderer =
         gtk_cell_renderer_text_new();
     g_signal_connect(priv->announceRenderer, "edited",
diff --git a/src/trg-tree-view.c b/src/trg-tree-view.c
index 6a37ca7..07188ac 100644
--- a/src/trg-tree-view.c
+++ b/src/trg-tree-view.c
@@ -145,7 +145,7 @@ view_popup_menu(GtkButton * button, GdkEventButton * event,
     gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
     g_signal_connect(menuitem, "activate",
                      G_CALLBACK(trg_tree_view_hide_column), column);
-    gtk_widget_set_sensitive(menuitem, !(desc->flags & TRG_COLUMN_ALWAYS));
+    gtk_widget_set_sensitive(menuitem, !(desc->flags & TRG_COLUMN_UNREMOVABLE));
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
     for (li = priv->columns; li; li = g_list_next(li)) {
@@ -365,12 +365,12 @@ void trg_tree_view_setup_columns(TrgTreeView * tv)
 {
     TrgTreeViewPrivate *priv = TRG_TREE_VIEW_GET_PRIVATE(tv);
     gchar **columns = trg_gconf_get_csv(tv, "columns");
-    gchar **widths = trg_gconf_get_csv(tv, "widths");
     GList *li;
     int i;
     trg_column_description *desc;
 
     if (columns) {
+        gchar **widths = trg_gconf_get_csv(tv, "widths");
         for (i = 0; columns[i]; i++) {
             trg_column_description *desc =
                 trg_tree_view_find_column(tv, columns[i]);
@@ -378,7 +378,8 @@ void trg_tree_view_setup_columns(TrgTreeView * tv)
                 trg_tree_view_add_column(tv, desc, widths, i);
         }
         g_strfreev(columns);
-        g_strfreev(widths);
+        if (widths)
+            g_strfreev(widths);
     } else {
         for (li = priv->columns; li; li = g_list_next(li)) {
             desc = (trg_column_description *) li->data;
diff --git a/src/trg-tree-view.h b/src/trg-tree-view.h
index e3bed00..74f3adc 100644
--- a/src/trg-tree-view.h
+++ b/src/trg-tree-view.h
@@ -75,7 +75,7 @@ typedef struct {
 
 #define TRG_COLUMN_DEFAULT             0x00
 #define TRG_COLUMN_SHOWING             (1 << 0) /* 0x01 */
-#define TRG_COLUMN_ALWAYS              (1 << 1) /* 0x02 */
+#define TRG_COLUMN_UNREMOVABLE              (1 << 1) /* 0x02 */
 #define TRG_COLUMN_EXTRA               (1 << 2) /* 0x04 */
 
 trg_column_description *trg_tree_view_reg_column(TrgTreeView * tv,