[file-roller] renamed tmp_archive to old_archive
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller] renamed tmp_archive to old_archive
- Date: Tue, 19 Jun 2012 18:40:07 +0000 (UTC)
commit 4f1f57d577388ec872f6d123cfaed03f0e812a82
Author: Paolo Bacchilega <paobac src gnome org>
Date: Mon Jun 18 11:27:35 2012 +0200
renamed tmp_archive to old_archive
to improve code readability
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 af35396..49d269a 100644
--- a/src/fr-archive.c
+++ b/src/fr-archive.c
@@ -1143,7 +1143,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)) {
@@ -1157,7 +1157,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)) {
@@ -1165,7 +1165,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,
@@ -1176,9 +1176,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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]