[mutter/wip/carlosg/frames-client: 8/13] ui: Excise old frames UI




commit 2cd8455f64b2ec8defa865cede661768d56e781f
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Sep 9 16:10:15 2022 +0200

    ui: Excise old frames UI
    
    This is no longer used, in favor of the standalone frames client.

 src/backends/meta-settings.c       |    1 -
 src/core/restart.c                 |    1 -
 src/core/window.c                  |    1 -
 src/meson.build                    |    6 -
 src/tests/test-runner.c            |    8 -
 src/ui/frames.c                    | 1927 ------------------------------------
 src/ui/frames.h                    |  155 ---
 src/ui/theme-private.h             |  281 ------
 src/ui/theme.c                     | 1358 -------------------------
 src/ui/ui.c                        |  240 -----
 src/ui/ui.h                        |   68 --
 src/x11/meta-x11-display-private.h |    3 -
 src/x11/xprops.c                   |    1 -
 13 files changed, 4050 deletions(-)
---
diff --git a/src/backends/meta-settings.c b/src/backends/meta-settings.c
index 2826ff98f9..9ee930b8f7 100644
--- a/src/backends/meta-settings.c
+++ b/src/backends/meta-settings.c
@@ -28,7 +28,6 @@
 #include "backends/meta-backend-private.h"
 #include "backends/meta-logical-monitor.h"
 #include "backends/meta-monitor-manager-private.h"
-#include "ui/theme-private.h"
 
 #ifndef XWAYLAND_GRAB_DEFAULT_ACCESS_RULES
 # warning "XWAYLAND_GRAB_DEFAULT_ACCESS_RULES is not set"
diff --git a/src/core/restart.c b/src/core/restart.c
index 14d0de934e..cd8ba6872a 100644
--- a/src/core/restart.c
+++ b/src/core/restart.c
@@ -42,7 +42,6 @@
 #include "core/display-private.h"
 #include "core/util-private.h"
 #include "meta/main.h"
-#include "ui/ui.h"
 #include "x11/meta-x11-display-private.h"
 
 static gboolean restart_helper_started = FALSE;
diff --git a/src/core/window.c b/src/core/window.c
index e9a0255350..e5a5133a5f 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -84,7 +84,6 @@
 #include "meta/meta-enum-types.h"
 #include "meta/meta-x11-errors.h"
 #include "meta/prefs.h"
-#include "ui/ui.h"
 #include "x11/meta-x11-display-private.h"
 #include "x11/window-props.h"
 #include "x11/window-x11.h"
diff --git a/src/meson.build b/src/meson.build
index 02c4e3a3ca..49867e33a6 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -447,12 +447,6 @@ if have_x11_client
     'compositor/meta-sync-ring.h',
     'compositor/meta-window-actor-x11.c',
     'compositor/meta-window-actor-x11.h',
-    'ui/frames.c',
-    'ui/frames.h',
-    'ui/theme.c',
-    'ui/theme-private.h',
-    'ui/ui.c',
-    'ui/ui.h',
     'x11/atomnames.h',
     'x11/events.c',
     'x11/events.h',
diff --git a/src/tests/test-runner.c b/src/tests/test-runner.c
index 9a9fb96310..22c71237b5 100644
--- a/src/tests/test-runner.c
+++ b/src/tests/test-runner.c
@@ -31,7 +31,6 @@
 #include "meta/window.h"
 #include "meta/meta-workspace-manager.h"
 #include "tests/meta-test-utils.h"
-#include "ui/ui.h"
 #include "wayland/meta-wayland.h"
 #include "x11/meta-x11-display-private.h"
 
@@ -242,13 +241,6 @@ test_case_assert_stacking (TestCase *test,
       MetaWindow *window = meta_display_lookup_stack_id (display, windows[i]);
       if (window != NULL && window->title)
         {
-          /* See comment in meta_ui_new() about why the dummy window for GTK+ theming
-           * is managed as a MetaWindow.
-           */
-          if (META_STACK_ID_IS_X11 (windows[i]) &&
-              meta_ui_window_is_dummy (display->x11_display->ui, windows[i]))
-            continue;
-
           if (stack_string->len > 0)
             g_string_append_c (stack_string, ' ');
 
diff --git a/src/x11/meta-x11-display-private.h b/src/x11/meta-x11-display-private.h
index 1d5822b7e8..7e1137e41a 100644
--- a/src/x11/meta-x11-display-private.h
+++ b/src/x11/meta-x11-display-private.h
@@ -36,7 +36,6 @@
 #include "meta/meta-x11-display.h"
 #include "meta-startup-notification-x11.h"
 #include "meta-x11-stack-private.h"
-#include "ui/ui.h"
 #include "x11/meta-sync-counter.h"
 
 typedef struct _MetaGroupPropHooks  MetaGroupPropHooks;
@@ -125,8 +124,6 @@ struct _MetaX11Display
   MetaAlarmFilter alarm_filter;
   gpointer alarm_filter_data;
 
-  MetaUI *ui;
-
   struct {
     Window xwindow;
     guint timeout_id;
diff --git a/src/x11/xprops.c b/src/x11/xprops.c
index 1b97b26481..49a65b6741 100644
--- a/src/x11/xprops.c
+++ b/src/x11/xprops.c
@@ -90,7 +90,6 @@ from The Open Group.
 #include "core/util-private.h"
 #include "core/window-private.h"
 #include "meta/meta-x11-errors.h"
-#include "ui/ui.h"
 #include "x11/meta-x11-display-private.h"
 #include "x11/mutter-Xatomtype.h"
 


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