summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrobert.ancell@canonical.com <>2011-02-12 11:52:28 +1100
committerrobert.ancell@canonical.com <>2011-02-12 11:52:28 +1100
commitf5b1e32133cbbca5f70c538d1f166adcee44a3f3 (patch)
tree322bbdbe18b195ff68f4fbb7438f49a786b578de
parent09c3bb828a3e128d77fede8ad1f2662dd69a4f69 (diff)
downloadlightdm-f5b1e32133cbbca5f70c538d1f166adcee44a3f3.tar.gz
Rename ldm-gtk-greeter to lightdm-gtk-greeter
-rw-r--r--.bzrignore5
-rw-r--r--greeters/Makefile.am12
-rw-r--r--greeters/lightdm-gtk-greeter.c (renamed from greeters/ldm-gtk-greeter.c)0
-rw-r--r--po/POTFILES.in2
4 files changed, 9 insertions, 10 deletions
diff --git a/.bzrignore b/.bzrignore
index 483ec373..9adc3701 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -30,7 +30,7 @@ doc/*.stamp
doc/tmpl/*-unused.sgml
doc/*.txt
doc/xml
-greeters/ldm-gtk-greeter
+greeters/lightdm-gtk-greeter
liblightdm-gobject/*.gir
liblightdm-gobject/*.typelib
liblightdm-gobject/*.vapi
@@ -44,12 +44,11 @@ po/POTFILES
po/stamp-it
src/display-glue.h
src/display-manager-glue.h
-src/ldmwkgreeter
-src/lightdm
src/session-manager-glue.h
src/user-manager-glue.h
src/ldm-marshal.c
src/ldm-marshal.h
+src/lightdm
data/org.lightdm.LightDisplayManager.conf
config.h
config.h.in
diff --git a/greeters/Makefile.am b/greeters/Makefile.am
index ce021d83..39fd0b6d 100644
--- a/greeters/Makefile.am
+++ b/greeters/Makefile.am
@@ -1,7 +1,7 @@
libexec_PROGRAMS =
if HAVE_GTK_GREETER
-libexec_PROGRAMS += ldm-gtk-greeter
+libexec_PROGRAMS += lightdm-gtk-greeter
endif
LIBLIGHTDM_LIB = $(top_builddir)/liblightdm-gobject/liblightdm-gobject.la
@@ -11,19 +11,19 @@ LIBLIGHTDM_LDADD = \
-L$(top_builddir)/liblightdm-gobject \
-llightdm-gobject-0
-ldm_gtk_greeter_SOURCES = \
- ldm-gtk-greeter.c
+lightdm_gtk_greeter_SOURCES = \
+ lightdm-gtk-greeter.c
-ldm_gtk_greeter_CFLAGS = \
+lightdm_gtk_greeter_CFLAGS = \
$(LIBLIGHTDM_CFLAGS) \
$(LIGHTDM_GTK_GREETER_CFLAGS) \
$(WARN_CFLAGS) \
-DVERSION=\"$(VERSION)\" \
-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-DLOCALE_DIR=\"$(localedir)\" \
- -DLIGHTDM_GTK_GREETER_BINARY=\"ldm-gtk-greeter\"
+ -DLIGHTDM_GTK_GREETER_BINARY=\"lightdm-gtk-greeter\"
-ldm_gtk_greeter_LDADD = \
+lightdm_gtk_greeter_LDADD = \
$(LIBLIGHTDM_LDADD) \
$(LIGHTDM_GTK_GREETER_LIBS)
diff --git a/greeters/ldm-gtk-greeter.c b/greeters/lightdm-gtk-greeter.c
index a5fb147e..a5fb147e 100644
--- a/greeters/ldm-gtk-greeter.c
+++ b/greeters/lightdm-gtk-greeter.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 80b41e08..d5f49db1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
[encoding: UTF-8]
-greeters/ldm-gtk-greeter.c
+greeters/lightdm-gtk-greeter.c
liblightdm-gobject/greeter.c
liblightdm-gobject/language.c
liblightdm-gobject/layout.c