rpms/gdm/devel gdm-2.6.0.8-boot-throbber.patch,1.1,1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Apr 23 03:44:42 UTC 2005
Author: mclasen
Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23541
Modified Files:
gdm-2.6.0.8-boot-throbber.patch
Log Message:
Fix a few thinkos
gdm-2.6.0.8-boot-throbber.patch:
daemon/gdm.c | 18 ++-
daemon/gdm.h | 10 +
daemon/slave.c | 24 +++-
daemon/verify-pam.c | 54 ++++++++-
gui/greeter/Makefile.am | 2
gui/greeter/greeter.c | 25 ++++
gui/greeter/greeter_item.h | 2
gui/greeter/greeter_item_throbber.c | 197 ++++++++++++++++++++++++++++++++++++
gui/greeter/greeter_item_throbber.h | 10 +
9 files changed, 323 insertions(+), 19 deletions(-)
Index: gdm-2.6.0.8-boot-throbber.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.6.0.8-boot-throbber.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.6.0.8-boot-throbber.patch 20 Apr 2005 14:44:29 -0000 1.1
+++ gdm-2.6.0.8-boot-throbber.patch 23 Apr 2005 03:44:39 -0000 1.2
@@ -1,5 +1,5 @@
---- gdm-2.6.0.8/daemon/gdm.c.boot-throbber 2005-04-20 01:12:01.961934000 -0400
-+++ gdm-2.6.0.8/daemon/gdm.c 2005-04-20 01:12:02.135759000 -0400
+--- gdm-2.6.0.8/daemon/gdm.c.boot-throbber 2005-04-22 23:42:40.000000000 -0400
++++ gdm-2.6.0.8/daemon/gdm.c 2005-04-22 23:43:46.000000000 -0400
@@ -100,7 +100,7 @@
pid_t gdm_main_pid = 0; /* PID of the main daemon */
@@ -18,29 +18,33 @@
{ "monte-carlo-sqrt2", 0, POPT_ARG_NONE,
&monte_carlo_sqrt2, 0, NULL, NULL },
POPT_AUTOHELP
-@@ -2860,6 +2860,20 @@
+@@ -2860,11 +2860,23 @@
gdm_xdmcp_run();
}
}
+- } else if (strcmp (msg, GDM_SOP_BOOTUP_COMPLETE) == 0) {
+ } else if (strcmp (msg, GDM_SOP_ALLOW_LOGIN) == 0) {
-+ GSList *li;
-+ gdm_wait_for_bootup = FALSE;
-+ for (li = displays; li != NULL; li = li->next) {
-+ GdmDisplay *d = li->data;
+ GSList *li;
+ gdm_wait_for_bootup = FALSE;
+ for (li = displays; li != NULL; li = li->next) {
+ GdmDisplay *d = li->data;
+ send_slave_command (d, GDM_NOTIFY_ALLOW_LOGIN);
+ }
+ } else if (strcmp (msg, GDM_SOP_BOOTUP_ERRORS) == 0) {
+ GSList *li;
-+ gdm_wait_for_bootup = FALSE;
+ for (li = displays; li != NULL; li = li->next) {
+ GdmDisplay *d = li->data;
+ send_slave_command (d, GDM_NOTIFY_BOOTUP_ERRORS);
+ }
- } else if (strcmp (msg, GDM_SOP_BOOTUP_COMPLETE) == 0) {
- GSList *li;
- gdm_wait_for_bootup = FALSE;
---- gdm-2.6.0.8/daemon/gdm.h.boot-throbber 2005-04-20 01:12:01.972922000 -0400
-+++ gdm-2.6.0.8/daemon/gdm.h 2005-04-20 01:12:02.142752000 -0400
++ } else if (strcmp (msg, GDM_SOP_BOOTUP_COMPLETE) == 0) {
++ GSList *li;
++ for (li = displays; li != NULL; li = li->next) {
++ GdmDisplay *d = li->data;
+ send_slave_command (d, GDM_NOTIFY_BOOTUP_COMPLETE);
+ }
+ } else if (strncmp (msg, GDM_SOP_WRITE_X_SERVERS " ",
+--- gdm-2.6.0.8/daemon/gdm.h.boot-throbber 2005-04-22 23:42:40.000000000 -0400
++++ gdm-2.6.0.8/daemon/gdm.h 2005-04-22 23:42:40.000000000 -0400
@@ -93,6 +93,8 @@
/* Well these aren't as nice as above, oh well */
#define GDM_STARTTIMER 's'
@@ -76,8 +80,8 @@
/* Ack for a slave message */
/* Note that an extra response can follow an 'ack' */
---- gdm-2.6.0.8/daemon/slave.c.boot-throbber 2005-04-20 01:12:02.063832000 -0400
-+++ gdm-2.6.0.8/daemon/slave.c 2005-04-20 01:12:02.152741000 -0400
+--- gdm-2.6.0.8/daemon/slave.c.boot-throbber 2005-04-22 23:42:40.000000000 -0400
++++ gdm-2.6.0.8/daemon/slave.c 2005-04-22 23:42:40.000000000 -0400
@@ -141,7 +141,7 @@
/* wait for a GO in the SOP protocol */
extern gboolean gdm_wait_for_go;
@@ -138,8 +142,8 @@
} else if (strcmp (&s[1], GDM_NOTIFY_TWIDDLE_POINTER) == 0) {
gdm_twiddle_pointer (d);
---- gdm-2.6.0.8/daemon/verify-pam.c.boot-throbber 2005-04-20 01:12:02.006887000 -0400
-+++ gdm-2.6.0.8/daemon/verify-pam.c 2005-04-20 01:12:02.159735000 -0400
+--- gdm-2.6.0.8/daemon/verify-pam.c.boot-throbber 2005-04-22 23:42:40.000000000 -0400
++++ gdm-2.6.0.8/daemon/verify-pam.c 2005-04-22 23:42:40.000000000 -0400
@@ -57,9 +57,10 @@
extern gboolean GdmDisplayLastLogin;
extern uid_t GdmUserId;
@@ -247,8 +251,8 @@
pamerr = pam_acct_mgmt (pamh, null_tok);
switch (pamerr) {
case PAM_SUCCESS :
---- gdm-2.6.0.8/gui/greeter/greeter.c.boot-throbber 2005-04-20 01:12:02.012882000 -0400
-+++ gdm-2.6.0.8/gui/greeter/greeter.c 2005-04-20 10:16:37.739545000 -0400
+--- gdm-2.6.0.8/gui/greeter/greeter.c.boot-throbber 2005-04-22 23:42:40.000000000 -0400
++++ gdm-2.6.0.8/gui/greeter/greeter.c 2005-04-22 23:42:40.000000000 -0400
@@ -81,6 +81,7 @@
gboolean GdmSoundOnLogin;
gchar *GdmSoundOnLoginFile;
@@ -321,7 +325,7 @@
gdm_setup_blinking ();
--- gdm-2.6.0.8/gui/greeter/greeter_item.h.boot-throbber 2005-02-14 17:56:49.000000000 -0500
-+++ gdm-2.6.0.8/gui/greeter/greeter_item.h 2005-04-20 01:12:02.172723000 -0400
++++ gdm-2.6.0.8/gui/greeter/greeter_item.h 2005-04-22 23:42:40.000000000 -0400
@@ -105,7 +105,7 @@
* it should be a parent of this item */
GreeterItemInfo *my_button;
@@ -331,8 +335,8 @@
char *id;
---- /dev/null 2005-04-19 17:37:04.101813336 -0400
-+++ gdm-2.6.0.8/gui/greeter/greeter_item_throbber.c 2005-04-20 10:16:45.502774000 -0400
+--- /dev/null 2004-06-24 14:04:38.000000000 -0400
++++ gdm-2.6.0.8/gui/greeter/greeter_item_throbber.c 2005-04-22 23:42:40.000000000 -0400
@@ -0,0 +1,197 @@
+#include "config.h"
+
@@ -531,8 +535,8 @@
+ }
+}
+
---- /dev/null 2005-04-19 17:37:04.101813336 -0400
-+++ gdm-2.6.0.8/gui/greeter/greeter_item_throbber.h 2005-04-20 01:12:02.185708000 -0400
+--- /dev/null 2004-06-24 14:04:38.000000000 -0400
++++ gdm-2.6.0.8/gui/greeter/greeter_item_throbber.h 2005-04-22 23:42:40.000000000 -0400
@@ -0,0 +1,10 @@
+#ifndef GREETER_ITEM_THROBBER_H
+#define GREETER_ITEM_THROBBER_H
@@ -544,8 +548,8 @@
+void greeter_item_throbber_stop (void);
+
+#endif
---- gdm-2.6.0.8/gui/greeter/Makefile.am.boot-throbber 2005-04-20 01:12:02.107788000 -0400
-+++ gdm-2.6.0.8/gui/greeter/Makefile.am 2005-04-20 01:12:02.191702000 -0400
+--- gdm-2.6.0.8/gui/greeter/Makefile.am.boot-throbber 2005-04-22 23:42:40.000000000 -0400
++++ gdm-2.6.0.8/gui/greeter/Makefile.am 2005-04-22 23:42:40.000000000 -0400
@@ -43,6 +43,8 @@
greeter_item.c \
greeter_item_timed.c \
More information about the fedora-cvs-commits
mailing list