diff options
| author | infirit <[email protected]> | 2014-11-21 15:53:12 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-11-22 20:25:30 +0100 |
| commit | 437c4f2690dd990a4e27432e1578916629010967 (patch) | |
| tree | 293277f3b86a4bebd6dc53d5ab8b56783deb0d61 /src/fr-archive.c | |
| parent | fb2b49141c7c84f46a4b2090109124b6a2f59d29 (diff) | |
| download | engrampa-437c4f2690dd990a4e27432e1578916629010967.tar.bz2 engrampa-437c4f2690dd990a4e27432e1578916629010967.tar.xz | |
renamed tmp_archive to old_archive
to improve code readability
Based on FR commit: 4f1f57d577388ec872f6d123cfaed03f0e812a82
From: Paolo Bacchilega <[email protected]>
Diffstat (limited to 'src/fr-archive.c')
| -rw-r--r-- | src/fr-archive.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/fr-archive.c b/src/fr-archive.c index bae1557..320b534 100644 --- a/src/fr-archive.c +++ b/src/fr-archive.c @@ -1144,7 +1144,7 @@ static void load_local_archive (FrArchive *archive, const char *password) { - FrCommand *tmp_command; + FrCommand *old_command; const char *mime_type; if (! g_file_query_exists (archive->file, archive->priv->cancellable)) { @@ -1158,7 +1158,7 @@ load_local_archive (FrArchive *archive, archive->have_permissions = check_file_permissions (archive->file, W_OK); archive->read_only = ! archive->have_permissions; - tmp_command = archive->command; + old_command = archive->command; mime_type = get_mime_type_from_filename (archive->local_copy); if (! create_command_to_load_archive (archive, mime_type)) { @@ -1166,7 +1166,7 @@ load_local_archive (FrArchive *archive, if (! create_command_to_load_archive (archive, mime_type)) { mime_type = get_mime_type_from_magic_numbers (archive->local_copy); if (! create_command_to_load_archive (archive, mime_type)) { - archive->command = tmp_command; + archive->command = old_command; archive->content_type = mime_type; fr_archive_action_completed (archive, FR_ACTION_LOADING_ARCHIVE, @@ -1177,9 +1177,9 @@ load_local_archive (FrArchive *archive, } } - if (tmp_command != NULL) { - g_signal_handlers_disconnect_by_data (tmp_command, archive); - g_object_unref (tmp_command); + if (old_command != NULL) { + g_signal_handlers_disconnect_by_data (old_command, archive); + g_object_unref (old_command); } fr_archive_connect_to_command (archive); |