|
 |
f47161 |
From 3e893278df0743bb1682f7bca88d16c90b8c0341 Mon Sep 17 00:00:00 2001
|
|
|
b31790 |
From: Ray Strode <rstrode@redhat.com>
|
|
|
b31790 |
Date: Fri, 8 May 2015 16:27:15 -0400
|
|
|
b31790 |
Subject: [PATCH 03/19] Revert "Rename the desktop file to
|
|
|
b31790 |
gnome-session-properties.desktop"
|
|
|
b31790 |
|
|
|
b31790 |
This reverts commit ac9fd0dc97a17674cb082f80df0b1fcc45bc92bf.
|
|
|
b31790 |
---
|
|
|
f47161 |
data/meson.build | 2 +-
|
|
|
f47161 |
...properties.desktop.in.in => session-properties.desktop.in} | 4 ++--
|
|
|
f47161 |
po/POTFILES.in | 2 +-
|
|
|
f47161 |
po/POTFILES.skip | 1 +
|
|
|
f47161 |
4 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
f47161 |
rename data/{gnome-session-properties.desktop.in.in => session-properties.desktop.in} (81%)
|
|
|
b31790 |
|
|
|
f47161 |
diff --git a/data/meson.build b/data/meson.build
|
|
|
f47161 |
index c5b2b0f7..3077b19e 100644
|
|
|
f47161 |
--- a/data/meson.build
|
|
|
f47161 |
+++ b/data/meson.build
|
|
|
f47161 |
@@ -73,42 +73,42 @@ configure_file(
|
|
|
f47161 |
|
|
|
f47161 |
install_data(
|
|
|
f47161 |
'gnome-session.convert',
|
|
|
f47161 |
install_dir: join_paths(session_datadir, 'GConf', 'gsettings')
|
|
|
f47161 |
)
|
|
|
f47161 |
|
|
|
f47161 |
data = files('hardware-compatibility')
|
|
|
f47161 |
data += files('session-properties.ui')
|
|
|
f47161 |
|
|
|
f47161 |
if enable_session_selector
|
|
|
f47161 |
data += files('session-selector.ui')
|
|
|
f47161 |
|
|
|
f47161 |
desktop = 'gnome-custom-session.desktop'
|
|
|
f47161 |
|
|
|
f47161 |
i18n.merge_file(
|
|
|
f47161 |
desktop,
|
|
|
f47161 |
type: 'desktop',
|
|
|
f47161 |
input: desktop + '.in',
|
|
|
f47161 |
output: desktop,
|
|
|
f47161 |
po_dir: po_dir,
|
|
|
f47161 |
install: true,
|
|
|
f47161 |
install_dir: join_paths(session_datadir, 'xsessions')
|
|
|
f47161 |
)
|
|
|
b31790 |
endif
|
|
|
b31790 |
|
|
|
f47161 |
install_data(
|
|
|
f47161 |
data,
|
|
|
f47161 |
install_dir: session_pkgdatadir
|
|
|
f47161 |
)
|
|
|
f47161 |
|
|
|
f47161 |
-desktop = 'gnome-session-properties.desktop'
|
|
|
f47161 |
+desktop = 'session-properties.desktop'
|
|
|
f47161 |
|
|
|
f47161 |
i18n.merge_file(
|
|
|
f47161 |
desktop,
|
|
|
f47161 |
type: 'desktop',
|
|
|
f47161 |
input: desktop + '.in',
|
|
|
f47161 |
output: desktop,
|
|
|
f47161 |
po_dir: po_dir,
|
|
|
f47161 |
install: true,
|
|
|
f47161 |
install_dir: join_paths(session_datadir, 'applications')
|
|
|
f47161 |
)
|
|
|
f47161 |
|
|
|
f47161 |
diff --git a/data/gnome-session-properties.desktop.in.in b/data/session-properties.desktop.in
|
|
|
f47161 |
similarity index 81%
|
|
|
b31790 |
rename from data/gnome-session-properties.desktop.in.in
|
|
|
f47161 |
rename to data/session-properties.desktop.in
|
|
|
f47161 |
index 3dc7b033..dcd39ca5 100644
|
|
|
f47161 |
--- a/data/gnome-session-properties.desktop.in.in
|
|
|
f47161 |
+++ b/data/session-properties.desktop.in
|
|
|
f47161 |
@@ -1,15 +1,15 @@
|
|
|
f47161 |
[Desktop Entry]
|
|
|
f47161 |
-_Name=Startup Applications
|
|
|
f47161 |
-_Comment=Choose what applications to start when you log in
|
|
|
f47161 |
+Name=Startup Applications
|
|
|
f47161 |
+Comment=Choose what applications to start when you log in
|
|
|
f47161 |
Exec=gnome-session-properties
|
|
|
f47161 |
Icon=session-properties
|
|
|
f47161 |
Terminal=false
|
|
|
f47161 |
Type=Application
|
|
|
f47161 |
StartupNotify=true
|
|
|
f47161 |
Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;
|
|
|
f47161 |
OnlyShowIn=GNOME;Unity;
|
|
|
f47161 |
NoDisplay=true
|
|
|
f47161 |
X-GNOME-Bugzilla-Bugzilla=GNOME
|
|
|
f47161 |
X-GNOME-Bugzilla-Product=gnome-session
|
|
|
f47161 |
X-GNOME-Bugzilla-Component=gnome-session-properties
|
|
|
f47161 |
X-GNOME-Bugzilla-Version=@VERSION@
|
|
|
b31790 |
diff --git a/po/POTFILES.in b/po/POTFILES.in
|
|
|
f47161 |
index 87555685..e8f0e6eb 100644
|
|
|
b31790 |
--- a/po/POTFILES.in
|
|
|
b31790 |
+++ b/po/POTFILES.in
|
|
|
f47161 |
@@ -1,24 +1,24 @@
|
|
|
b31790 |
# List of source files containing translatable strings.
|
|
|
b31790 |
# Please keep this file sorted alphabetically.
|
|
|
b31790 |
capplet/gsm-app-dialog.c
|
|
|
b31790 |
capplet/gsm-properties-dialog.c
|
|
|
b31790 |
capplet/gsp-app.c
|
|
|
b31790 |
capplet/main.c
|
|
|
b31790 |
data/gnome-custom-session.desktop.in
|
|
|
b31790 |
data/gnome.desktop.in
|
|
|
b31790 |
data/gnome-xorg.desktop.in
|
|
|
b31790 |
data/gnome-dummy.session.desktop.in.in
|
|
|
b31790 |
data/gnome.session.desktop.in.in
|
|
|
f47161 |
-data/gnome-session-properties.desktop.in.in
|
|
|
f47161 |
+data/session-properties.desktop.in
|
|
|
f47161 |
data/session-selector.ui
|
|
|
f47161 |
data/session-properties.ui
|
|
|
b31790 |
gnome-session/gsm-fail-whale-dialog.c
|
|
|
b31790 |
gnome-session/gsm-manager.c
|
|
|
b31790 |
gnome-session/gsm-process-helper.c
|
|
|
b31790 |
gnome-session/gsm-util.c
|
|
|
b31790 |
gnome-session/gsm-xsmp-client.c
|
|
|
b31790 |
gnome-session/gsm-xsmp-server.c
|
|
|
b31790 |
gnome-session/main.c
|
|
|
b31790 |
tools/gnome-session-inhibit.c
|
|
|
b31790 |
tools/gnome-session-selector.c
|
|
|
b31790 |
tools/gnome-session-quit.c
|