calendar-server/meson.build | 1 - data/cinnamon.desktop.in.in | 2 +- data/org.cinnamon.gschema.xml | 2 +- files/usr/bin/cinnamon-settings | 6 ------ .../cinnamon-settings-users.py | 6 ++++-- .../share/cinnamon/cinnamon-settings/bin/capi.py | 1 + .../cinnamon-settings/cinnamon-settings.py | 22 ++++++++-------------- man/cinnamon-settings.1 | 2 +- src/main.c | 1 + src/meson.build | 1 - 10 files changed, 17 insertions(+), 27 deletions(-) diff --git a/calendar-server/meson.build b/calendar-server/meson.build index 15f61c5..f3457d7 100644 --- a/calendar-server/meson.build +++ b/calendar-server/meson.build @@ -17,4 +17,3 @@ install_data( install_dir: libexecdir, install_mode: 'rwxr-xr-x' ) - diff --git a/data/cinnamon.desktop.in.in b/data/cinnamon.desktop.in.in index 89e0c41..be3f50d 100644 --- a/data/cinnamon.desktop.in.in +++ b/data/cinnamon.desktop.in.in @@ -2,7 +2,7 @@ Type=Application _Name=Cinnamon _Comment=Window management and application launching -Exec=@bindir@/cinnamon-launcher +Exec=@bindir@/cinnamon X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=cinnamon X-GNOME-Bugzilla-Component=general diff --git a/data/org.cinnamon.gschema.xml b/data/org.cinnamon.gschema.xml index edd5104..b97dcf6 100644 --- a/data/org.cinnamon.gschema.xml +++ b/data/org.cinnamon.gschema.xml @@ -30,7 +30,7 @@ - ['panel1:left:0:menu@cinnamon.org', 'panel1:left:1:separator@cinnamon.org', 'panel1:left:2:grouped-window-list@cinnamon.org', 'panel1:right:0:systray@cinnamon.org', 'panel1:right:1:xapp-status@cinnamon.org', 'panel1:right:2:notifications@cinnamon.org', 'panel1:right:3:printers@cinnamon.org', 'panel1:right:4:removable-drives@cinnamon.org', 'panel1:right:5:keyboard@cinnamon.org', 'panel1:right:6:favorites@cinnamon.org', 'panel1:right:7:network@cinnamon.org', 'panel1:right:8:sound@cinnamon.org', 'panel1:right:9:power@cinnamon.org', 'panel1:right:10:calendar@cinnamon.org', 'panel1:right:11:cornerbar@cinnamon.org'] + ['panel1:left:0:menu@cinnamon.org', 'panel1:left:1:separator@cinnamon.org', 'panel1:left:2:grouped-window-list@cinnamon.org', 'panel1:right:0:systray@cinnamon.org', 'panel1:right:1:xapp-status@cinnamon.org', 'panel1:right:2:notifications@cinnamon.org', 'panel1:right:3:removable-drives@cinnamon.org', 'panel1:right:4:keyboard@cinnamon.org', 'panel1:right:5:favorites@cinnamon.org', 'panel1:right:6:network@cinnamon.org', 'panel1:right:7:sound@cinnamon.org', 'panel1:right:8:power@cinnamon.org', 'panel1:right:9:calendar@cinnamon.org', 'panel1:right:10:cornerbar@cinnamon.org'] Uuids of applets to enable Cinnamon applets have a uuid property; this key lists applets diff --git a/files/usr/bin/cinnamon-settings b/files/usr/bin/cinnamon-settings index fb941c7..62fe589 100755 --- a/files/usr/bin/cinnamon-settings +++ b/files/usr/bin/cinnamon-settings @@ -121,13 +121,7 @@ if len(sys.argv) > 1: os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) elif os.path.exists("/usr/share/cinnamon/cinnamon-settings/modules/cs_%s.py" % module): os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) - elif shutil.which("cinnamon-control-center"): - os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) - elif shutil.which("gnome-control-center"): - print ("Unknown module %s, calling gnome-control-center" % module) - os.execvp("gnome-control-center", (" ",) + tuple(sys.argv[1:])) else: - print ("Unknown module %s" % module) os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) else: os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) diff --git a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py index fde9822..568488b 100755 --- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py +++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py @@ -19,6 +19,8 @@ from gi.repository import Gtk, GObject, Gio, GdkPixbuf, AccountsService, GLib gettext.install("cinnamon", "/usr/share/locale") +PATH = os.getenv('PATH') +os.putenv('PATH', PATH + ":/sbin:/usr/sbin") class PrivHelper(object): """A helper for performing temporary privilege drops. Necessary for security when accessing user controlled files as root.""" @@ -899,9 +901,9 @@ class Module: pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48) description = "%s\n%s" % (fullname, username) piter = self.users.append(None, [new_user, pixbuf, description]) - # Add the user to his/her own group and sudo if Administrator was selected + # Add the user to his/her own group and wheel if Administrator was selected if dialog.account_type_combo.get_active() == 1: - subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username]) + subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username]) else: subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username]) self.load_groups() diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/capi.py b/files/usr/share/cinnamon/cinnamon-settings/bin/capi.py index 05d88de..1a1c5b1 100644 --- a/files/usr/share/cinnamon/cinnamon-settings/bin/capi.py +++ b/files/usr/share/cinnamon/cinnamon-settings/bin/capi.py @@ -25,6 +25,7 @@ from gi.repository import Gio, GObject class CManager: def __init__(self): self.extension_point = Gio.io_extension_point_register ("cinnamon-control-center-1") + self.modules = [] architecture = platform.machine() diff --git a/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py b/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py index 29bbdbb..e89c28b 100755 --- a/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py +++ b/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py @@ -74,16 +74,10 @@ STANDALONE_MODULES = [ [_("Firewall"), "gufw", "cs-firewall", "admin", _("firewall, block, filter, programs")], [_("Firewall"), "firewall-config", "cs-firewall", "admin", _("firewall, block, filter, programs")], [_("Languages"), "mintlocale", "cs-language", "prefs", _("language, install, foreign")], - [_("Input Method"), "mintlocale-im", "cs-input-method", "prefs", _("language, install, foreign, input, method, chinese, korean, japanese, typing")], - [_("Login Window"), "pkexec lightdm-settings", "cs-login", "admin", _("login, lightdm, mdm, gdm, manager, user, password, startup, switch")], + [_("Login Window"), "lightdm-settings", "cs-login", "admin", _("login, lightdm, mdm, gdm, manager, user, password, startup, switch")], [_("Login Window"), "lightdm-gtk-greeter-settings-pkexec", "cs-login", "admin", _("login, lightdm, manager, settings, editor")], - [_("Driver Manager"), "cinnamon-driver-manager", "cs-drivers", "admin", _("video, driver, wifi, card, hardware, proprietary, nvidia, radeon, nouveau, fglrx")], [_("Nvidia Settings"), "nvidia-settings", "cs-drivers", "admin", _("video, driver, proprietary, nvidia, settings")], - [_("Software Sources"), "pkexec mintsources", "cs-sources", "admin", _("ppa, repository, package, source, download")], - [_("Package Management"), "dnfdragora", "cs-sources", "admin", _("update, install, repository, package, source, download")], - [_("Package Management"), "yumex-dnf", "cs-sources", "admin", _("update, install, repository, package, source, download")], [_("Users and Groups"), "cinnamon-settings-users", "cs-user-accounts", "admin", _("user, users, account, accounts, group, groups, password")], - [_("Bluetooth"), "blueberry", "cs-bluetooth", "hardware", _("bluetooth, dongle, transfer, mobile")], [_("Bluetooth"), "blueman-manager", "cs-bluetooth", "hardware", _("bluetooth, dongle, transfer, mobile")], [_("Manage Services and Units"), "systemd-manager-pkexec", "cs-sources", "admin", _("systemd, units, services, systemctl, init")], [_("Disks"), "gnome-disks", "org.gnome.DiskUtility", "hardware", _("disks, manage, hardware, management, hard, hdd, pendrive, format, erase, test, create, iso, ISO, disk, image")] @@ -113,13 +107,13 @@ ARG_REWRITE = { 'universal-access': 'accessibility', 'screen': 'display', 'screens': 'display', - 'bluetooth': 'blueberry', + 'bluetooth': 'blueman-manager', 'hotcorners': 'hotcorner', 'accounts': 'online-accounts', 'colors': 'color', 'me': 'user', - 'lightdm-settings': 'pkexec lightdm-settings', - 'login-screen': 'pkexec lightdm-settings', + 'lightdm-settings': 'lightdm-settings', + 'login-screen': 'lightdm-settings', 'window': 'windows', 'background': 'backgrounds', 'driver-manager': 'cinnamon-driver-manager', @@ -172,7 +166,7 @@ class MainWindow(Gio.Application): def go_to_sidepage(self, sidePage: SettingsWidgets.SidePage, user_action=True): sidePage.build() - + if sidePage.is_standalone: return # we're done @@ -313,12 +307,12 @@ class MainWindow(Gio.Application): if len(sys.argv) > 1: if self.load_sidepage_as_standalone(): return - + self.init_settings_overview() def init_settings_overview(self): """Load the system settings overview (default) - + This requires to initialize all settings modules. """ # 1. load all python modules @@ -487,7 +481,7 @@ class MainWindow(Gio.Application): return False to_import = [os.path.splitext(os.path.basename(x))[0] for x in mod_files] - + if only_module is not None: to_import = filter(lambda mod: only_module.replace("-", "_") in mod, to_import) diff --git a/man/cinnamon-settings.1 b/man/cinnamon-settings.1 index c229c60..2718767 100644 --- a/man/cinnamon-settings.1 +++ b/man/cinnamon-settings.1 @@ -32,7 +32,7 @@ The modules with \fB**\fP need root rights to open their configuration interface \fBNAME SYNONYMS\fP applets\fB*\fP backgrounds\fB*\fP background - blueberry bluetooth + blueman bluetooth calendar cinnamon-settings-users** users color colors diff --git a/src/main.c b/src/main.c index 5daf83a..abb2ac6 100644 --- a/src/main.c +++ b/src/main.c @@ -395,6 +395,7 @@ main (int argc, char **argv) muted_log_handler, NULL); g_log_set_handler ("XApp", G_LOG_LEVEL_DEBUG, muted_log_handler, NULL); + /* Initialize the global object */ _cinnamon_global_init ("session-running", session_running, NULL); diff --git a/src/meson.build b/src/meson.build index dbfb512..43e8735 100644 --- a/src/meson.build +++ b/src/meson.build @@ -212,4 +212,3 @@ cinnamon_gir = gnome.generate_gir( '--warn-all', ], ) -