summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-file-conflict-dialog.c
diff options
context:
space:
mode:
Diffstat (limited to 'libcaja-private/caja-file-conflict-dialog.c')
-rw-r--r--libcaja-private/caja-file-conflict-dialog.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libcaja-private/caja-file-conflict-dialog.c b/libcaja-private/caja-file-conflict-dialog.c
index 163d877f..97266fb8 100644
--- a/libcaja-private/caja-file-conflict-dialog.c
+++ b/libcaja-private/caja-file-conflict-dialog.c
@@ -526,11 +526,12 @@ diff_button_clicked_cb (GtkButton *w,
GError *error;
char *command;
- char **argv;
command = g_find_program_in_path ("meld");
if (command)
{
+ char **argv;
+
argv = g_new (char *, 4);
argv[0] = command;
argv[1] = g_file_get_path (caja_file_get_location (details->source));