gdm r6009 - in branches/gnome-2-20: . daemon po
- From: bcameron svn gnome org
- To: svn-commits-list gnome org
- Subject: gdm r6009 - in branches/gnome-2-20: . daemon po
- Date: Tue, 11 Mar 2008 20:15:34 +0000 (GMT)
Author: bcameron
Date: Tue Mar 11 20:15:33 2008
New Revision: 6009
URL: http://svn.gnome.org/viewvc/gdm?rev=6009&view=rev
Log:
2008-03-11 Brian Cameron <brian cameron sun com>
* daemon/gdm.h, daemon/gdm-daemon-config-keys.h, po/POTFILES.in:
Move the default Welcome/RemoteWelcome strings from gdm.h to
gdm-daemon-config-keys.h. I noticed that we were defining the
#defines in two places. So now we just define them once.
Modified:
branches/gnome-2-20/ChangeLog
branches/gnome-2-20/daemon/gdm-daemon-config-keys.h
branches/gnome-2-20/daemon/gdm.h
branches/gnome-2-20/po/POTFILES.in
Modified: branches/gnome-2-20/daemon/gdm-daemon-config-keys.h
==============================================================================
--- branches/gnome-2-20/daemon/gdm-daemon-config-keys.h (original)
+++ branches/gnome-2-20/daemon/gdm-daemon-config-keys.h Tue Mar 11 20:15:33 2008
@@ -27,6 +27,23 @@
G_BEGIN_DECLS
+/*
+ * For backwards compatibility, do not set values for DEFAULT_WELCOME or
+ * DEFAULT_REMOTEWELCOME. This will cause these values to always be
+ * read from the config file, and will cause them to return FALSE if
+ * no value is set in the config file. We want the value "FALSE" if
+ * the values don't exist in the config file. The daemon will compare
+ * the Welcome/RemoveWelcome value with the default string and
+ * automatically translate the text if the string is the same as the
+ * default string. We set the default values of GDM_KEY_WELCOME and
+ * GDM_KEY_REMOTEWELCOME so that the default value is returned when
+ * you run GET_CONFIG on these keys.
+ */
+#define GDM_DEFAULT_WELCOME_MSG "Welcome"
+#define GDM_DEFAULT_REMOTE_WELCOME_MSG "Welcome to %n"
+#define GDM_DEFAULT_WELCOME_TRANSLATED_MSG N_("Welcome")
+#define GDM_DEFAULT_REMOTE_WELCOME_TRANSLATED_MSG N_("Welcome to %n")
+
/* BEGIN LEGACY KEYS */
#define GDM_KEY_CHOOSER "daemon/Chooser=" LIBEXECDIR "/gdmchooser"
#define GDM_KEY_AUTOMATIC_LOGIN_ENABLE "daemon/AutomaticLoginEnable=false"
@@ -146,8 +163,6 @@
#define GDM_KEY_CONFIG_AVAILABLE "greeter/ConfigAvailable=true"
#define GDM_KEY_CHOOSER_BUTTON "greeter/ChooserButton=true"
#define GDM_KEY_TITLE_BAR "greeter/TitleBar=true"
-#define GDM_DEFAULT_WELCOME_MSG "Welcome"
-#define GDM_DEFAULT_REMOTE_WELCOME_MSG "Welcome to %n"
#define GDM_KEY_DEFAULT_WELCOME "greeter/DefaultWelcome="
#define GDM_KEY_DEFAULT_REMOTE_WELCOME "greeter/DefaultRemoteWelcome="
#define GDM_KEY_WELCOME "greeter/Welcome=" GDM_DEFAULT_WELCOME_MSG
Modified: branches/gnome-2-20/daemon/gdm.h
==============================================================================
--- branches/gnome-2-20/daemon/gdm.h (original)
+++ branches/gnome-2-20/daemon/gdm.h Tue Mar 11 20:15:33 2008
@@ -53,23 +53,6 @@
/* The dreaded miscellaneous category */
#define PIPE_SIZE 4096
-/*
- * For backwards compatibility, do not set values for DEFAULT_WELCOME or
- * DEFAULT_REMOTEWELCOME. This will cause these values to always be
- * read from the config file, and will cause them to return FALSE if
- * no value is set in the config file. We want the value "FALSE" if
- * the values don't exist in the config file. The daemon will compare
- * the Welcome/RemoveWelcome value with the default string and
- * automatically translate the text if the string is the same as the
- * default string. We set the default values of GDM_KEY_WELCOME and
- * GDM_KEY_REMOTEWELCOME so that the default value is returned when
- * you run GET_CONFIG on these keys.
- */
-#define GDM_DEFAULT_WELCOME_MSG "Welcome"
-#define GDM_DEFAULT_REMOTE_WELCOME_MSG "Welcome to %n"
-#define GDM_DEFAULT_WELCOME_TRANSLATED_MSG N_("Welcome")
-#define GDM_DEFAULT_REMOTE_WELCOME_TRANSLATED_MSG N_("Welcome to %n")
-
#define GDM_SESSION_FAILSAFE_GNOME "GDM_Failsafe.GNOME"
#define GDM_SESSION_FAILSAFE_XTERM "GDM_Failsafe.XTERM"
Modified: branches/gnome-2-20/po/POTFILES.in
==============================================================================
--- branches/gnome-2-20/po/POTFILES.in (original)
+++ branches/gnome-2-20/po/POTFILES.in Tue Mar 11 20:15:33 2008
@@ -10,11 +10,11 @@
daemon/display.c
daemon/errorgui.c
daemon/filecheck.c
+daemon/gdm-daemon-config-keys.h
daemon/gdm-daemon-config.c
daemon/gdm-net.c
daemon/gdm-xdmcp-manager.c
daemon/gdm.c
-daemon/gdm.h
daemon/misc.c
daemon/server.c
daemon/slave.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]