fix two fairly minor memory leaks

6 files changed, 9 insertions, 26 deletions

diff --git a/src/torrent.c b/src/torrent.c
index 7c82df4..3d0d02e 100644
--- a/src/torrent.c
+++ b/src/torrent.c
@@ -244,12 +244,6 @@ gint64 tracker_get_tier(JsonObject * t)
     return json_object_get_int_member(t, FIELD_TIER);
 }
 
-gchar *torrent_get_download_dir_short(JsonObject * t, GRegex * rx)
-{
-    const gchar *dir = torrent_get_download_dir(t);
-    return trg_gregex_get_first(rx, dir);
-}
-
 gint64 torrent_get_left_until_done(JsonObject * t)
 {
     return json_object_get_int_member(t, FIELD_LEFTUNTILDONE);
diff --git a/src/torrent.h b/src/torrent.h
index a80d420..118d36b 100644
--- a/src/torrent.h
+++ b/src/torrent.h
@@ -42,7 +42,6 @@ gint64 torrent_get_uploaded(JsonObject * t);
 gint64 torrent_get_downloaded(JsonObject * t);
 const gchar *torrent_get_errorstr(JsonObject * t);
 const gchar *torrent_get_download_dir(JsonObject * t);
-gchar *torrent_get_download_dir_short(JsonObject * t, GRegex * rx);
 gint64 torrent_get_have_unchecked(JsonObject * t);
 gint64 torrent_get_have_valid(JsonObject * t);
 gint64 torrent_get_status(JsonObject * t);
diff --git a/src/trg-client.c b/src/trg-client.c
index 0ef1f2d..d14d36f 100644
--- a/src/trg-client.c
+++ b/src/trg-client.c
@@ -58,7 +58,7 @@ trg_client *trg_init_client()
 
 void trg_client_set_session(trg_client * tc, JsonObject * session)
 {
-    if (tc->session != NULL)
+    if (tc->session)
         json_object_unref(tc->session);
 
     session_get_version(session, &tc->version);
@@ -129,12 +129,14 @@ int trg_client_populate_with_settings(trg_client * tc, GConfClient * gconf)
         for (i = 0; proxies[i]; i++) {
             if (g_str_has_prefix(proxies[i], "http")) {
                 g_free(tc->proxy);
-                tc->proxy = g_strdup(proxies[i]);
+                tc->proxy = proxies[i];
+            } else {
+                g_free(proxies[i]);
             }
-            g_free(proxies[i]);
         }
 
         g_free(proxies);
+        px_proxy_factory_free(pf);
     }
 #endif
 
diff --git a/src/trg-state-selector.c b/src/trg-state-selector.c
index 944a356..7ffe12c 100644
--- a/src/trg-state-selector.c
+++ b/src/trg-state-selector.c
@@ -266,6 +266,7 @@ void trg_state_selector_update(TrgStateSelector * s)
                                                       *)
                                                      result,
                                                      client->updateSerial);
+                    g_free(announceHost);
                 } else {
                     gtk_list_store_insert(GTK_LIST_STORE(model), &iter,
                                           9 +
diff --git a/src/trg-stats-dialog.c b/src/trg-stats-dialog.c
index 45258a4..d582a9f 100644
--- a/src/trg-stats-dialog.c
+++ b/src/trg-stats-dialog.c
@@ -65,16 +65,6 @@ static void on_stats_reply(JsonObject * response, int status,
                            gpointer data);
 
 static void
-trg_stats_dialog_get_property(GObject * object, guint property_id,
-                              GValue * value, GParamSpec * pspec)
-{
-    switch (property_id) {
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
-    }
-}
-
-static void
 trg_stats_dialog_set_property(GObject * object, guint property_id,
                               const GValue * value, GParamSpec * pspec)
 {
@@ -195,13 +185,13 @@ static void on_stats_reply(JsonObject * response, int status,
     TrgStatsDialogPrivate *priv;
     JsonObject *args;
 
-    gdk_threads_enter();
-
     if (!TRG_IS_STATS_DIALOG(data)) {
         response_unref(response);
         return;
     }
 
+    gdk_threads_enter();
+
     priv = TRG_STATS_DIALOG_GET_PRIVATE(data);
 
     if (status == CURLE_OK) {
@@ -213,7 +203,7 @@ static void on_stats_reply(JsonObject * response, int status,
         update_int_stat(args, priv->rr_session_count, "sessionCount");
         update_time_stat(args, priv->rr_active, "secondsActive");
 
-        if (priv->client->session != NULL)
+        if (priv->client->session)
             g_timeout_add_seconds(5, trg_update_stats_timerfunc, data);
     } else {
         trg_error_dialog(GTK_WINDOW(data), status, response);
@@ -321,7 +311,6 @@ static void trg_stats_dialog_class_init(TrgStatsDialogClass * klass)
 
     g_type_class_add_private(klass, sizeof(TrgStatsDialogPrivate));
 
-    object_class->get_property = trg_stats_dialog_get_property;
     object_class->set_property = trg_stats_dialog_set_property;
     object_class->constructor = trg_stats_dialog_constructor;
 
diff --git a/src/trg-torrent-add-dialog.c b/src/trg-torrent-add-dialog.c
index 0b018a0..0dae71e 100644
--- a/src/trg-torrent-add-dialog.c
+++ b/src/trg-torrent-add-dialog.c
@@ -373,8 +373,6 @@ static gboolean
 setSubtreeForeach(GtkTreeModel * model,
                   GtkTreePath * path, GtkTreeIter * iter, gpointer gdata)
 {
-    /*const gboolean is_file = !gtk_tree_model_iter_has_child(model, iter); */
-
     struct SubtreeForeachData *data = gdata;
 
     if (!gtk_tree_path_compare(path, data->path)