diff options
| author | rbuj <[email protected]> | 2019-06-16 13:37:09 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-06-18 14:46:34 +0200 |
| commit | e0e185b1790f5a670cdd1292bac75ad1c44e4996 (patch) | |
| tree | b5d170259858c497dbfb813c0ddb55a197a2c5ca /libcaja-private/caja-file-conflict-dialog.c | |
| parent | ef29013fdfd0df5d4a3cc6c5a8fb1583aabef952 (diff) | |
| download | caja-e0e185b1790f5a670cdd1292bac75ad1c44e4996.tar.bz2 caja-e0e185b1790f5a670cdd1292bac75ad1c44e4996.tar.xz | |
Remove trailing whitespaces
find . -regextype posix-extended -regex '.*\.(c|h|ac|txt|xml)' -exec sed --in-place 's/[[:space:]]\+$//' {} \+
Diffstat (limited to 'libcaja-private/caja-file-conflict-dialog.c')
| -rw-r--r-- | libcaja-private/caja-file-conflict-dialog.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libcaja-private/caja-file-conflict-dialog.c b/libcaja-private/caja-file-conflict-dialog.c index 97266fb8..5b9f7252 100644 --- a/libcaja-private/caja-file-conflict-dialog.c +++ b/libcaja-private/caja-file-conflict-dialog.c @@ -346,7 +346,7 @@ file_list_ready_cb (GList *files, gtk_button_set_label (GTK_BUTTON (details->replace_button), _("Merge")); } - + /* If meld is installed, and source and destination arent binary * files, show the diff button */ @@ -358,10 +358,10 @@ file_list_ready_cb (GList *files, g_free (meld_found); gboolean src_is_binary; gboolean dest_is_binary; - + src_is_binary = caja_file_is_binary (details->source); dest_is_binary = caja_file_is_binary (details->destination); - + if (!src_is_binary && !dest_is_binary) gtk_widget_show (details->diff_button); } @@ -523,7 +523,7 @@ diff_button_clicked_cb (GtkButton *w, { CajaFileConflictDialogPrivate *details; details = dialog->details; - + GError *error; char *command; @@ -537,7 +537,7 @@ diff_button_clicked_cb (GtkButton *w, argv[1] = g_file_get_path (caja_file_get_location (details->source)); argv[2] = g_file_get_path (caja_file_get_location (details->destination)); argv[3] = NULL; - + error = NULL; if (!g_spawn_async_with_pipes (NULL, argv, |