1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
|
From 889bc96e75eb5f2f3d5da9fb110ce092b8e1a395 Mon Sep 17 00:00:00 2001
From: Solomon Choina <shlomochoina@gmail.com>
Date: Wed, 28 Jun 2017 10:32:15 -0400
Subject: [PATCH] updating the patch
---
CMakeLists.txt | 12 ++++++------
.../{pantheon-greeter.conf => lightdm-pantheon-greeter.conf} | 0
...heon-greeter.desktop => lightdm-pantheon-greeter.desktop} | 4 ++--
src/PantheonGreeter.vala | 2 +-
src/Widgets/Wallpaper.vala | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
rename data/{pantheon-greeter.conf => lightdm-pantheon-greeter.conf} (100%)
rename data/{pantheon-greeter.desktop => lightdm-pantheon-greeter.desktop} (64%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd290ff..83f270b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
set (CONF_DIR "/etc/lightdm")
set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
-set (PKGDATADIR "${DATADIR}/pantheon-greeter")
+set (PKGDATADIR "${DATADIR}/lightdm-pantheon-greeter")
set (CMAKE_INSTALL_PREFIX /usr)
set (VERSION "3.1.1")
@@ -93,10 +93,10 @@ include (GSettings)
include (GResource)
glib_compile_resources (GLIB_RESOURCES_CSS SOURCE data/css.gresource.xml)
-add_executable (pantheon-greeter ${VALA_C} ${GLIB_RESOURCES_CSS})
-target_link_libraries(pantheon-greeter m)
+add_executable (lightdm-pantheon-greeter ${VALA_C} ${GLIB_RESOURCES_CSS})
+target_link_libraries(lightdm-pantheon-greeter m)
-install (TARGETS pantheon-greeter RUNTIME DESTINATION sbin)
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-greeter.desktop DESTINATION share/xgreeters)
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-greeter.conf DESTINATION ${CONF_DIR})
+install (TARGETS lightdm-pantheon-greeter RUNTIME DESTINATION bin)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/lightdm-pantheon-greeter.desktop DESTINATION share/xgreeters)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/lightdm-pantheon-greeter.conf DESTINATION ${CONF_DIR})
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/fingerprint.svg DESTINATION ${PKGDATADIR})
diff --git a/data/pantheon-greeter.conf b/data/lightdm-pantheon-greeter.conf
similarity index 100%
rename from data/pantheon-greeter.conf
rename to data/lightdm-pantheon-greeter.conf
diff --git a/data/pantheon-greeter.desktop b/data/lightdm-pantheon-greeter.desktop
similarity index 64%
rename from data/pantheon-greeter.desktop
rename to data/lightdm-pantheon-greeter.desktop
index 225cd40..3e40fc7 100644
--- a/data/pantheon-greeter.desktop
+++ b/data/lightdm-pantheon-greeter.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Pantheon Greeter
Comment=Pantheon Greeter
-Exec=pantheon-greeter
+Exec=lightdm-pantheon-greeter
Type=Application
X-Ubuntu-Gettext-Domain=pantheon-greeter
-Name[en_US]=pantheon-greeter
+Name[en_US]=lightdm-pantheon-greeter
diff --git a/src/PantheonGreeter.vala b/src/PantheonGreeter.vala
index d984635..194a259 100644
--- a/src/PantheonGreeter.vala
+++ b/src/PantheonGreeter.vala
@@ -104,7 +104,7 @@ public class PantheonGreeter : Gtk.Window {
settings = new KeyFile ();
try {
- settings.load_from_file (Path.build_filename (Constants.CONF_DIR, "pantheon-greeter.conf"), KeyFileFlags.KEEP_COMMENTS);
+ settings.load_from_file (Path.build_filename (Constants.CONF_DIR, "lightdm-pantheon-greeter.conf"), KeyFileFlags.KEEP_COMMENTS);
} catch (Error e) {
warning (e.message);
}
diff --git a/src/Widgets/Wallpaper.vala b/src/Widgets/Wallpaper.vala
index 9b6cde1..dcecd1f 100644
--- a/src/Widgets/Wallpaper.vala
+++ b/src/Widgets/Wallpaper.vala
@@ -49,7 +49,7 @@ public class Wallpaper : Gtk.Stack {
var settings = new KeyFile ();
string default_wallpaper = "/usr/share/backgrounds/elementaryos-default";
try {
- settings.load_from_file (Constants.CONF_DIR + "/pantheon-greeter.conf", KeyFileFlags.KEEP_COMMENTS);
+ settings.load_from_file (Constants.CONF_DIR + "/lightdm-pantheon-greeter.conf", KeyFileFlags.KEEP_COMMENTS);
default_wallpaper = settings.get_string ("greeter", "default-wallpaper");
} catch (Error e) {
warning (e.message);
|