diff options
| author | Krifa75 <yahiaoui.fakhri@gmail.com> | 2022-11-17 01:09:51 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2022-11-23 12:37:37 +0100 |
| commit | de1ad1532547ae014b7c91544d9763553485e2a9 (patch) | |
| tree | 7177101dec99e96e633a0ce674d881ad5809a15c | |
| parent | 86e45df5ed5fe7a3e1e911ca79131ecdc2f4b817 (diff) | |
| download | totem-de1ad1532547ae014b7c91544d9763553485e2a9.tar.gz | |
main: Move headerbar signals connection to GtkBuilder
| -rw-r--r-- | data/totem.ui | 3 | ||||
| -rw-r--r-- | src/totem-object.c | 14 | ||||
| -rw-r--r-- | src/totem-private.h | 3 |
3 files changed, 11 insertions, 9 deletions
diff --git a/data/totem.ui b/data/totem.ui index fafce8c34..99154b770 100644 --- a/data/totem.ui +++ b/data/totem.ui @@ -199,6 +199,9 @@ <property name="show-select-button">True</property> <property name="show-close-button">True</property> <property name="title" translatable="yes">Videos</property> + <signal name="back-clicked" handler="back_button_clicked_cb"/> + <signal name="notify::search-mode" handler="update_add_button_visibility"/> + <signal name="notify::select-mode" handler="update_add_button_visibility"/> <child> <object class="GtkMenuButton" id="add_button"> <property name="visible">True</property> diff --git a/src/totem-object.c b/src/totem-object.c index 799534a9a..203f5cdad 100644 --- a/src/totem-object.c +++ b/src/totem-object.c @@ -117,6 +117,9 @@ G_MODULE_EXPORT gboolean window_state_event_cb (GtkWidget *window, GdkEventWindo G_MODULE_EXPORT void seek_slider_changed_cb (GtkAdjustment *adj, TotemObject *totem); G_MODULE_EXPORT gboolean window_key_press_event_cb (GtkWidget *win, GdkEventKey *event, TotemObject *totem); +/* Header */ +G_MODULE_EXPORT void update_add_button_visibility (GObject *gobject, GParamSpec *pspec, TotemObject *totem); + /* Menu */ G_MODULE_EXPORT void popup_menu_shown_cb (GtkToggleButton *button, TotemObject *totem); @@ -2455,7 +2458,7 @@ drop_video_cb (GtkWidget *widget, return; } -static void +void back_button_clicked_cb (GtkButton *button, TotemObject *totem) { @@ -3868,8 +3871,6 @@ totem_setup_window (TotemObject *totem) /* Headerbar */ totem->header = GTK_WIDGET (gtk_builder_get_object (totem->xml, "header")); - g_signal_connect (G_OBJECT (totem->header), "back-clicked", - G_CALLBACK (back_button_clicked_cb), totem); return; } @@ -3895,7 +3896,7 @@ volume_button_menu_shown_cb (GObject *popover, unmark_popup_busy (totem, "volume menu visible"); } -static void +void update_add_button_visibility (GObject *gobject, GParamSpec *pspec, TotemObject *totem) @@ -3955,11 +3956,6 @@ totem_callback_connect (TotemObject *totem) totem->subtitles_button = GTK_WIDGET (gtk_builder_get_object (totem->xml, "subtitles_button")); /* Add button */ - g_signal_connect (G_OBJECT (totem->header), "notify::search-mode", - G_CALLBACK (update_add_button_visibility), totem); - g_signal_connect (G_OBJECT (totem->header), "notify::select-mode", - G_CALLBACK (update_add_button_visibility), totem); - totem->add_button = GTK_WIDGET (gtk_builder_get_object (totem->xml, "add_button")); /* Fullscreen button */ diff --git a/src/totem-private.h b/src/totem-private.h index be7808386..72e5f4a65 100644 --- a/src/totem-private.h +++ b/src/totem-private.h @@ -149,6 +149,9 @@ struct _TotemObject { #define VOLUME_DOWN_SHORT_OFFSET (-0.02) #define VOLUME_UP_SHORT_OFFSET (0.02) +/* Header */ +G_MODULE_EXPORT void back_button_clicked_cb (GtkButton *button, TotemObject *totem); + void totem_object_open (Totem *totem); void totem_object_open_location (Totem *totem); void totem_object_eject (Totem *totem); |