diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | NEWS | 24 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | daemon/main.c | 24 | ||||
| -rw-r--r-- | gui/simple-greeter/gdm-greeter-login-window.c | 4 | ||||
| -rw-r--r-- | gui/simple-greeter/test-greeter-login-window.c | 2 |
6 files changed, 57 insertions, 13 deletions
@@ -1,5 +1,19 @@ 2008-05-01 William Jon McCann <jmccann@redhat.com> + * NEWS: + * configure.ac: + prepare for release. + + * daemon/main.c (bus_reconnect), (bus_proxy_destroyed_cb), (main): + Try to fix a crash at shutdown. + + * gui/simple-greeter/gdm-greeter-login-window.c + (do_system_restart), (do_system_stop): + * gui/simple-greeter/test-greeter-login-window.c: + Fix some warnings. + +2008-05-01 William Jon McCann <jmccann@redhat.com> + * gui/simple-greeter/gdm-greeter-login-window.c (get_action_from_error), (get_result_from_error), (do_system_restart), (do_system_stop): @@ -1,4 +1,28 @@ =============== +Version 2.22.0 +=============== + + * Many animation improvements (Ray) + * Many locale/language improvements (Ray) + * Many session fixes (Ray) + * Drop icons for Other and Auto users for now (Ray) + * Only populate language list with those that have translations (Ray) + * Load languages later to speed up starting (Ray) + * Select "Other..." user if it's the only available user + * Don't destroy the transient greeter since we may end up on wrong vt + * Store X auth password in /var/run/gdm instead of /tmp + * Enable a11y by default + * Monitor ~/.face for changes. + * Only display the currently logged in users in the applet + * Show local users and monitor passwd for changes + * More lockdown + * Add option for running compiz + * Add a "hidden" screenshot tool. Pressing PrtSc saves file to /tmp. + * Add profiling framework + * Log greeter output to a file in /var/log/gdm + * Turn on media-keys support for volume control + +=============== Version 2.21.9 =============== diff --git a/configure.ac b/configure.ac index 97454462..bb7e4755 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.60]) AC_INIT([gdm], - [2.21.10], + [2.22.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=gdm]) AC_CONFIG_SRCDIR([daemon/gdm-manager.c]) diff --git a/daemon/main.c b/daemon/main.c index fb92ad8d..1793ed46 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -54,8 +54,8 @@ #define GDM_DBUS_NAME "org.gnome.DisplayManager" -static void bus_proxy_destroyed_cb (DBusGProxy *bus_proxy, - GdmManager *manager); +static void bus_proxy_destroyed_cb (DBusGProxy *bus_proxy, + GdmManager **managerp); extern char **environ; @@ -189,7 +189,7 @@ bus_reconnect (GdmManager *manager) g_signal_connect (bus_proxy, "destroy", G_CALLBACK (bus_proxy_destroyed_cb), - manager); + &manager); g_debug ("Successfully reconnected to D-Bus"); @@ -200,15 +200,20 @@ bus_reconnect (GdmManager *manager) } static void -bus_proxy_destroyed_cb (DBusGProxy *bus_proxy, - GdmManager *manager) +bus_proxy_destroyed_cb (DBusGProxy *bus_proxy, + GdmManager **managerp) { g_debug ("Disconnected from D-Bus"); - g_object_unref (manager); - manager = NULL; + if (managerp == NULL || *managerp == NULL) { + /* probably shutting down or something */ + return; + } + + g_object_unref (*managerp); + *managerp = NULL; - g_timeout_add (3000, (GSourceFunc)bus_reconnect, manager); + g_timeout_add (3000, (GSourceFunc)bus_reconnect, managerp); } static void @@ -498,7 +503,6 @@ main (int argc, DBusGConnection *connection; GError *error; int ret; - int i; gboolean res; gboolean xdmcp_enabled; GdmSignalHandler *signal_handler; @@ -609,7 +613,7 @@ main (int argc, g_signal_connect (bus_proxy, "destroy", G_CALLBACK (bus_proxy_destroyed_cb), - manager); + &manager); main_loop = g_main_loop_new (NULL, FALSE); diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c index 862ed176..6fbbda92 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.c +++ b/gui/simple-greeter/gdm-greeter-login-window.c @@ -1222,7 +1222,7 @@ do_system_restart (GdmGreeterLoginWindow *login_window) GTK_BUTTONS_OK, _("Failed to restart computer")); if (polkit_action_equal (action, action2)) { - gtk_message_dialog_format_secondary_text (dialog, + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("You are not allowed to restart the computer " "because multiple users are logged in")); } @@ -1306,7 +1306,7 @@ do_system_stop (GdmGreeterLoginWindow *login_window) GTK_BUTTONS_OK, _("Failed to stop computer")); if (polkit_action_equal (action, action2)) { - gtk_message_dialog_format_secondary_text (dialog, + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("You are not allowed to stop the computer " "because multiple users are logged in")); } diff --git a/gui/simple-greeter/test-greeter-login-window.c b/gui/simple-greeter/test-greeter-login-window.c index cfd98619..e72cef97 100644 --- a/gui/simple-greeter/test-greeter-login-window.c +++ b/gui/simple-greeter/test-greeter-login-window.c @@ -30,6 +30,8 @@ #include <glib/gi18n.h> #include <gtk/gtk.h> +#include "gdm-settings-client.h" + #include "gdm-greeter-login-window.h" int |