diff options
| author | Jake Dane <3689-jakedane@users.noreply.gitlab.gnome.org> | 2022-09-11 16:09:23 +0000 |
|---|---|---|
| committer | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2022-10-20 13:20:09 +0000 |
| commit | 89443fe55011126774b36ae4d62bee57d153d10e (patch) | |
| tree | 103644c84504f1962d49a4bedb2d3683bc0faed4 /shell | |
| parent | e0f22a04bb778efadb39146ed9a69336f8a15eba (diff) | |
| download | gnome-control-center-89443fe55011126774b36ae4d62bee57d153d10e.tar.gz | |
desktop: Remove obsolete Bugzilla entries
The `X-GNOME-Bugzilla-*` entries were for use by bug-buddy, a GNOME 2
technology that's been gone for over a decade. These entries are
obsolete and can be removed from all desktop files.
The `X-GNOME-Settings-Panel` entry is also obsolete as far as I can
tell and only these panels had it in their desktop file: notifications,
sharing, sound and user-accounts. These entries can also be removed.
After removing the `X-GNOME-Bugzilla-*` entries, the desktop files have
no more variables in them. The meson `configure_file` step is therefor
pointless—there are no variables to configure. As such the
`*.desktop.in.in` files are renamed to `*.desktop.in` to reflect this
and `meson.build` files are modified to remove `configure_file` step.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/cc-shell-model.c | 4 | ||||
| -rw-r--r-- | shell/meson.build | 8 | ||||
| -rw-r--r-- | shell/org.gnome.Settings.desktop.in (renamed from shell/org.gnome.Settings.desktop.in.in) | 4 |
3 files changed, 1 insertions, 15 deletions
diff --git a/shell/cc-shell-model.c b/shell/cc-shell-model.c index 19fc9c6d4..1dbb85055 100644 --- a/shell/cc-shell-model.c +++ b/shell/cc-shell-model.c @@ -26,10 +26,6 @@ #include <gio/gdesktopappinfo.h> -#define GNOME_SETTINGS_PANEL_ID_KEY "X-GNOME-Settings-Panel" -#define GNOME_SETTINGS_PANEL_CATEGORY GNOME_SETTINGS_PANEL_ID_KEY -#define GNOME_SETTINGS_PANEL_ID_KEYWORDS "Keywords" - struct _CcShellModel { GtkListStore parent; diff --git a/shell/meson.build b/shell/meson.build index 9553c35ce..3d894a7ac 100644 --- a/shell/meson.build +++ b/shell/meson.build @@ -16,15 +16,9 @@ configure_file( desktop = 'org.gnome.Settings.desktop' -desktop_in = configure_file( - input : desktop + '.in.in', - output : desktop + '.in', - configuration : desktop_conf -) - i18n.merge_file( type : 'desktop', - input : desktop_in, + input : desktop + '.in', output : desktop, po_dir : po_dir, install : true, diff --git a/shell/org.gnome.Settings.desktop.in.in b/shell/org.gnome.Settings.desktop.in index 1cb049c8c..fb2530116 100644 --- a/shell/org.gnome.Settings.desktop.in.in +++ b/shell/org.gnome.Settings.desktop.in @@ -8,10 +8,6 @@ Type=Application StartupNotify=true Categories=GNOME;GTK;Settings; OnlyShowIn=GNOME;Unity; -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=gnome-control-center -X-GNOME-Bugzilla-Component=shell -X-GNOME-Bugzilla-Version=@VERSION@ # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Keywords=Preferences;Settings; # Translators: Do NOT translate or transliterate this text (these are enum types)! |