Skip to content

Commit

Permalink
Remove support for metacity
Browse files Browse the repository at this point in the history
Resolves: rhbz#1961104
  • Loading branch information
rvykydal authored and jkonecny12 committed May 24, 2021
1 parent 6035747 commit 9d0503d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 18 deletions.
1 change: 0 additions & 1 deletion anaconda.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,6 @@ Requires: system-logos

# Needed to compile the gsettings files
BuildRequires: gsettings-desktop-schemas
BuildRequires: metacity

%description gui
This package contains graphical user interface for the Anaconda installer.
Expand Down
5 changes: 1 addition & 4 deletions data/window-manager/config/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ schemadir = $(pkgdatadir)/window-manager/glib-2.0/schemas
# These files need to be compiled by glib-compile-schemas. This is handled
# in the spec file scriptlets.
dist_schema_DATA = org.gnome.desktop.wm.keybindings.gschema.override \
org.gnome.desktop.wm.preferences.gschema.override \
org.gnome.metacity.gschema.override
org.gnome.desktop.wm.preferences.gschema.override

# GSettings insists on the override files being in the same directory as the
# schemas they modify, so pretend that this is the case with symlinks and
Expand All @@ -30,8 +29,6 @@ install-data-hook:
$(MKDIR_P) $(DESTDIR)$(schemadir)
$(LN_S) -f /usr/share/glib-2.0/schemas/org.gnome.desktop.wm.keybindings.gschema.xml $(DESTDIR)$(schemadir)
$(LN_S) -f /usr/share/glib-2.0/schemas/org.gnome.desktop.wm.preferences.gschema.xml $(DESTDIR)$(schemadir)
$(LN_S) -f /usr/share/glib-2.0/schemas/org.gnome.metacity.gschema.xml $(DESTDIR)$(schemadir)
$(LN_S) -f /usr/share/glib-2.0/schemas/org.gnome.metacity.enums.xml $(DESTDIR)$(schemadir)
$(LN_S) -f /usr/share/glib-2.0/schemas/org.gnome.desktop.enums.xml $(DESTDIR)$(schemadir)
glib-compile-schemas --strict $(DESTDIR)$(schemadir)

Expand Down

This file was deleted.

14 changes: 3 additions & 11 deletions pyanaconda/display.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,17 +192,9 @@ def do_startup_x11_actions():
else:
xdg_data_dirs = datadir + '/window-manager:/usr/share'

vm = "gnome-kiosk"
try:
childproc = util.startProgram(["gnome-kiosk", "--display", ":1", "--sm-disable", "--x11"],
env_add={'XDG_DATA_DIRS': xdg_data_dirs})
except FileNotFoundError as e:
log.warning("gnome-kiosk not found: %s, trying metacity", e)
vm = "metacity"
childproc = util.startProgram(["metacity", "--display", ":1", "--sm-disable"],
env_add={'XDG_DATA_DIRS': xdg_data_dirs})
WatchProcesses.watch_process(childproc, vm)

childproc = util.startProgram(["gnome-kiosk", "--display", ":1", "--sm-disable", "--x11"],
env_add={'XDG_DATA_DIRS': xdg_data_dirs})
WatchProcesses.watch_process(childproc, "gnome-kiosk")

def set_x_resolution(runres):
"""Set X server screen resolution.
Expand Down

0 comments on commit 9d0503d

Please sign in to comment.