diff options
| author | Stefano Karapetsas <[email protected]> | 2012-12-23 11:14:36 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-12-23 11:14:36 -0800 |
| commit | 3ec2cb1ade8ed91ed472091adcc592485dc49f4d (patch) | |
| tree | 122f234160898266040a89a6767871856bd607c9 /libcaja-private/caja-file-conflict-dialog.c | |
| parent | 8379b1dc107c9e0daf31ef1b654c9ab44d9bac23 (diff) | |
| parent | c598aa7e65d9e370c63f883acbbb6504044c2531 (diff) | |
| download | caja-3ec2cb1ade8ed91ed472091adcc592485dc49f4d.tar.bz2 caja-3ec2cb1ade8ed91ed472091adcc592485dc49f4d.tar.xz | |
Merge pull request #65 from jasmineaura/develop
Most of remaining deprecations, some cleanups, and a leak fix
Diffstat (limited to 'libcaja-private/caja-file-conflict-dialog.c')
| -rw-r--r-- | libcaja-private/caja-file-conflict-dialog.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libcaja-private/caja-file-conflict-dialog.c b/libcaja-private/caja-file-conflict-dialog.c index e3419c7c..798b39c0 100644 --- a/libcaja-private/caja-file-conflict-dialog.c +++ b/libcaja-private/caja-file-conflict-dialog.c @@ -100,12 +100,11 @@ file_list_ready_cb (GList *files, CajaFileConflictDialog *fcd = user_data; CajaFile *src, *dest, *dest_dir; time_t src_mtime, dest_mtime; - GtkDialog *dialog; gboolean source_is_dir, dest_is_dir, should_show_type; CajaFileConflictDialogDetails *details; char *primary_text, *message, *secondary_text; const gchar *message_extra; - char *src_name, *dest_name, *dest_dir_name, *edit_name; + char *dest_name, *dest_dir_name, *edit_name; char *label_text; char *size, *date, *type = NULL; GdkPixbuf *pixbuf; @@ -113,7 +112,6 @@ file_list_ready_cb (GList *files, GString *str; PangoFontDescription *desc; - dialog = GTK_DIALOG (fcd); details = fcd->details; details->handle = NULL; @@ -125,7 +123,6 @@ file_list_ready_cb (GList *files, src_mtime = caja_file_get_mtime (src); dest_mtime = caja_file_get_mtime (dest); - src_name = caja_file_get_display_name (src); dest_name = caja_file_get_display_name (dest); dest_dir_name = caja_file_get_display_name (dest_dir); |