diff --git a/capplets/display/ChangeLog b/capplets/display/ChangeLog
index c28eb0504..412e9afb7 100644
--- a/capplets/display/ChangeLog
+++ b/capplets/display/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-11  Jody Goldberg <jody@gnome.org>
+
+	From ruben@lambda1.be
+	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=140047
+	* main.c (main) : s/XServer/X Server/
+	and a patch to use g_signal_connect
+
 2004-04-15  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.6.1
diff --git a/capplets/display/main.c b/capplets/display/main.c
index eefa4c60d..aa0007504 100644
--- a/capplets/display/main.c
+++ b/capplets/display/main.c
@@ -800,7 +800,7 @@ main (int argc, char *argv[])
       XRRQueryVersion (xdisplay, &major, &minor) == 0)
     {
       GtkWidget *msg_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, 
-						   _("The XServer does not support the XRandR extension.  Runtime resolution changes to the display size are not available."));
+						   _("The X Server does not support the XRandR extension.  Runtime resolution changes to the display size are not available."));
       gtk_dialog_run (GTK_DIALOG (msg_dialog));
       gtk_widget_destroy (msg_dialog);
       exit (0);
@@ -817,7 +817,7 @@ main (int argc, char *argv[])
   info = read_display_info (display);
   dialog = create_dialog (info);
 
-  gtk_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (cb_dialog_response), info);
+  g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (cb_dialog_response), info);
   gtk_widget_show (dialog);
 
   gtk_main ();