summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--NEWS9
-rw-r--r--daemon/auth.c2
-rw-r--r--daemon/gdm.c2
-rw-r--r--daemon/slave.c3
5 files changed, 16 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index cec7b985..45f3941e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-16 Brian Cameron <brian.cameron@sun.com>
+
+ * NEWS, daemon/auth.c, daemon/gdm.c, daemon/slave.c: Clean up
+ comments.
+
2006-10-08 Brian Cameron <brian.cameron@sun.com>
* gui/Makefile.am: Add -lX11 to link statements so that the new code
@@ -4120,7 +4125,7 @@ Fri May 28 11:08:51 2004 George Lebl <jirka@5z.com>
Thu May 27 13:42:39 2004 George Lebl <jirka@5z.com>
* gui/modules/dwellmouselistener.c, gui/modules/keymouselistener.c:
- The screen code was wankered, it wanted HAVE_GTK_MULTIHEAD to be
+ The screen code was broken, it wanted HAVE_GTK_MULTIHEAD to be
defined to work properly and otherwise it confused bonobo which
is completely moronic (I mean bonobo is moronic) by using slightly
different (but perfectly legal) DISPLAY env var.
@@ -6539,8 +6544,8 @@ Mon Jul 14 12:04:13 2003 George Lebl <jirka@5z.com>
Mon Jul 14 11:24:06 2003 George Lebl <jirka@5z.com>
- * daemon/server.[ch], daemon/slave.c: XFree86 is an wanker and doesn't
- wipe it's lockfile sometimes apparently (well obviously it won't if it
+ * daemon/server.[ch], daemon/slave.c: XFree86 doesn't wipe it's
+ lockfile sometimes apparently (well obviously it won't if it
crashed or some such), so if we find a stale lock file after we
kill the server, whack the lock file. Should address #114003 and
redhat #90014
@@ -12680,7 +12685,7 @@ Thu Jan 25 23:04:01 2001 George Lebl <jirka@5z.com>
* daemon/slave.[ch]: cleanup
* daemon/gdm.h, gui/gdmlogin.c, config/gdm.conf.in: Add options
- for setting the initial position to allow xinerama wankers to
+ for setting the initial position to allow xinerama users to
make their login not suck too much. Also added an option to
lock the window position and fixed some braindamages. Fixed the
label style setting as well to work with non default themes.
diff --git a/NEWS b/NEWS
index 782b0946..e3f7ef38 100644
--- a/NEWS
+++ b/NEWS
@@ -1612,8 +1612,8 @@ Other Changes:
- Fix last_x_failed possible infinite loop on slow machines, #141497
-- Fix multihead wanker code in the *mouselistener modules, this confused
- the moronic bonobo DISPLAY logic
+- Fix multihead code in the *mouselistener modules, this confused the
+ moronic bonobo DISPLAY logic
- Don't use certain languages on the console. Controlled by the
daemon/ConsoleCannotHandle config key, but that's a hack. Oh well,
@@ -3342,9 +3342,8 @@ Issues with this version:
- Autologin is now done with a separate pam configuration. gdm-autologin
service. This just logs anyone in without asking for a password,
- but this makes autologin work on some all wankered pam setup. Of course
- you must now modify gdm-autologin in addition to 'gdm' if you have
- some weird pam setup.
+ but this makes autologin work on some pam setups. Of course you must now
+ modify gdm-autologin in addition to 'gdm' if you have some weird pam setup.
- Fix gdmconfig saving of server definitions
diff --git a/daemon/auth.c b/daemon/auth.c
index d15903f9..6c5ac202 100644
--- a/daemon/auth.c
+++ b/daemon/auth.c
@@ -183,7 +183,7 @@ gdm_auth_secure_display (GdmDisplay *d)
int authfd;
/* Note, Xnest can't use the GDM_KEY_SERV_AUTHDIR unless running as
- * root, which is rare anyway, unless the user is a wanker */
+ * root, which is rare anyway. */
d->authfile = g_build_filename (gdm_get_value_string (GDM_KEY_USER_AUTHDIR_FALLBACK), ".gdmXXXXXX", NULL);
diff --git a/daemon/gdm.c b/daemon/gdm.c
index a78c058d..a4a4cfea 100644
--- a/daemon/gdm.c
+++ b/daemon/gdm.c
@@ -563,7 +563,7 @@ deal_with_x_crashes (GdmDisplay *d)
/* We couldn't run the script, just drop through */
;
} else {
- /* Things went wrong, or the user's a wanker */
+ /* Things went wrong */
just_abort = TRUE;
}
}
diff --git a/daemon/slave.c b/daemon/slave.c
index 99754247..72b4c128 100644
--- a/daemon/slave.c
+++ b/daemon/slave.c
@@ -1988,7 +1988,7 @@ gdm_slave_wait_for_login (void)
check_notifies_now ();
- /* The wanker can't remember his password */
+ /* The user can't remember his password */
if (login == NULL) {
gdm_debug ("gdm_slave_wait_for_login: No login/Bad login");
gdm_slave_greeter_ctl_no_ret (GDM_RESET, "");
@@ -2007,7 +2007,6 @@ gdm_slave_wait_for_login (void)
break;
}
- /* The user is a wanker */
if G_UNLIKELY (do_configurator) {
do_configurator = FALSE;
gdm_slave_greeter_ctl_no_ret (GDM_RESET, "");