Skip to content

Commit ef64921

Browse files
committed
file operations: Fix some memory leaks.
Spotted by valgrind.
1 parent cb44fce commit ef64921

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

libnemo-private/nemo-file-operations.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4436,8 +4436,10 @@ copy_move_file (CopyMoveJob *copy_job,
44364436
if (src != NULL) {
44374437
GFile *parent = g_file_get_parent (src);
44384438

4439-
if (parent != NULL && g_file_equal (copy_job->desktop_location, parent)) {
4440-
source_is_desktop = TRUE;
4439+
if (parent != NULL) {
4440+
if (g_file_equal (copy_job->desktop_location, parent)) {
4441+
source_is_desktop = TRUE;
4442+
}
44414443
g_object_unref (parent);
44424444
}
44434445
}

src/nemo-progress-ui-handler.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,14 +310,15 @@ progress_info_changed_cb (NemoProgressInfo *info,
310310
if (g_list_length(self->priv->infos) > 0) {
311311
NemoProgressInfo *first_info = (NemoProgressInfo *) g_list_first(self->priv->infos)->data;
312312
GList *l;
313+
g_autofree gchar *status = nemo_progress_info_get_status (first_info);
313314
double progress = 0.0;
314315
int i = 0;
315316
for (l = self->priv->infos; l != NULL; l = l->next) {
316317
progress = (progress + nemo_progress_info_get_progress (l->data)) / (double) ++i;
317318
}
318319
if (progress > 0) {
319320
int iprogress = progress * 100;
320-
gchar *str = g_strdup_printf (_("%d%% %s"), iprogress, nemo_progress_info_get_status(first_info));
321+
gchar *str = g_strdup_printf (_("%d%% %s"), iprogress, status);
321322
gtk_window_set_title (GTK_WINDOW (self->priv->progress_window), str);
322323
xapp_gtk_window_set_progress (XAPP_GTK_WINDOW (self->priv->progress_window), iprogress);
323324
g_free (str);
@@ -327,7 +328,7 @@ progress_info_changed_cb (NemoProgressInfo *info,
327328
}
328329
}
329330
else {
330-
gtk_window_set_title (GTK_WINDOW (self->priv->progress_window), nemo_progress_info_get_status(first_info));
331+
gtk_window_set_title (GTK_WINDOW (self->priv->progress_window), status);
331332
xapp_gtk_window_set_progress (XAPP_GTK_WINDOW (self->priv->progress_window), 0);
332333
}
333334
}
@@ -361,7 +362,9 @@ handle_new_progress_info (NemoProgressUIHandler *self,
361362
/* this is the only active operation, present the window */
362363
progress_ui_handler_add_to_window (self, info);
363364
gtk_window_present (GTK_WINDOW (self->priv->progress_window));
364-
gtk_window_set_title (GTK_WINDOW (self->priv->progress_window), nemo_progress_info_get_details(info));
365+
gchar *details = nemo_progress_info_get_details (info);
366+
gtk_window_set_title (GTK_WINDOW (self->priv->progress_window), details);
367+
g_free (details);
365368
xapp_gtk_window_set_icon_name (XAPP_GTK_WINDOW (self->priv->progress_window), "system-run");
366369
} else {
367370
progress_ui_handler_add_to_window (self, info);

0 commit comments

Comments
 (0)