diff options
| author | Monsta <[email protected]> | 2014-11-06 15:10:46 +0300 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-12-15 23:14:18 +0100 |
| commit | 866cc139fea2f93da109a2b2fed65feb84e6aabc (patch) | |
| tree | c964178026c3383bf95be2c0336c754bec9fdb5c /gsearchtool | |
| parent | e9b171514af734cbc413452804f2d9201fb513c3 (diff) | |
| download | mate-utils-866cc139fea2f93da109a2b2fed65feb84e6aabc.tar.bz2 mate-utils-866cc139fea2f93da109a2b2fed65feb84e6aabc.tar.xz | |
don't leak memory
Diffstat (limited to 'gsearchtool')
| -rw-r--r-- | gsearchtool/gsearchtool-callbacks.c | 5 | ||||
| -rw-r--r-- | gsearchtool/gsearchtool-support.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/gsearchtool/gsearchtool-callbacks.c b/gsearchtool/gsearchtool-callbacks.c index 806be3e7..be2244e9 100644 --- a/gsearchtool/gsearchtool-callbacks.c +++ b/gsearchtool/gsearchtool-callbacks.c @@ -828,14 +828,15 @@ move_to_trash_cb (GtkAction * action, COLUMN_LOCALE_FILE, &locale_filename, COLUMN_NO_FILES_FOUND, &no_files_found, -1); - utf8_filename = g_filename_display_name (locale_filename); if (no_files_found) { g_free (utf8_basename); g_free (locale_filename); return; } - + + utf8_filename = g_filename_display_name (locale_filename); + if (idx + 1 == total) { last_selected_path = gtk_tree_model_get_path (GTK_TREE_MODEL (gsearch->search_results_list_store), &iter); } diff --git a/gsearchtool/gsearchtool-support.c b/gsearchtool/gsearchtool-support.c index 182934ca..a120967b 100644 --- a/gsearchtool/gsearchtool-support.c +++ b/gsearchtool/gsearchtool-support.c @@ -92,8 +92,6 @@ is_quick_search_excluded_path (const gchar * path) gboolean results = FALSE; gint i; - settings = g_settings_new ("org.mate.search-tool"); - dir = g_strdup (path); /* Remove trailing G_DIR_SEPARATOR. */ @@ -109,6 +107,8 @@ is_quick_search_excluded_path (const gchar * path) } g_free (dir); + settings = g_settings_new ("org.mate.search-tool"); + /* Check path against the Quick-Search-Excluded-Paths list. */ exclude_path_list = g_settings_get_strv (settings, "quick-search-excluded-paths"); @@ -169,8 +169,6 @@ is_second_scan_excluded_path (const gchar * path) gboolean results = FALSE; gint i; - settings = g_settings_new ("org.mate.search-tool"); - dir = g_strdup (path); /* Remove trailing G_DIR_SEPARATOR. */ @@ -186,6 +184,8 @@ is_second_scan_excluded_path (const gchar * path) } g_free (dir); + settings = g_settings_new ("org.mate.search-tool"); + /* Check path against the Quick-Search-Excluded-Paths list. */ exclude_path_list = g_settings_get_strv (settings, "quick-search-second-scan-excluded-paths"); |