[metacity] main: move initial theme loading to meta_ui_new



commit 23f2f9b7a5816a3ec33d7144f3d906d4ae23d8a3
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Mar 11 00:02:20 2017 +0200

    main: move initial theme loading to meta_ui_new

 src/core/main.c |    2 --
 src/ui/ui.c     |    4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/core/main.c b/src/core/main.c
index 2eb716f..e54d7b9 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -436,8 +436,6 @@ main (int argc, char **argv)
   meta_prefs_init ();
   meta_prefs_add_listener (prefs_changed_callback, NULL);
 
-  meta_ui_reload_theme ();
-
   /* Connect to SM as late as possible - but before managing display,
    * or we might try to manage a window before we have the session
    * info
diff --git a/src/ui/ui.c b/src/ui/ui.c
index 9951536..71ee060 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -289,8 +289,10 @@ meta_ui_new (Display *xdisplay)
 
   gdisplay = gdk_x11_lookup_xdisplay (xdisplay);
   g_assert (gdisplay == gdk_display_get_default ());
-
   g_assert (xdisplay == GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+
+  meta_ui_reload_theme ();
+
   ui->frames = meta_frames_new ();
 
   /* GTK+ needs the frame-sync protocol to work in order to properly


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]