From 19ae8df34ea9322a43f6f911f8ee9aa113913d18 Mon Sep 17 00:00:00 2001 From: Brian Cameron Date: Mon, 30 Oct 2006 21:54:08 +0000 Subject: Updated. Update to new release version. Back out patch from 10/17 from 2006-10-30 Brian Cameron * Release 2.16.2: * NEWS: Updated. * configure.ac: Update to new release version. * gui/greeter/greeter_canvas_item.c, gui/greeter/greeter_system.c: Back out patch from 10/17 from Sebastien Bacher since we don't have icons yet. --- ChangeLog | 9 +++++++++ NEWS | 35 +++++++++++++++++++++++++++++++++++ configure.ac | 2 +- gui/greeter/greeter_canvas_item.c | 16 ++++------------ gui/greeter/greeter_system.c | 12 +++--------- 5 files changed, 52 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9118bd0a..0f379988 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-10-30 Brian Cameron + + * Release 2.16.2: + * NEWS: Updated. + * configure.ac: Update to new release version. + * gui/greeter/greeter_canvas_item.c, gui/greeter/greeter_system.c: + Back out patch from 10/17 from Sebastien Bacher + since we don't have icons yet. + 2006-10-30 Brian Cameron * gui/greeter/greeter_item_ulist.c: Fix minor bug in last commit. diff --git a/NEWS b/NEWS index e3f7ef38..72ba88de 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,40 @@ Ahh news... +2.16.2 Stuff: + +- Now support for "combo" style lists, and id values of "session" + and "language" are supported for displaying the session/language + lists as drop-down combos. (Brian Cameron). For example: + + + + + + + + +- Now OK/Start Again buttons are sensitive/insensitive in a more + sensible way for both gdmlogin and gdmgreeter (if GTK style buttons + are used in gdmgreeter). (Brian Cameron) + +- Face Browser widget and background rectangle (for gdmgreeter) + is not shown if there are no users to display. (Brian Cameron) + +- Help button now enabled in gdmphotosetup. (Matthias Clasen) + +- Fix so that if timed user script returns an invalid user that + timed login is not turned on. (Andrew) + +- Fix bug that was causing %t to be expanded improperly when + used in the timed login label. (Brian Cameron) + +- Set authdir to NULL after freeing to avoid accessing an invalid + pointer. Fixes bug #359831. (Amnon Aaronsohn) + +- Leaks fixed. (Kjartan Maraas) + +- Translation updates (Abel Cheung, Priit Laes, Daniel Nylander) + 2.16.1 Stuff: - Use g_markup_printf_escaped so gdmsetup better handles diff --git a/configure.ac b/configure.ac index d3c14f7b..5664caf0 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ(2.52) AC_INIT(daemon/gdm.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(gdm,2.16.1) +AM_INIT_AUTOMAKE(gdm,2.16.2) AC_CONFIG_MACRO_DIR([m4]) AM_MAINTAINER_MODE diff --git a/gui/greeter/greeter_canvas_item.c b/gui/greeter/greeter_canvas_item.c index 149a296d..1a805430 100644 --- a/gui/greeter/greeter_canvas_item.c +++ b/gui/greeter/greeter_canvas_item.c @@ -155,18 +155,14 @@ make_menubar (void) menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), menu); - w = gtk_image_menu_item_new_with_mnemonic (_("Select _Language...")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w), - gtk_image_new_from_icon_name ("config-language", GTK_ICON_SIZE_MENU)); + w = gtk_menu_item_new_with_mnemonic (_("Select _Language...")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), w); gtk_widget_show (GTK_WIDGET (w)); g_signal_connect (G_OBJECT (w), "activate", G_CALLBACK (activate_button), "language_button"); - w = gtk_image_menu_item_new_with_mnemonic (_("Select _Session...")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w), - gtk_image_new_from_icon_name ("gnome-session", GTK_ICON_SIZE_MENU)); + w = gtk_menu_item_new_with_mnemonic (_("Select _Session...")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), w); gtk_widget_show (GTK_WIDGET (w)); g_signal_connect (G_OBJECT (w), "activate", @@ -180,13 +176,9 @@ make_menubar (void) * flexi, even if not local (non-local xnest). and Disconnect * only for xdmcp */ if ( ! ve_string_empty (g_getenv ("GDM_FLEXI_SERVER"))) { - w = gtk_image_menu_item_new_with_mnemonic (_("_Quit")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w), - gtk_image_new_from_icon_name ("gnome-logout", GTK_ICON_SIZE_MENU)); + w = gtk_menu_item_new_with_mnemonic (_("_Quit")); } else if (ve_string_empty (g_getenv ("GDM_IS_LOCAL"))) { - w = gtk_image_menu_item_new_with_mnemonic (_("D_isconnect")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w), - gtk_image_new_from_icon_name ("gnome-logout", GTK_ICON_SIZE_MENU)); + w = gtk_menu_item_new_with_mnemonic (_("D_isconnect")); } else { w = NULL; } diff --git a/gui/greeter/greeter_system.c b/gui/greeter/greeter_system.c index 1c4b586f..c4bc0f6f 100644 --- a/gui/greeter/greeter_system.c +++ b/gui/greeter/greeter_system.c @@ -181,9 +181,7 @@ greeter_system_append_system_menu (GtkWidget *menu) } if (GdmRebootFound) { - w = gtk_image_menu_item_new_with_mnemonic (_("_Restart")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w), - gtk_image_new_from_icon_name ("gnome-session-reboot", GTK_ICON_SIZE_MENU)); + w = gtk_menu_item_new_with_mnemonic (_("_Restart")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), w); gtk_widget_show (GTK_WIDGET (w)); g_signal_connect (G_OBJECT (w), "activate", @@ -192,9 +190,7 @@ greeter_system_append_system_menu (GtkWidget *menu) } if (GdmHaltFound) { - w = gtk_image_menu_item_new_with_mnemonic (_("Shut _Down")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w), - gtk_image_new_from_icon_name ("gnome-session-halt", GTK_ICON_SIZE_MENU)); + w = gtk_menu_item_new_with_mnemonic (_("Shut _Down")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), w); gtk_widget_show (GTK_WIDGET (w)); g_signal_connect (G_OBJECT (w), "activate", @@ -203,9 +199,7 @@ greeter_system_append_system_menu (GtkWidget *menu) } if (GdmSuspendFound) { - w = gtk_image_menu_item_new_with_mnemonic (_("Sus_pend")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w), - gtk_image_new_from_icon_name ("gnome-session-suspend", GTK_ICON_SIZE_MENU)); + w = gtk_menu_item_new_with_mnemonic (_("Sus_pend")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), w); gtk_widget_show (GTK_WIDGET (w)); g_signal_connect (G_OBJECT (w), "activate", -- cgit v1.2.1