fix some memory leaks during disposal in TrgTreeView (so when the app is being closed, not too important)

4 files changed, 39 insertions, 46 deletions

diff --git a/src/tpeer.c b/src/tpeer.c
index 9a22928..1941d14 100644
--- a/src/tpeer.c
+++ b/src/tpeer.c
@@ -23,49 +23,38 @@
 #include "tpeer.h"
 #include "protocol-constants.h"
 
-const gchar *peer_get_address(JsonObject * p)
-{
+const gchar *peer_get_address(JsonObject * p) {
     return json_object_get_string_member(p, TPEER_ADDRESS);
 }
 
-const gchar *peer_get_flagstr(JsonObject * p)
-{
+const gchar *peer_get_flagstr(JsonObject * p) {
     return json_object_get_string_member(p, TPEER_FLAGSTR);
 }
 
-const gchar *peer_get_client_name(JsonObject * p)
-{
+const gchar *peer_get_client_name(JsonObject * p) {
     return json_object_get_string_member(p, TPEER_CLIENT_NAME);
 }
 
-gboolean peer_get_is_encrypted(JsonObject * p)
-{
+gboolean peer_get_is_encrypted(JsonObject * p) {
     return json_object_get_boolean_member(p, TPEER_IS_ENCRYPTED);
 }
 
-gboolean peer_get_is_uploading_to(JsonObject * p)
-{
+gboolean peer_get_is_uploading_to(JsonObject * p) {
     return json_object_get_boolean_member(p, TPEER_IS_UPLOADING_TO);
 }
 
-gboolean peer_get_is_downloading_from(JsonObject * p)
-{
+gboolean peer_get_is_downloading_from(JsonObject * p) {
     return json_object_get_boolean_member(p, TPEER_IS_DOWNLOADING_FROM);
 }
 
-gdouble peer_get_progress(JsonObject * p)
-{
+gdouble peer_get_progress(JsonObject * p) {
     return json_object_get_double_member(p, TPEER_PROGRESS) * 100.0;
 }
 
-gint64 peer_get_rate_to_client(JsonObject * p)
-{
-    return (gint64)
-        json_node_get_int(json_object_get_member(p, TPEER_RATE_TO_CLIENT));
+gint64 peer_get_rate_to_client(JsonObject * p) {
+    return json_node_get_int(json_object_get_member(p, TPEER_RATE_TO_CLIENT));
 }
 
-gint64 peer_get_rate_to_peer(JsonObject * p)
-{
-    return (gint64)
-        json_node_get_int(json_object_get_member(p, TPEER_RATE_TO_PEER));
+gint64 peer_get_rate_to_peer(JsonObject * p) {
+    return json_node_get_int(json_object_get_member(p, TPEER_RATE_TO_PEER));
 }
diff --git a/src/trg-preferences-dialog.c b/src/trg-preferences-dialog.c
index 3e8c307..b1ee78e 100644
--- a/src/trg-preferences-dialog.c
+++ b/src/trg-preferences-dialog.c
@@ -423,8 +423,8 @@ static void trg_prefs_profile_combo_populate(TrgPreferencesDialog *dialog,
         i++;
     }
 
-    gtk_widget_set_sensitive(priv->profileDelButton, g_list_length(profiles) > 1);
-
+    gtk_widget_set_sensitive(priv->profileDelButton,
+            g_list_length(profiles) > 1);
 
 }
 
diff --git a/src/trg-prefs.c b/src/trg-prefs.c
index 7c11879..7f57eed 100644
--- a/src/trg-prefs.c
+++ b/src/trg-prefs.c
@@ -91,9 +91,8 @@ static GObject *trg_prefs_constructor(GType type, guint n_construct_properties,
 
     trg_prefs_create_defaults(TRG_PREFS(object));
 
-    priv->file = g_build_filename (g_get_user_config_dir (),
-            g_get_application_name (),
-            TRG_PREFS_FILENAME, NULL);
+    priv->file = g_build_filename(g_get_user_config_dir(),
+            g_get_application_name(), TRG_PREFS_FILENAME, NULL);
 
     return object;
 }
@@ -144,7 +143,8 @@ void trg_prefs_add_default_bool(TrgPrefs *p, gchar *key, gboolean value) {
 
 gint trg_prefs_get_profile_id(TrgPrefs *p) {
     TrgPrefsPrivate *priv = GET_PRIVATE(p);
-    return (gint)json_object_get_int_member(priv->userObj, TRG_PREFS_KEY_PROFILE_ID);
+    return (gint) json_object_get_int_member(priv->userObj,
+            TRG_PREFS_KEY_PROFILE_ID);
 }
 
 JsonNode *trg_prefs_get_value(TrgPrefs *p, gchar *key, int flags) {
@@ -169,8 +169,7 @@ JsonNode *trg_prefs_get_value(TrgPrefs *p, gchar *key, int flags) {
         }
     }
 
-    if (priv->defaultsObj && json_object_has_member(priv->defaultsObj,
-            key)) {
+    if (priv->defaultsObj && json_object_has_member(priv->defaultsObj, key)) {
         return json_object_get_member(priv->defaultsObj, key);
     }
 
@@ -211,7 +210,7 @@ gboolean trg_prefs_get_bool(TrgPrefs *p, gchar *key, int flags) {
 
 void trg_prefs_set_int(TrgPrefs *p, gchar *key, int value, int flags) {
     JsonNode *node = trg_prefs_get_value(p, key, flags | TRG_PREFS_NEWNODE);
-    json_node_set_int(node, (gint64)value);
+    json_node_set_int(node, (gint64) value);
 }
 
 void trg_prefs_set_string(TrgPrefs *p, gchar *key, const gchar *value,
@@ -228,13 +227,12 @@ void trg_prefs_set_profile(TrgPrefs *p, JsonObject *profile) {
     GList *li;
     gint i = 0;
 
-    for (li = json_array_get_elements(profiles); li; li = g_list_next(li))
-    {
-            if (json_node_get_object((JsonNode*)li->data) == profile) {
-                trg_prefs_set_int(p, TRG_PREFS_KEY_PROFILE_ID, i, TRG_PREFS_GLOBAL);
-                break;
-            }
-            i++;
+    for (li = json_array_get_elements(profiles); li; li = g_list_next(li)) {
+        if (json_node_get_object((JsonNode*) li->data) == profile) {
+            trg_prefs_set_int(p, TRG_PREFS_KEY_PROFILE_ID, i, TRG_PREFS_GLOBAL);
+            break;
+        }
+        i++;
     }
 }
 
@@ -251,16 +249,15 @@ void trg_prefs_del_profile(TrgPrefs *p, JsonObject *profile) {
     GList *li;
     JsonNode *node;
     int i = 0;
-    for (li = json_array_get_elements(profiles); li; li = g_list_next(li))
-    {
-        node = (JsonNode*)li->data;
-        if (profile == (gpointer)json_node_get_object(node)) {
+
+    for (li = json_array_get_elements(profiles); li; li = g_list_next(li)) {
+        node = (JsonNode*) li->data;
+        if (profile == (gpointer) json_node_get_object(node)) {
             json_array_remove_element(profiles, i);
             break;
         }
         i++;
     }
-
 }
 
 JsonObject* trg_prefs_get_profile(TrgPrefs *p) {
@@ -289,9 +286,10 @@ gboolean trg_prefs_save(TrgPrefs *p) {
     gchar *dirName;
     gboolean success = TRUE;
 
-    dirName = g_path_get_dirname (priv->file);
+    dirName = g_path_get_dirname(priv->file);
     if (!g_file_test(dirName, G_FILE_TEST_IS_DIR))
-        success = g_mkdir_with_parents (dirName, TRG_PREFS_DEFAULT_DIR_MODE) == 0;
+        success = g_mkdir_with_parents(dirName, TRG_PREFS_DEFAULT_DIR_MODE)
+                == 0;
     g_free(dirName);
 
     if (!success) {
@@ -379,7 +377,8 @@ void trg_prefs_load(TrgPrefs *p) {
         gint profile_id = trg_prefs_get_int(p, TRG_PREFS_KEY_PROFILE_ID,
                 TRG_PREFS_GLOBAL);
         if (profile_id >= n_profiles)
-            trg_prefs_set_int(p, TRG_PREFS_KEY_PROFILE_ID, profile_id=0, TRG_PREFS_GLOBAL);
+            trg_prefs_set_int(p, TRG_PREFS_KEY_PROFILE_ID, profile_id = 0,
+                    TRG_PREFS_GLOBAL);
 
         priv->profile = json_array_get_object_element(profiles, profile_id);
     }
diff --git a/src/trg-tree-view.c b/src/trg-tree-view.c
index 75f6674..8e0a866 100644
--- a/src/trg-tree-view.c
+++ b/src/trg-tree-view.c
@@ -406,6 +406,8 @@ void trg_tree_view_persist(TrgTreeView * tv)
         json_array_add_int_element(widths, gtk_tree_view_column_get_width(col));
     }
 
+    g_list_free(cols);
+
     gtk_tree_sortable_get_sort_column_id(GTK_TREE_SORTABLE(model), &sort_column_id, &sort_type);
 
     if (json_object_has_member(props, TRG_PREFS_KEY_TV_SORT_COL))
@@ -471,6 +473,9 @@ void trg_tree_view_setup_columns(TrgTreeView * tv)
         }
         wli = g_list_next(wli);
     }
+
+    g_list_free(columns);
+    g_list_free(widths);
 }
 
 GList *trg_tree_view_get_selected_refs_list(GtkTreeView * tv)