[easytag/wip/application-window: 11/11] Remove last uses of GtkAction
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [easytag/wip/application-window: 11/11] Remove last uses of GtkAction
- Date: Mon, 14 Jul 2014 22:12:01 +0000 (UTC)
commit 55d37dcecd17d54bc078be29a1bb9069af1d01ea
Author: David King <amigadave amigadave com>
Date: Mon Jul 14 22:19:16 2014 +0100
Remove last uses of GtkAction
src/application_window.c | 32 +++-----------------------------
src/application_window.h | 4 +---
src/easytag.h | 8 --------
src/scan_dialog.c | 3 +--
4 files changed, 5 insertions(+), 42 deletions(-)
---
diff --git a/src/application_window.c b/src/application_window.c
index c2c61df..686165c 100644
--- a/src/application_window.c
+++ b/src/application_window.c
@@ -3159,11 +3159,11 @@ et_application_window_get_preferences_dialog (EtApplicationWindow *self)
}
void
-et_application_window_show_preferences_dialog_scanner (G_GNUC_UNUSED GtkAction *action,
- gpointer user_data)
+et_application_window_show_preferences_dialog_scanner (EtApplicationWindow *self)
{
EtApplicationWindowPrivate *priv;
- EtApplicationWindow *self = ET_APPLICATION_WINDOW (user_data);
+
+ g_return_if_fail (ET_APPLICATION_WINDOW (self));
priv = et_application_window_get_instance_private (self);
@@ -3306,32 +3306,6 @@ et_application_window_get_scan_dialog (EtApplicationWindow *self)
}
/*
- * et_on_action_select_scan_mode:
- * @action: the action on which the signal was emitted
- * @current: the member of the action group which has just been activated
- * @user_data: user data set when the signal handler was connected
- *
- * Select the current scanner mode.
- */
-void
-et_on_action_select_scan_mode (GtkRadioAction *action, GtkRadioAction *current,
- gpointer user_data)
-{
- gint active_value;
-
- active_value = gtk_radio_action_get_current_value (action);
-
- g_settings_set_enum (MainSettings, "scan-mode", active_value);
-}
-
-void
-et_on_action_select_browser_mode (G_GNUC_UNUSED GtkRadioAction *action,
- G_GNUC_UNUSED GtkRadioAction *current,
- gpointer user_data)
-{
-}
-
-/*
* Disable (FALSE) / Enable (TRUE) all user widgets in the tag area
*/
void
diff --git a/src/application_window.h b/src/application_window.h
index 9fb6d53..600bda0 100644
--- a/src/application_window.h
+++ b/src/application_window.h
@@ -56,7 +56,7 @@ GtkWidget * et_application_window_get_log_area (EtApplicationWindow *self);
GtkWidget * et_application_window_get_load_files_dialog (EtApplicationWindow *self);
GtkWidget * et_application_window_get_search_dialog (EtApplicationWindow *self);
GtkWidget * et_application_window_get_preferences_dialog (EtApplicationWindow *self);
-void et_application_window_show_preferences_dialog_scanner (GtkAction *action, gpointer user_data);
+void et_application_window_show_preferences_dialog_scanner (EtApplicationWindow *self);
GtkWidget * et_application_window_get_cddb_dialog (EtApplicationWindow *self);
void et_application_window_browser_toggle_display_mode (EtApplicationWindow *self);
void et_application_window_browser_set_sensitive (EtApplicationWindow *self, gboolean sensitive);
@@ -66,8 +66,6 @@ void et_application_window_browser_clear_artist_model (EtApplicationWindow *self
void et_application_window_select_dir (EtApplicationWindow *self, const gchar *path);
const gchar * et_application_window_get_current_path (EtApplicationWindow *self);
GtkWidget * et_application_window_get_scan_dialog (EtApplicationWindow *self);
-void et_on_action_select_scan_mode (GtkRadioAction *action, GtkRadioAction *current, gpointer user_data);
-void et_on_action_select_browser_mode (GtkRadioAction *action, GtkRadioAction *current, gpointer user_data);
void et_application_window_browser_entry_set_text (EtApplicationWindow *self, const gchar *text);
void et_application_window_browser_label_set_text (EtApplicationWindow *self, const gchar *text);
ET_File * et_application_window_browser_get_et_file_from_path (EtApplicationWindow *self, GtkTreePath *path);
diff --git a/src/easytag.h b/src/easytag.h
index 8fba880..97e6922 100644
--- a/src/easytag.h
+++ b/src/easytag.h
@@ -101,21 +101,13 @@ gboolean ReadingDirectory;
/**************
* Prototypes *
**************/
-void Action_Select_Nth_File_By_Position (gulong num_item);
void Action_Select_Nth_File_By_Etfile (ET_File *ETFile);
-gint Action_Redo_Selected_File (void);
-void Action_Undo_All_Files (void);
-void Action_Redo_All_Files (void);
void Action_Save_Selected_Files (void);
void Action_Force_Saving_Selected_Files (void);
-gint et_delete_file (ET_File *ETFile, gboolean multiple_files, GError **error);
gint Save_All_Files_With_Answer (gboolean force_saving_files);
void Action_Main_Stop_Button_Pressed (void);
-void et_on_action_select_scan_mode (GtkRadioAction *action,
- GtkRadioAction *current,
- gpointer user_data);
gboolean Read_Directory (gchar *path);
void Quit_MainWindow (void);
diff --git a/src/scan_dialog.c b/src/scan_dialog.c
index a226927..834f680 100644
--- a/src/scan_dialog.c
+++ b/src/scan_dialog.c
@@ -3255,8 +3255,7 @@ et_scan_dialog_apply_changes (EtScanDialog *self)
static void
Scan_Option_Button (void)
{
- et_application_window_show_preferences_dialog_scanner (NULL,
- ET_APPLICATION_WINDOW (MainWindow));
+ et_application_window_show_preferences_dialog_scanner (ET_APPLICATION_WINDOW (MainWindow));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]