diff --git a/lib/CloseButton.vala b/lib/CloseButton.vala index a414b833f..fc69bea68 100644 --- a/lib/CloseButton.vala +++ b/lib/CloseButton.vala @@ -51,7 +51,7 @@ public class Gala.CloseButton : Clutter.Actor { if (close_pixbufs[height] == null) { try { close_pixbufs[height] = new Gdk.Pixbuf.from_resource_at_scale ( - Config.RESOURCEPATH + "/buttons/close.svg", + "/org/pantheon/desktop/gala/buttons/close.svg", -1, height, true diff --git a/lib/Utils.vala b/lib/Utils.vala index 521ea85d6..8d89601df 100644 --- a/lib/Utils.vala +++ b/lib/Utils.vala @@ -357,7 +357,7 @@ namespace Gala { if (resize_pixbufs[height] == null) { try { resize_pixbufs[height] = new Gdk.Pixbuf.from_resource_at_scale ( - Config.RESOURCEPATH + "/buttons/resize.svg", + "/org/pantheon/desktop/gala/buttons/resize.svg", -1, height, true diff --git a/lib/meson.build b/lib/meson.build index 7b8ec254a..5ef16c7f5 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -71,9 +71,5 @@ pkg.generate( name: 'Gala', description: 'Library to develop plugins for Gala', subdirs: 'gala', - requires: [glib_dep, gobject_dep, gio_dep, gio_unix_dep, libmutter_dep], - variables: [ - 'datarootdir=${prefix}/@0@'.format(get_option('datadir')), - 'pkgdatadir=${datarootdir}/gala' - ] + requires: [glib_dep, gobject_dep, gio_dep, gio_unix_dep, libmutter_dep] ) diff --git a/meson.build b/meson.build index 96ae7a72c..f1b4dbb09 100644 --- a/meson.build +++ b/meson.build @@ -5,8 +5,6 @@ project('gala', license: 'GPL3', ) -is_release = false - gnome = import('gnome') i18n = import('i18n') pkg = import('pkgconfig') @@ -18,16 +16,11 @@ vapi_dir = meson.current_source_dir() / 'vapi' locale_dir = join_paths(get_option('prefix'), get_option('localedir')) data_dir = join_paths(get_option('prefix'), get_option('datadir')) plugins_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins') -pkgdata_dir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) -pkglib_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name()) conf = configuration_data() conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) conf.set_quoted('LOCALEDIR', locale_dir) -conf.set_quoted('DATADIR', data_dir) -conf.set_quoted('PKGDATADIR', pkgdata_dir) conf.set_quoted('PLUGINDIR', plugins_dir) -conf.set_quoted('RESOURCEPATH', '/org/pantheon/desktop/gala') conf.set_quoted('VERSION', meson.project_version()) config_h = configure_file( output: 'config.h', @@ -41,9 +34,6 @@ config_dep = declare_dependency( config_inc_dir = include_directories('.') -customconf = configuration_data() -customconf.set('GETTEXT_PACKAGE', meson.project_name()) - add_project_arguments([ '--target-glib=2.44', '--hide-internal', diff --git a/vapi/config.vapi b/vapi/config.vapi index c2639b4ba..b81dfbf7b 100644 --- a/vapi/config.vapi +++ b/vapi/config.vapi @@ -1,28 +1,14 @@ -// -// Copyright (C) 2011 Robert Dyer, Rico Tzschichholz -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// +/* + * SPDX-License-Identifier: GPL-3.0-or-later + * SPDX-FileCopyrightText: 2025 elementary, Inc. (https://elementary.io) + * 2011 Robert Dyer + * 2011 Rico Tzschichholz + */ [CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")] -namespace Config -{ +namespace Config { public const string GETTEXT_PACKAGE; public const string LOCALEDIR; - public const string DATADIR; - public const string PKGDATADIR; public const string VERSION; public const string PLUGINDIR; - public const string RESOURCEPATH; }