|
 |
bc3989 |
From bf91d6c08f471ab729507d1ebd4c46b336ca2cef Mon Sep 17 00:00:00 2001
|
|
|
689e29 |
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
|
|
689e29 |
Date: Fri, 23 Feb 2018 16:56:46 +0100
|
|
|
689e29 |
Subject: [PATCH] Include top-icons in classic session
|
|
|
689e29 |
|
|
|
689e29 |
---
|
|
|
bc3989 |
meson.build | 2 +-
|
|
|
bc3989 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
689e29 |
|
|
|
bc3989 |
diff --git a/meson.build b/meson.build
|
|
|
bc3989 |
index cde2d34..7a4c0d6 100644
|
|
|
bc3989 |
--- a/meson.build
|
|
|
bc3989 |
+++ b/meson.build
|
|
|
bc3989 |
@@ -11,81 +11,81 @@ i18n = import('i18n')
|
|
|
bc3989 |
|
|
|
bc3989 |
datadir = get_option('datadir')
|
|
|
bc3989 |
|
|
|
bc3989 |
shelldir = join_paths(datadir, 'gnome-shell')
|
|
|
bc3989 |
extensiondir = join_paths(shelldir, 'extensions')
|
|
|
bc3989 |
modedir = join_paths(shelldir, 'modes')
|
|
|
bc3989 |
themedir = join_paths(shelldir, 'theme')
|
|
|
bc3989 |
|
|
|
bc3989 |
schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
|
|
|
bc3989 |
sessiondir = join_paths(datadir, 'gnome-session', 'sessions')
|
|
|
bc3989 |
xsessiondir = join_paths(datadir, 'xsessions')
|
|
|
bc3989 |
|
|
|
bc3989 |
extensionlib = files('lib/convenience.js')
|
|
|
bc3989 |
|
|
|
bc3989 |
js52 = find_program('js52', required: false)
|
|
|
bc3989 |
|
|
|
bc3989 |
ver_arr = meson.project_version().split('.')
|
|
|
bc3989 |
if ver_arr[1].to_int().is_even()
|
|
|
bc3989 |
shell_version = '@0@.@1@'.format(ver_arr[0], ver_arr[1])
|
|
|
bc3989 |
else
|
|
|
bc3989 |
shell_version = '.'.join(ver_arr)
|
|
|
bc3989 |
endif
|
|
|
bc3989 |
|
|
|
bc3989 |
uuid_suffix = '@gnome-shell-extensions.gcampax.github.com'
|
|
|
bc3989 |
|
|
|
bc3989 |
classic_extensions = [
|
|
|
bc3989 |
'alternate-tab',
|
|
|
bc3989 |
'apps-menu',
|
|
|
bc3989 |
'places-menu',
|
|
|
bc3989 |
'launch-new-instance',
|
|
|
bc3989 |
+ 'top-icons',
|
|
|
bc3989 |
'window-list'
|
|
|
bc3989 |
]
|
|
|
bc3989 |
|
|
|
bc3989 |
default_extensions = classic_extensions
|
|
|
bc3989 |
default_extensions += [
|
|
|
bc3989 |
'drive-menu',
|
|
|
bc3989 |
'screenshot-window-sizer',
|
|
|
bc3989 |
'windowsNavigator',
|
|
|
bc3989 |
'workspace-indicator'
|
|
|
bc3989 |
]
|
|
|
bc3989 |
|
|
|
bc3989 |
all_extensions = default_extensions
|
|
|
bc3989 |
all_extensions += [
|
|
|
bc3989 |
'auto-move-windows',
|
|
|
bc3989 |
'dash-to-dock',
|
|
|
bc3989 |
'example',
|
|
|
bc3989 |
'native-window-placement',
|
|
|
bc3989 |
'no-hot-corner',
|
|
|
bc3989 |
'panel-favorites',
|
|
|
bc3989 |
'systemMonitor',
|
|
|
bc3989 |
- 'top-icons',
|
|
|
bc3989 |
'updates-dialog',
|
|
|
bc3989 |
'user-theme'
|
|
|
bc3989 |
]
|
|
|
bc3989 |
|
|
|
bc3989 |
enabled_extensions = get_option('enable_extensions')
|
|
|
bc3989 |
|
|
|
bc3989 |
if enabled_extensions.length() == 0
|
|
|
bc3989 |
set = get_option('extension_set')
|
|
|
bc3989 |
|
|
|
bc3989 |
if set == 'classic'
|
|
|
bc3989 |
enabled_extensions += classic_extensions
|
|
|
bc3989 |
elif set == 'default'
|
|
|
bc3989 |
enabled_extensions += default_extensions
|
|
|
bc3989 |
elif set == 'all'
|
|
|
bc3989 |
enabled_extensions += all_extensions
|
|
|
bc3989 |
endif
|
|
|
bc3989 |
endif
|
|
|
bc3989 |
|
|
|
bc3989 |
classic_mode_enabled = get_option('classic_mode')
|
|
|
bc3989 |
|
|
|
bc3989 |
if classic_mode_enabled
|
|
|
bc3989 |
# Sanity check: Make sure all classic extensions are enabled
|
|
|
bc3989 |
foreach e : classic_extensions
|
|
|
bc3989 |
if not enabled_extensions.contains(e)
|
|
|
bc3989 |
error('Classic mode is enabled, ' +
|
|
|
bc3989 |
'but the required extension @0@ is not.'.format(e))
|
|
|
bc3989 |
endif
|
|
|
bc3989 |
endforeach
|
|
|
bc3989 |
endif
|
|
|
bc3989 |
|
|
|
689e29 |
--
|
|
|
bc3989 |
2.17.1
|
|
|
689e29 |
|