[totem] object: Move prefs creation to totem-preferences.c
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] object: Move prefs creation to totem-preferences.c
- Date: Tue, 29 Jun 2021 16:06:10 +0000 (UTC)
commit bb8c7958bf49a66b378b4d78a7fa1dd3255405b5
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Tue May 4 23:36:24 2021 -0300
object: Move prefs creation to totem-preferences.c
In preparation for future changes where TotemObject will have
less control over the preferences widgetry, move it to the
totem-preferences.c file.
src/totem-object.c | 6 ------
src/totem-preferences.c | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/totem-object.c b/src/totem-object.c
index 8ead77e35..73887f4a4 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -217,12 +217,6 @@ totem_object_app_activate (GApplication *app)
gtk_widget_grab_focus (GTK_WIDGET (totem->bvw));
/* The prefs after the video widget is connected */
- totem->prefs_xml = totem_interface_load ("preferences.ui", TRUE, NULL, totem);
- totem->prefs = GTK_WIDGET (gtk_builder_get_object (totem->prefs_xml, "totem_preferences_window"));
-
- gtk_window_set_modal (GTK_WINDOW (totem->prefs), TRUE);
- gtk_window_set_transient_for (GTK_WINDOW (totem->prefs), GTK_WINDOW(totem->win));
-
totem_setup_preferences (totem);
/* Initialise all the plugins, and set the default page, in case
diff --git a/src/totem-preferences.c b/src/totem-preferences.c
index 6f26903c3..c7328cfb4 100644
--- a/src/totem-preferences.c
+++ b/src/totem-preferences.c
@@ -234,6 +234,12 @@ totem_setup_preferences (Totem *totem)
g_return_if_fail (totem->settings != NULL);
+ totem->prefs_xml = totem_interface_load ("preferences.ui", TRUE, NULL, totem);
+ totem->prefs = GTK_WIDGET (gtk_builder_get_object (totem->prefs_xml, "totem_preferences_window"));
+
+ gtk_window_set_modal (GTK_WINDOW (totem->prefs), TRUE);
+ gtk_window_set_transient_for (GTK_WINDOW (totem->prefs), GTK_WINDOW(totem->win));
+
bvw = totem_object_get_video_widget (totem);
g_signal_connect (G_OBJECT (totem->prefs), "response",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]