summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMonsta <[email protected]>2014-12-02 14:22:35 +0300
committerinfirit <[email protected]>2014-12-10 10:38:37 +0100
commitae2b0bcee1db078730bd7ea1578df3b33642214a (patch)
tree5631efdaf6d6cad89c8d931961c30e6582f55bff /src
parente94434691e9f6831072a3353bde9804509e0b624 (diff)
downloadcaja-ae2b0bcee1db078730bd7ea1578df3b33642214a.tar.bz2
caja-ae2b0bcee1db078730bd7ea1578df3b33642214a.tar.xz
file-manager: don't leak memory
Diffstat (limited to 'src')
-rw-r--r--src/file-manager/fm-directory-view.c3
-rw-r--r--src/file-manager/fm-ditem-page.c3
-rw-r--r--src/file-manager/fm-properties-window.c4
3 files changed, 6 insertions, 4 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index eadb3750..ac13a13f 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -10519,6 +10519,7 @@ fm_directory_view_handle_netscape_url_drop (FMDirectoryView *view,
handle_netscape_url_drop_ask_cb,
data);
+ g_strfreev (bits);
g_free (container_uri);
return;
}
@@ -10534,6 +10535,7 @@ fm_directory_view_handle_netscape_url_drop (FMDirectoryView *view,
eel_show_warning_dialog (_("Drag and drop is not supported."),
_("An invalid drag type was used."),
fm_directory_view_get_containing_window (view));
+ g_strfreev (bits);
g_free (container_uri);
return;
}
@@ -10592,7 +10594,6 @@ fm_directory_view_handle_netscape_url_drop (FMDirectoryView *view,
}
g_strfreev (bits);
-
g_free (container_uri);
}
diff --git a/src/file-manager/fm-ditem-page.c b/src/file-manager/fm-ditem-page.c
index 52958feb..0acec773 100644
--- a/src/file-manager/fm-ditem-page.c
+++ b/src/file-manager/fm-ditem-page.c
@@ -218,6 +218,7 @@ fm_ditem_page_exec_drag_data_received (GtkWidget *widget, GdkDragContext *contex
}
file = caja_file_get_by_uri (uris[0]);
+ g_strfreev (uris);
g_return_if_fail (file != NULL);
@@ -248,8 +249,6 @@ fm_ditem_page_exec_drag_data_received (GtkWidget *widget, GdkDragContext *contex
g_free (uri);
caja_file_unref (file);
-
- g_strfreev (uris);
}
static void
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index ddec36b9..c6b59efc 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -3209,7 +3209,9 @@ create_pie_widget (FMPropertiesWindow *window)
if (info) {
fs_type = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_FILESYSTEM_TYPE);
if (fs_type != NULL) {
- gtk_label_set_text (GTK_LABEL (fstype_label), g_strconcat (_("Filesystem type:"), " ", fs_type, NULL));
+ gchar *fstype_text = g_strconcat (_("Filesystem type:"), " ", fs_type, NULL);
+ gtk_label_set_text (GTK_LABEL (fstype_label), fstype_text);
+ g_free (fstype_text);
}
g_object_unref (info);