[file-roller] renamed some functions
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller] renamed some functions
- Date: Sun, 20 Dec 2015 12:17:47 +0000 (UTC)
commit 087b54fecc219999596936b8f25ead2e3cdc20f3
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sun Dec 20 12:54:24 2015 +0100
renamed some functions
src/fr-application.c | 16 ++++++++--------
src/fr-window.c | 16 ++++++++--------
src/fr-window.h | 6 +++---
3 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/src/fr-application.c b/src/fr-application.c
index 9d5333f..85814a4 100644
--- a/src/fr-application.c
+++ b/src/fr-application.c
@@ -224,7 +224,7 @@ handle_method_call (GDBusConnection *connection,
g_signal_connect (window, "ready", G_CALLBACK (window_ready_cb), invocation);
fr_window_batch_new (FR_WINDOW (window), _("Compress"));
- fr_window_set_batch__add (FR_WINDOW (window), file, file_list);
+ fr_window_batch__add_files (FR_WINDOW (window), file, file_list);
fr_window_batch_append_action (FR_WINDOW (window), FR_BATCH_ACTION_QUIT, NULL, NULL);
fr_window_batch_start (FR_WINDOW (window));
@@ -259,8 +259,8 @@ handle_method_call (GDBusConnection *connection,
g_signal_connect (window, "progress", G_CALLBACK (window_progress_cb), connection);
g_signal_connect (window, "ready", G_CALLBACK (window_ready_cb), invocation);
- fr_window_batch_new (FR_WINDOW (window), _("Extract archive"));
- fr_window_set_batch__add (FR_WINDOW (window), NULL, file_list);
+ fr_window_batch_new (FR_WINDOW (window), _("Compress"));
+ fr_window_batch__add_files (FR_WINDOW (window), NULL, file_list);
fr_window_batch_append_action (FR_WINDOW (window), FR_BATCH_ACTION_QUIT, NULL, NULL);
fr_window_batch_start (FR_WINDOW (window));
@@ -296,7 +296,7 @@ handle_method_call (GDBusConnection *connection,
g_signal_connect (window, "ready", G_CALLBACK (window_ready_cb), invocation);
fr_window_batch_new (FR_WINDOW (window), _("Extract archive"));
- fr_window_set_batch__extract (FR_WINDOW (window), archive, destination);
+ fr_window_batch__extract (FR_WINDOW (window), archive, destination);
fr_window_batch_append_action (FR_WINDOW (window), FR_BATCH_ACTION_QUIT, NULL, NULL);
fr_window_batch_start (FR_WINDOW (window));
@@ -322,7 +322,7 @@ handle_method_call (GDBusConnection *connection,
g_signal_connect (window, "ready", G_CALLBACK (window_ready_cb), invocation);
fr_window_batch_new (FR_WINDOW (window), _("Extract archive"));
- fr_window_set_batch__extract_here (FR_WINDOW (window), archive);
+ fr_window_batch__extract_here (FR_WINDOW (window), archive);
fr_window_batch_append_action (FR_WINDOW (window), FR_BATCH_ACTION_QUIT, NULL, NULL);
fr_window_batch_start (FR_WINDOW (window));
@@ -570,7 +570,7 @@ fr_application_command_line (GApplication *application,
file_list = g_list_reverse (file_list);
fr_window_batch_new (FR_WINDOW (window), _("Compress"));
- fr_window_set_batch__add (FR_WINDOW (window), add_to_archive, file_list);
+ fr_window_batch__add_files (FR_WINDOW (window), add_to_archive, file_list);
if (! arg_notify)
fr_window_batch_append_action (FR_WINDOW (window), FR_BATCH_ACTION_QUIT, NULL, NULL);
else
@@ -598,9 +598,9 @@ fr_application_command_line (GApplication *application,
file = g_application_command_line_create_file_for_arg (command_line, archive);
if (arg_extract_here == 1)
- fr_window_set_batch__extract_here (FR_WINDOW (window), file);
+ fr_window_batch__extract_here (FR_WINDOW (window), file);
else
- fr_window_set_batch__extract (FR_WINDOW (window), file,
extraction_destination);
+ fr_window_batch__extract (FR_WINDOW (window), file, extraction_destination);
g_object_unref (file);
}
diff --git a/src/fr-window.c b/src/fr-window.c
index 0ca8a1b..42b93d3 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -9470,8 +9470,8 @@ fr_window_batch_get_title (FrWindow *window)
void
-fr_window_set_batch__extract_here (FrWindow *window,
- GFile *archive)
+fr_window_batch__extract_here (FrWindow *window,
+ GFile *archive)
{
g_return_if_fail (window != NULL);
g_return_if_fail (archive != NULL);
@@ -9498,9 +9498,9 @@ fr_window_set_batch__extract_here (FrWindow *window,
void
-fr_window_set_batch__extract (FrWindow *window,
- GFile *archive,
- GFile *destination)
+fr_window_batch__extract (FrWindow *window,
+ GFile *archive,
+ GFile *destination)
{
g_return_if_fail (window != NULL);
g_return_if_fail (archive != NULL);
@@ -9533,9 +9533,9 @@ fr_window_set_batch__extract (FrWindow *window,
void
-fr_window_set_batch__add (FrWindow *window,
- GFile *archive,
- GList *file_list)
+fr_window_batch__add_files (FrWindow *window,
+ GFile *archive,
+ GList *file_list)
{
window->priv->batch_adding_one_file = (file_list->next == NULL) && (_g_file_query_is_file
(file_list->data));
diff --git a/src/fr-window.h b/src/fr-window.h
index 83256b9..f9a25f1 100644
--- a/src/fr-window.h
+++ b/src/fr-window.h
@@ -298,12 +298,12 @@ void fr_window_batch_stop_with_error (FrWindow *window,
const char *error_message);
void fr_window_batch_resume (FrWindow *window);
gboolean fr_window_is_batch_mode (FrWindow *window);
-void fr_window_set_batch__extract (FrWindow *window,
+void fr_window_batch__extract (FrWindow *window,
GFile *archive,
GFile *destination);
-void fr_window_set_batch__extract_here (FrWindow *window,
+void fr_window_batch__extract_here (FrWindow *window,
GFile *archive);
-void fr_window_set_batch__add (FrWindow *window,
+void fr_window_batch__add_files (FrWindow *window,
GFile *archive,
GList *file_list);
void fr_window_destroy_with_error_dialog (FrWindow *window);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]