This commit is contained in:
parent
968934dd91
commit
d8d1326fe4
@ -1,8 +1,7 @@
|
||||
Only in gdm-2.19.3-post: config.h
|
||||
diff -upr gdm-2.19.3-pre/configure.ac gdm-2.19.3-post/configure.ac
|
||||
--- gdm-2.19.3-pre/configure.ac 2007-06-17 12:08:03.000000000 -0500
|
||||
+++ gdm-2.19.3-post/configure.ac 2007-08-02 21:45:37.000000000 -0500
|
||||
@@ -887,6 +887,10 @@ AC_SUBST(GDMPREFETCH)
|
||||
diff -upr gdm-2.19.5-pre/configure.ac gdm-2.19.5-post/configure.ac
|
||||
--- gdm-2.19.5-pre/configure.ac 2007-07-30 13:51:49.000000000 -0500
|
||||
+++ gdm-2.19.5-post/configure.ac 2007-08-16 15:31:56.000000000 -0500
|
||||
@@ -902,6 +902,10 @@ AC_SUBST(GDMPREFETCH)
|
||||
AC_SUBST(GDMPREFETCHLIST)
|
||||
AC_SUBST(GDMPREFETCHCMD)
|
||||
|
||||
@ -13,10 +12,29 @@ diff -upr gdm-2.19.3-pre/configure.ac gdm-2.19.3-post/configure.ac
|
||||
AC_ARG_ENABLE(secureremote,
|
||||
[ --enable-secureremote=[yes/no] Enable to offer a secure X connection through ssh [default=no]],,
|
||||
enable_secureremote=no)
|
||||
diff -upr gdm-2.19.3-pre/daemon/gdm-daemon-config-keys.h gdm-2.19.3-post/daemon/gdm-daemon-config-keys.h
|
||||
--- gdm-2.19.3-pre/daemon/gdm-daemon-config-keys.h 2007-06-17 12:07:38.000000000 -0500
|
||||
+++ gdm-2.19.3-post/daemon/gdm-daemon-config-keys.h 2007-08-02 20:59:53.000000000 -0500
|
||||
@@ -172,6 +172,7 @@ G_BEGIN_DECLS
|
||||
diff -upr gdm-2.19.5-pre/daemon/gdm-daemon-config-entries.h gdm-2.19.5-post/daemon/gdm-daemon-config-entries.h
|
||||
--- gdm-2.19.5-pre/daemon/gdm-daemon-config-entries.h 2007-07-30 13:51:14.000000000 -0500
|
||||
+++ gdm-2.19.5-post/daemon/gdm-daemon-config-entries.h 2007-08-16 15:42:57.000000000 -0500
|
||||
@@ -185,6 +185,7 @@ typedef enum {
|
||||
GDM_ID_GRAPHICAL_THEME_RAND,
|
||||
GDM_ID_GRAPHICAL_THEME_DIR,
|
||||
GDM_ID_GRAPHICAL_THEMED_COLOR,
|
||||
+ GDM_ID_SHOW_DOMAIN,
|
||||
GDM_ID_INFO_MSG_FILE,
|
||||
GDM_ID_INFO_MSG_FONT,
|
||||
GDM_ID_PRE_FETCH_PROGRAM,
|
||||
@@ -465,6 +466,7 @@ static const GdmConfigEntry gdm_daemon_c
|
||||
{ GDM_CONFIG_GROUP_GREETER, "SoundOnLoginFile", GDM_CONFIG_VALUE_STRING, "", GDM_ID_SOUND_ON_LOGIN_FILE },
|
||||
{ GDM_CONFIG_GROUP_GREETER, "SoundOnLoginSuccessFile", GDM_CONFIG_VALUE_STRING, "", GDM_ID_SOUND_ON_LOGIN_SUCCESS_FILE },
|
||||
{ GDM_CONFIG_GROUP_GREETER, "SoundOnLoginFailureFile", GDM_CONFIG_VALUE_STRING, "", GDM_ID_SOUND_ON_LOGIN_FAILURE_FILE },
|
||||
+ { GDM_CONFIG_GROUP_GREETER, "ShowDomain", GDM_CONFIG_VALUE_BOOL, "false", GDM_ID_SHOW_DOMAIN },
|
||||
{ GDM_CONFIG_GROUP_DAEMON, "SoundProgram", GDM_CONFIG_VALUE_STRING, SOUND_PROGRAM, GDM_ID_SOUND_PROGRAM },
|
||||
|
||||
{ GDM_CONFIG_GROUP_CHOOSER, "ScanTime", GDM_CONFIG_VALUE_INT, "4", GDM_ID_SCAN_TIME },
|
||||
diff -upr gdm-2.19.5-pre/daemon/gdm-daemon-config-keys.h gdm-2.19.5-post/daemon/gdm-daemon-config-keys.h
|
||||
--- gdm-2.19.5-pre/daemon/gdm-daemon-config-keys.h 2007-07-30 13:51:14.000000000 -0500
|
||||
+++ gdm-2.19.5-post/daemon/gdm-daemon-config-keys.h 2007-08-16 15:31:56.000000000 -0500
|
||||
@@ -175,6 +175,7 @@ G_BEGIN_DECLS
|
||||
#define GDM_KEY_GRAPHICAL_THEME_RAND "greeter/GraphicalThemeRand=false"
|
||||
#define GDM_KEY_GRAPHICAL_THEME_DIR "greeter/GraphicalThemeDir=" DATADIR "/gdm/themes/"
|
||||
#define GDM_KEY_GRAPHICAL_THEMED_COLOR "greeter/GraphicalThemedColor=#76848F"
|
||||
@ -24,7 +42,7 @@ diff -upr gdm-2.19.3-pre/daemon/gdm-daemon-config-keys.h gdm-2.19.3-post/daemon/
|
||||
#define GDM_KEY_INFO_MSG_FILE "greeter/InfoMsgFile="
|
||||
#define GDM_KEY_INFO_MSG_FONT "greeter/InfoMsgFont="
|
||||
#define GDM_KEY_PRE_FETCH_PROGRAM "greeter/PreFetchProgram="
|
||||
@@ -214,6 +215,7 @@ G_BEGIN_DECLS
|
||||
@@ -217,6 +218,7 @@ G_BEGIN_DECLS
|
||||
#define GDM_NOTIFY_TIMED_LOGIN_DELAY "TimedLoginDelay" /* <seconds> */
|
||||
#define GDM_NOTIFY_TIMED_LOGIN_ENABLE "TimedLoginEnable" /* <true/false as int> */
|
||||
#define GDM_NOTIFY_DISALLOW_TCP "DisallowTCP" /* <true/false as int> */
|
||||
@ -32,10 +50,10 @@ diff -upr gdm-2.19.3-pre/daemon/gdm-daemon-config-keys.h gdm-2.19.3-post/daemon/
|
||||
#define GDM_NOTIFY_SOUND_ON_LOGIN_FILE "SoundOnLoginFile" /* <sound file> */
|
||||
#define GDM_NOTIFY_SOUND_ON_LOGIN_SUCCESS_FILE "SoundOnLoginSuccessFile" /* <sound file> */
|
||||
#define GDM_NOTIFY_SOUND_ON_LOGIN_FAILURE_FILE "SoundOnLoginFailureFile" /* <sound file> */
|
||||
diff -upr gdm-2.19.3-pre/daemon/verify-pam.c gdm-2.19.3-post/daemon/verify-pam.c
|
||||
--- gdm-2.19.3-pre/daemon/verify-pam.c 2007-06-17 12:07:38.000000000 -0500
|
||||
+++ gdm-2.19.3-post/daemon/verify-pam.c 2007-08-02 20:59:53.000000000 -0500
|
||||
@@ -77,6 +77,8 @@ static unsigned auth_retries;
|
||||
diff -upr gdm-2.19.5-pre/daemon/verify-pam.c gdm-2.19.5-post/daemon/verify-pam.c
|
||||
--- gdm-2.19.5-pre/daemon/verify-pam.c 2007-07-30 13:51:14.000000000 -0500
|
||||
+++ gdm-2.19.5-post/daemon/verify-pam.c 2007-08-16 15:31:56.000000000 -0500
|
||||
@@ -78,6 +78,8 @@ static unsigned auth_retries;
|
||||
|
||||
/* this is another hack */
|
||||
static gboolean did_we_ask_for_password = FALSE;
|
||||
@ -44,7 +62,7 @@ diff -upr gdm-2.19.3-pre/daemon/verify-pam.c gdm-2.19.3-post/daemon/verify-pam.c
|
||||
|
||||
static char *selected_user = NULL;
|
||||
|
||||
@@ -463,6 +465,7 @@ perhaps_translate_message (const char *m
|
||||
@@ -469,6 +471,7 @@ perhaps_translate_message (const char *m
|
||||
g_hash_table_insert (hash, "You are required to change your password immediately (password aged)", _("You are required to change your password immediately (password aged)"));
|
||||
g_hash_table_insert (hash, "You are required to change your password immediately (root enforced)", _("You are required to change your password immediately (root enforced)"));
|
||||
g_hash_table_insert (hash, "Your account has expired; please contact your system administrator", _("Your account has expired; please contact your system administrator"));
|
||||
@ -52,7 +70,7 @@ diff -upr gdm-2.19.3-pre/daemon/verify-pam.c gdm-2.19.3-post/daemon/verify-pam.c
|
||||
g_hash_table_insert (hash, "No password supplied", _("No password supplied"));
|
||||
g_hash_table_insert (hash, "Password unchanged", _("Password unchanged"));
|
||||
g_hash_table_insert (hash, "Can not get username", _("Can not get username"));
|
||||
@@ -531,8 +534,8 @@ gdm_verify_pam_conv (int num_msg, struct
|
||||
@@ -537,8 +540,8 @@ gdm_verify_pam_conv (int num_msg, struct
|
||||
gdm_log_init ();
|
||||
|
||||
for (replies = 0; replies < num_msg; replies++) {
|
||||
@ -63,7 +81,7 @@ diff -upr gdm-2.19.3-pre/daemon/verify-pam.c gdm-2.19.3-post/daemon/verify-pam.c
|
||||
|
||||
switch ((*msg)[replies].msg_style) {
|
||||
|
||||
@@ -588,6 +591,12 @@ gdm_verify_pam_conv (int num_msg, struct
|
||||
@@ -594,6 +597,12 @@ gdm_verify_pam_conv (int num_msg, struct
|
||||
|
||||
case PAM_ERROR_MSG:
|
||||
/* PAM sent a message that should displayed to the user */
|
||||
@ -76,7 +94,7 @@ diff -upr gdm-2.19.3-pre/daemon/verify-pam.c gdm-2.19.3-post/daemon/verify-pam.c
|
||||
gdm_slave_greeter_ctl_no_ret (GDM_ERRDLG, m);
|
||||
reply[replies].resp_retcode = PAM_SUCCESS;
|
||||
reply[replies].resp = NULL;
|
||||
@@ -1266,7 +1275,11 @@ gdm_verify_user (GdmDisplay *d,
|
||||
@@ -1295,7 +1304,11 @@ gdm_verify_user (GdmDisplay *d,
|
||||
/* Only give this message if we actually asked for
|
||||
password, otherwise it would be silly to say that
|
||||
the password may have been wrong */
|
||||
@ -89,7 +107,7 @@ diff -upr gdm-2.19.3-pre/daemon/verify-pam.c gdm-2.19.3-post/daemon/verify-pam.c
|
||||
basemsg = _("\nIncorrect username or password. "
|
||||
"Letters must be typed in the correct "
|
||||
"case.");
|
||||
@@ -1275,7 +1288,7 @@ gdm_verify_user (GdmDisplay *d,
|
||||
@@ -1304,7 +1317,7 @@ gdm_verify_user (GdmDisplay *d,
|
||||
"Letters must be typed in the correct "
|
||||
"case.");
|
||||
}
|
||||
@ -98,7 +116,7 @@ diff -upr gdm-2.19.3-pre/daemon/verify-pam.c gdm-2.19.3-post/daemon/verify-pam.c
|
||||
msg = g_strconcat (basemsg, " ",
|
||||
_("Caps Lock is on."),
|
||||
NULL);
|
||||
@@ -1388,6 +1401,9 @@ gdm_verify_setup_user (GdmDisplay *d, co
|
||||
@@ -1416,6 +1429,9 @@ gdm_verify_setup_user (GdmDisplay *d, co
|
||||
|
||||
/* Start authentication session */
|
||||
did_we_ask_for_password = FALSE;
|
||||
@ -108,10 +126,10 @@ diff -upr gdm-2.19.3-pre/daemon/verify-pam.c gdm-2.19.3-post/daemon/verify-pam.c
|
||||
if ((pamerr = pam_authenticate (pamh, null_tok)) != PAM_SUCCESS) {
|
||||
if (gdm_slave_action_pending ()) {
|
||||
gdm_error (_("Couldn't authenticate user"));
|
||||
diff -upr gdm-2.19.3-pre/gui/gdmchooser.c gdm-2.19.3-post/gui/gdmchooser.c
|
||||
--- gdm-2.19.3-pre/gui/gdmchooser.c 2007-06-17 12:07:28.000000000 -0500
|
||||
+++ gdm-2.19.3-post/gui/gdmchooser.c 2007-08-02 22:10:08.000000000 -0500
|
||||
@@ -1798,6 +1798,7 @@ gdm_read_config (void)
|
||||
diff -upr gdm-2.19.5-pre/gui/gdmchooser.c gdm-2.19.5-post/gui/gdmchooser.c
|
||||
--- gdm-2.19.5-pre/gui/gdmchooser.c 2007-07-30 13:51:03.000000000 -0500
|
||||
+++ gdm-2.19.5-post/gui/gdmchooser.c 2007-08-16 15:31:56.000000000 -0500
|
||||
@@ -1799,6 +1799,7 @@ gdm_read_config (void)
|
||||
gdm_config_get_bool (GDM_KEY_ALLOW_ADD);
|
||||
gdm_config_get_bool (GDM_KEY_BROADCAST);
|
||||
gdm_config_get_bool (GDM_KEY_MULTICAST);
|
||||
@ -119,7 +137,7 @@ diff -upr gdm-2.19.3-pre/gui/gdmchooser.c gdm-2.19.3-post/gui/gdmchooser.c
|
||||
|
||||
gdmcomm_comm_bulk_stop ();
|
||||
|
||||
@@ -1827,6 +1828,7 @@ gdm_reread_config (int sig, gpointer dat
|
||||
@@ -1828,6 +1829,7 @@ gdm_reread_config (int sig, gpointer dat
|
||||
gdm_config_reload_int (GDM_KEY_SCAN_TIME) ||
|
||||
gdm_config_reload_bool (GDM_KEY_ALLOW_ADD) ||
|
||||
gdm_config_reload_bool (GDM_KEY_BROADCAST) ||
|
||||
@ -127,11 +145,10 @@ diff -upr gdm-2.19.3-pre/gui/gdmchooser.c gdm-2.19.3-post/gui/gdmchooser.c
|
||||
gdm_config_reload_bool (GDM_KEY_MULTICAST)) {
|
||||
|
||||
if (RUNNING_UNDER_GDM) {
|
||||
Only in gdm-2.19.3-post/gui: gdmchooser.c~
|
||||
diff -upr gdm-2.19.3-pre/gui/gdmlogin.c gdm-2.19.3-post/gui/gdmlogin.c
|
||||
--- gdm-2.19.3-pre/gui/gdmlogin.c 2007-06-17 12:07:27.000000000 -0500
|
||||
+++ gdm-2.19.3-post/gui/gdmlogin.c 2007-08-02 22:11:09.000000000 -0500
|
||||
@@ -2975,6 +2975,7 @@ gdm_read_config (void)
|
||||
diff -upr gdm-2.19.5-pre/gui/gdmlogin.c gdm-2.19.5-post/gui/gdmlogin.c
|
||||
--- gdm-2.19.5-pre/gui/gdmlogin.c 2007-07-30 13:51:02.000000000 -0500
|
||||
+++ gdm-2.19.5-post/gui/gdmlogin.c 2007-08-16 15:31:56.000000000 -0500
|
||||
@@ -2910,6 +2910,7 @@ gdm_read_config (void)
|
||||
gdm_config_get_bool (GDM_KEY_TIMED_LOGIN_ENABLE);
|
||||
gdm_config_get_bool (GDM_KEY_TITLE_BAR);
|
||||
gdm_config_get_bool (GDM_KEY_ADD_GTK_MODULES);
|
||||
@ -139,7 +156,7 @@ diff -upr gdm-2.19.3-pre/gui/gdmlogin.c gdm-2.19.3-post/gui/gdmlogin.c
|
||||
|
||||
/* Keys not to include in reread_config */
|
||||
gdm_config_get_bool (GDM_KEY_LOCK_POSITION);
|
||||
@@ -3057,6 +3058,7 @@ gdm_reread_config (int sig, gpointer dat
|
||||
@@ -2992,6 +2993,7 @@ gdm_reread_config (int sig, gpointer dat
|
||||
gdm_config_reload_bool (GDM_KEY_SYSTEM_MENU) ||
|
||||
gdm_config_reload_bool (GDM_KEY_TIMED_LOGIN_ENABLE) ||
|
||||
gdm_config_reload_bool (GDM_KEY_TITLE_BAR) ||
|
||||
@ -147,10 +164,9 @@ diff -upr gdm-2.19.3-pre/gui/gdmlogin.c gdm-2.19.3-post/gui/gdmlogin.c
|
||||
gdm_config_reload_bool (GDM_KEY_ADD_GTK_MODULES)) {
|
||||
|
||||
/* Set busy cursor */
|
||||
Only in gdm-2.19.3-post/gui: gdmlogin.c~
|
||||
diff -upr gdm-2.19.3-pre/gui/greeter/greeter.c gdm-2.19.3-post/gui/greeter/greeter.c
|
||||
--- gdm-2.19.3-pre/gui/greeter/greeter.c 2007-08-02 20:01:45.000000000 -0500
|
||||
+++ gdm-2.19.3-post/gui/greeter/greeter.c 2007-08-02 23:28:11.000000000 -0500
|
||||
diff -upr gdm-2.19.5-pre/gui/greeter/greeter.c gdm-2.19.5-post/gui/greeter/greeter.c
|
||||
--- gdm-2.19.5-pre/gui/greeter/greeter.c 2007-08-16 15:31:59.000000000 -0500
|
||||
+++ gdm-2.19.5-post/gui/greeter/greeter.c 2007-08-16 15:31:56.000000000 -0500
|
||||
@@ -63,6 +63,13 @@
|
||||
#include "greeter_session.h"
|
||||
#include "greeter_system.h"
|
||||
@ -356,9 +372,9 @@ diff -upr gdm-2.19.3-pre/gui/greeter/greeter.c gdm-2.19.3-post/gui/greeter/greet
|
||||
gdm_config_reload_bool (GDM_KEY_ADD_GTK_MODULES) ||
|
||||
gdm_config_reload_bool (GDM_KEY_BROWSER)) {
|
||||
|
||||
diff -upr gdm-2.19.3-pre/gui/greeter/greeter_canvas_item.c gdm-2.19.3-post/gui/greeter/greeter_canvas_item.c
|
||||
--- gdm-2.19.3-pre/gui/greeter/greeter_canvas_item.c 2007-08-02 20:01:45.000000000 -0500
|
||||
+++ gdm-2.19.3-post/gui/greeter/greeter_canvas_item.c 2007-08-02 20:59:53.000000000 -0500
|
||||
diff -upr gdm-2.19.5-pre/gui/greeter/greeter_canvas_item.c gdm-2.19.5-post/gui/greeter/greeter_canvas_item.c
|
||||
--- gdm-2.19.5-pre/gui/greeter/greeter_canvas_item.c 2007-08-16 15:31:59.000000000 -0500
|
||||
+++ gdm-2.19.5-post/gui/greeter/greeter_canvas_item.c 2007-08-16 15:31:56.000000000 -0500
|
||||
@@ -20,6 +20,8 @@
|
||||
|
||||
#include <math.h>
|
||||
@ -378,7 +394,7 @@ diff -upr gdm-2.19.3-pre/gui/greeter/greeter_canvas_item.c gdm-2.19.3-post/gui/g
|
||||
/* Keep track of buttons so they can be set sensitive/insensitive */
|
||||
GtkButton *gtk_ok_button = NULL;
|
||||
GtkButton *gtk_start_again_button = NULL;
|
||||
@@ -385,6 +390,189 @@ set_root_pixmap (GdkPixmap *pixmap)
|
||||
@@ -395,6 +400,189 @@ set_root_pixmap (GdkPixmap *pixmap)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@ -568,7 +584,7 @@ diff -upr gdm-2.19.3-pre/gui/greeter/greeter_canvas_item.c gdm-2.19.3-post/gui/g
|
||||
void
|
||||
greeter_item_create_canvas_item (GreeterItemInfo *item)
|
||||
{
|
||||
@@ -676,6 +864,48 @@ greeter_item_create_canvas_item (Greeter
|
||||
@@ -686,6 +874,48 @@ greeter_item_create_canvas_item (Greeter
|
||||
|
||||
break;
|
||||
|
||||
@ -617,9 +633,9 @@ diff -upr gdm-2.19.3-pre/gui/greeter/greeter_canvas_item.c gdm-2.19.3-post/gui/g
|
||||
case GREETER_ITEM_TYPE_LIST:
|
||||
/* Note a list type must be setup later and we will add the list store
|
||||
* to it then, depending on the type. Likely userlist is the
|
||||
diff -upr gdm-2.19.3-pre/gui/greeter/greeter_configuration.h gdm-2.19.3-post/gui/greeter/greeter_configuration.h
|
||||
--- gdm-2.19.3-pre/gui/greeter/greeter_configuration.h 2007-06-17 12:07:26.000000000 -0500
|
||||
+++ gdm-2.19.3-post/gui/greeter/greeter_configuration.h 2007-08-02 20:59:53.000000000 -0500
|
||||
diff -upr gdm-2.19.5-pre/gui/greeter/greeter_configuration.h gdm-2.19.5-post/gui/greeter/greeter_configuration.h
|
||||
--- gdm-2.19.5-pre/gui/greeter/greeter_configuration.h 2007-07-30 13:51:01.000000000 -0500
|
||||
+++ gdm-2.19.5-post/gui/greeter/greeter_configuration.h 2007-08-16 15:31:56.000000000 -0500
|
||||
@@ -65,6 +65,7 @@ extern gchar *GdmSoundOnLoginFailureFile
|
||||
extern gboolean GdmSoundOnLoginReady;
|
||||
extern gboolean GdmSoundOnLoginSuccess;
|
||||
@ -628,9 +644,9 @@ diff -upr gdm-2.19.3-pre/gui/greeter/greeter_configuration.h gdm-2.19.3-post/gui
|
||||
|
||||
extern gboolean GDM_IS_LOCAL;
|
||||
extern gboolean DOING_GDM_DEVELOPMENT;
|
||||
diff -upr gdm-2.19.3-pre/gui/greeter/greeter.h gdm-2.19.3-post/gui/greeter/greeter.h
|
||||
--- gdm-2.19.3-pre/gui/greeter/greeter.h 2007-06-17 12:07:26.000000000 -0500
|
||||
+++ gdm-2.19.3-post/gui/greeter/greeter.h 2007-08-02 20:59:53.000000000 -0500
|
||||
diff -upr gdm-2.19.5-pre/gui/greeter/greeter.h gdm-2.19.5-post/gui/greeter/greeter.h
|
||||
--- gdm-2.19.5-pre/gui/greeter/greeter.h 2007-07-30 13:51:01.000000000 -0500
|
||||
+++ gdm-2.19.5-post/gui/greeter/greeter.h 2007-08-16 15:31:56.000000000 -0500
|
||||
@@ -27,6 +27,9 @@ extern GtkWidget *window;
|
||||
|
||||
extern gboolean greeter_probably_login_prompt;
|
||||
@ -641,23 +657,24 @@ diff -upr gdm-2.19.3-pre/gui/greeter/greeter.h gdm-2.19.3-post/gui/greeter/greet
|
||||
void greeter_ignore_buttons (gboolean val);
|
||||
|
||||
#endif
|
||||
diff -upr gdm-2.19.3-pre/gui/greeter/greeter_item.c gdm-2.19.3-post/gui/greeter/greeter_item.c
|
||||
--- gdm-2.19.3-pre/gui/greeter/greeter_item.c 2007-06-17 12:07:26.000000000 -0500
|
||||
+++ gdm-2.19.3-post/gui/greeter/greeter_item.c 2007-08-02 20:59:53.000000000 -0500
|
||||
@@ -234,6 +234,10 @@ greeter_item_is_visible (GreeterItemInfo
|
||||
diff -upr gdm-2.19.5-pre/gui/greeter/greeter_item.c gdm-2.19.5-post/gui/greeter/greeter_item.c
|
||||
--- gdm-2.19.5-pre/gui/greeter/greeter_item.c 2007-07-30 13:51:01.000000000 -0500
|
||||
+++ gdm-2.19.5-post/gui/greeter/greeter_item.c 2007-08-16 15:57:07.000000000 -0500
|
||||
@@ -234,6 +234,11 @@ greeter_item_is_visible (GreeterItemInfo
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
+ if ( ! gdm_config_get_bool (GDM_KEY_SHOW_DOMAIN) &&
|
||||
+ g_str_has_prefix (info->show_type, "domain"))
|
||||
+ (info->show_type != NULL &&
|
||||
+ g_str_has_prefix (info->show_type, "domain")))
|
||||
+ return FALSE;
|
||||
+
|
||||
if (( ! gdm_config_get_bool (GDM_KEY_TIMED_LOGIN_ENABLE) ||
|
||||
ve_string_empty (gdm_config_get_string (GDM_KEY_TIMED_LOGIN)) ||
|
||||
NULL == g_getenv("GDM_TIMED_LOGIN_OK")) &&
|
||||
diff -upr gdm-2.19.3-pre/gui/greeter/greeter_item.h gdm-2.19.3-post/gui/greeter/greeter_item.h
|
||||
--- gdm-2.19.3-pre/gui/greeter/greeter_item.h 2007-06-17 12:07:26.000000000 -0500
|
||||
+++ gdm-2.19.3-post/gui/greeter/greeter_item.h 2007-08-02 20:59:53.000000000 -0500
|
||||
diff -upr gdm-2.19.5-pre/gui/greeter/greeter_item.h gdm-2.19.5-post/gui/greeter/greeter_item.h
|
||||
--- gdm-2.19.5-pre/gui/greeter/greeter_item.h 2007-07-30 13:51:01.000000000 -0500
|
||||
+++ gdm-2.19.5-post/gui/greeter/greeter_item.h 2007-08-16 15:31:56.000000000 -0500
|
||||
@@ -47,7 +47,8 @@ enum _GreeterItemType {
|
||||
GREETER_ITEM_TYPE_LABEL,
|
||||
GREETER_ITEM_TYPE_ENTRY,
|
||||
@ -677,9 +694,9 @@ diff -upr gdm-2.19.3-pre/gui/greeter/greeter_item.h gdm-2.19.3-post/gui/greeter/
|
||||
struct {
|
||||
guint8 alphas[GREETER_ITEM_STATE_MAX];
|
||||
guint32 colors[GREETER_ITEM_STATE_MAX];
|
||||
diff -upr gdm-2.19.3-pre/gui/greeter/greeter_item_pam.c gdm-2.19.3-post/gui/greeter/greeter_item_pam.c
|
||||
--- gdm-2.19.3-pre/gui/greeter/greeter_item_pam.c 2007-06-17 12:07:26.000000000 -0500
|
||||
+++ gdm-2.19.3-post/gui/greeter/greeter_item_pam.c 2007-08-02 22:21:47.000000000 -0500
|
||||
diff -upr gdm-2.19.5-pre/gui/greeter/greeter_item_pam.c gdm-2.19.5-post/gui/greeter/greeter_item_pam.c
|
||||
--- gdm-2.19.5-pre/gui/greeter/greeter_item_pam.c 2007-07-30 13:51:01.000000000 -0500
|
||||
+++ gdm-2.19.5-post/gui/greeter/greeter_item_pam.c 2007-08-16 15:31:56.000000000 -0500
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
#include "gdm-common.h"
|
||||
@ -787,9 +804,9 @@ diff -upr gdm-2.19.3-pre/gui/greeter/greeter_item_pam.c gdm-2.19.3-post/gui/gree
|
||||
}
|
||||
|
||||
messages_to_give = FALSE;
|
||||
diff -upr gdm-2.19.3-pre/gui/greeter/greeter_parser.c gdm-2.19.3-post/gui/greeter/greeter_parser.c
|
||||
--- gdm-2.19.3-pre/gui/greeter/greeter_parser.c 2007-06-17 12:07:26.000000000 -0500
|
||||
+++ gdm-2.19.3-post/gui/greeter/greeter_parser.c 2007-08-02 20:59:53.000000000 -0500
|
||||
diff -upr gdm-2.19.5-pre/gui/greeter/greeter_parser.c gdm-2.19.5-post/gui/greeter/greeter_parser.c
|
||||
--- gdm-2.19.5-pre/gui/greeter/greeter_parser.c 2007-07-30 13:51:01.000000000 -0500
|
||||
+++ gdm-2.19.5-post/gui/greeter/greeter_parser.c 2007-08-16 15:31:56.000000000 -0500
|
||||
@@ -402,6 +402,11 @@ parse_stock (xmlNodePtr node,
|
||||
g_free (*translated_text);
|
||||
*translated_text = g_strdup (_("Username:"));
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 17 00:20:34 CEST 2007 - hpj@suse.de
|
||||
|
||||
- Fixed missing configuration variable definition in
|
||||
gdm-2.8.0.7-domain-entry.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 10 16:20:58 CEST 2007 - sbrabec@suse.cz
|
||||
|
||||
|
5
gdm.spec
5
gdm.spec
@ -22,7 +22,7 @@ PreReq: %insserv_prereq
|
||||
License: GPL v2 or later
|
||||
Group: System/GUI/GNOME
|
||||
Version: 2.19.5
|
||||
Release: 7
|
||||
Release: 12
|
||||
Summary: The GNOME 2.x Display Manager
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source1: gdm.pamd
|
||||
@ -223,6 +223,9 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
|
||||
%files lang -f %{name}.lang
|
||||
|
||||
%changelog
|
||||
* Fri Aug 17 2007 - hpj@suse.de
|
||||
- Fixed missing configuration variable definition in
|
||||
gdm-2.8.0.7-domain-entry.patch.
|
||||
* Fri Aug 10 2007 - sbrabec@suse.cz
|
||||
- Patches are enabled again, re-enabled gnome-patch-translation.
|
||||
* Thu Aug 09 2007 - sbrabec@suse.cz
|
||||
|
Loading…
x
Reference in New Issue
Block a user