summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Lebl <jirka@5z.com>2003-07-26 00:47:33 +0000
committerGeorge Lebl <jirka@src.gnome.org>2003-07-26 00:47:33 +0000
commit8743c666c1e93f8b7d88e7261c0d1fdc0b158a2b (patch)
tree4cd3cbc27aff636fc8588a4872b3a70e1b45e8f6
parent5774d008ee48ca8902930b48c6d4e3bdd23333ba (diff)
downloadgdm-8743c666c1e93f8b7d88e7261c0d1fdc0b158a2b.tar.gz
fix C99/C++ism that gcc no longer warns about, anywhere declarations C++
Fri Jul 25 17:46:11 2003 George Lebl <jirka@5z.com> * daemon/slave.c: fix C99/C++ism that gcc no longer warns about, anywhere declarations C++ style * daemon/gdm.c: when reading with %02x use unsigned int * daemon/gdm-net.[ch]: the connection close_notify should be of type GDestroyNotify
-rw-r--r--ChangeLog22
-rw-r--r--daemon/gdm-net.c2
-rw-r--r--daemon/gdm-net.h2
-rw-r--r--daemon/gdm.c2
-rw-r--r--daemon/slave.c3
5 files changed, 21 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 606e1b26..1a4d2882 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,21 @@
+Fri Jul 25 17:46:11 2003 George Lebl <jirka@5z.com>
+
+ * daemon/slave.c: fix C99/C++ism that gcc no longer warns about,
+ anywhere declarations C++ style
+
+ * daemon/gdm.c: when reading with %02x use unsigned int
+
+ * daemon/gdm-net.[ch]: the connection close_notify should be of
+ type GDestroyNotify
+
Fri Jul 25 17:09:52 2003 George Lebl <jirka@5z.com>
- * daemon/verify-pam.c: apparently pam can is on crack and so the
- best and apparently most portable way of handling the face browser
- is by reseting the pam handle after a user has been selected.
- This works just as well and we dump any possibly dangerous
- state from the pam handle's previous invocation of
- pam_authenticate
+ * daemon/verify-pam.c: apparently pam can be on crack and so the
+ best and apparently most theoretically portable (to different
+ module configs) way of handling the face browser is by reseting
+ the pam handle after a user has been selected. This works just
+ as well and we dump any possibly dangerous state from the pam
+ handle's previous invocation of pam_authenticate.
Fri Jul 25 16:31:24 2003 George Lebl <jirka@5z.com>
diff --git a/daemon/gdm-net.c b/daemon/gdm-net.c
index feb8ba07..b4823cc3 100644
--- a/daemon/gdm-net.c
+++ b/daemon/gdm-net.c
@@ -466,7 +466,7 @@ gdm_connection_close (GdmConnection *conn)
void
gdm_connection_set_close_notify (GdmConnection *conn,
gpointer close_data,
- gpointer close_notify)
+ GDestroyNotify close_notify)
{
g_return_if_fail (conn != NULL);
diff --git a/daemon/gdm-net.h b/daemon/gdm-net.h
index d1577d41..dda61c0b 100644
--- a/daemon/gdm-net.h
+++ b/daemon/gdm-net.h
@@ -46,7 +46,7 @@ GdmConnection * gdm_connection_open_fifo (const char *fifo,
void gdm_connection_set_close_notify (GdmConnection *conn,
gpointer close_data,
- gpointer close_notify);
+ GDestroyNotify close_notify);
void gdm_connection_set_handler (GdmConnection *conn,
GdmConnectionHandler handler,
diff --git a/daemon/gdm.c b/daemon/gdm.c
index cd8127fb..33b72ede 100644
--- a/daemon/gdm.c
+++ b/daemon/gdm.c
@@ -2523,7 +2523,7 @@ dehex_cookie (const char *cookie, int *len)
for (i = 0, p = cookie;
*p != '\0' && *(p+1) != '\0';
i++, p += 2) {
- int num;
+ unsigned int num;
if (sscanf (p, "%02x", &num) != 1) {
g_free (bcookie);
return NULL;
diff --git a/daemon/slave.c b/daemon/slave.c
index 470691a4..ce09caa4 100644
--- a/daemon/slave.c
+++ b/daemon/slave.c
@@ -3537,9 +3537,10 @@ gdm_slave_session_stop (gboolean run_post_session,
static void
gdm_slave_term_handler (int sig)
{
+ static gboolean got_term_before = FALSE;
+
gdm_in_signal++;
gdm_wait_for_ack = FALSE;
- static gboolean got_term_before = FALSE;
gdm_debug ("gdm_slave_term_handler: %s got TERM/INT signal", d->name);