diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-10-09 15:30:31 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-10-09 15:30:31 +0000 |
| commit | 22c3cdafd86c52c24931029985ee9088a55b876c (patch) | |
| tree | 7828c9e94961c2605b4a3d670d0646dd354c39ff | |
| parent | bb254ef1f5381f999a8a012b1ba3a30295f418a5 (diff) | |
| download | gdm-22c3cdafd86c52c24931029985ee9088a55b876c.tar.gz | |
Fix new at-spi code so that if DOING_GDM_DEVELOPMENT is set it does not
2006-10-09 Brian Cameron <brian.cameron@sun.com>
* gui/gdmlogin.c, gui/greeter/greeter.c,
gui/greeter/greeter_parser.c: Fix new at-spi code so that if
DOING_GDM_DEVELOPMENT is set it does not try to launch the AT
registry daemon. Also fix broken string.
* gui/greeter/greeter_item_ulist.c: Fix code to avoid printing
out warnings when DOING_GDM_DEVELOPMENT is set. Do not process
face browser code when user_list is NULL.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | gui/gdmcommon.c | 4 | ||||
| -rw-r--r-- | gui/gdmlogin.c | 4 | ||||
| -rw-r--r-- | gui/greeter/greeter.c | 4 | ||||
| -rw-r--r-- | gui/greeter/greeter_item_ulist.c | 6 | ||||
| -rw-r--r-- | gui/greeter/greeter_parser.c | 2 |
6 files changed, 23 insertions, 7 deletions
@@ -1,3 +1,13 @@ +2006-10-09 Brian Cameron <brian.cameron@sun.com> + + * gui/gdmlogin.c, gui/greeter/greeter.c, + gui/greeter/greeter_parser.c: Fix new at-spi code so that if + DOING_GDM_DEVELOPMENT is set it does not try to launch the AT + registry daemon. Also fix broken string. + * gui/greeter/greeter_item_ulist.c: Fix code to avoid printing + out warnings when DOING_GDM_DEVELOPMENT is set. Do not process + face browser code when user_list is NULL. + 2006-10-08 Brian Cameron <brian.cameron@sun.com> * gui/Makefile.am: Add -lX11 to link statements so that the new code diff --git a/gui/gdmcommon.c b/gui/gdmcommon.c index 8ff330ed..21f374d1 100644 --- a/gui/gdmcommon.c +++ b/gui/gdmcommon.c @@ -30,6 +30,8 @@ #include <syslog.h> #include <time.h> #include <sys/utsname.h> +#include <sys/types.h> +#include <signal.h> #include <glib/gi18n.h> #include <gdk/gdkx.h> @@ -628,7 +630,7 @@ error_dialog (void) GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - _("Assistive technology support has been requested for this session, butthe accessibility registry was not found. Please ensure that the AT-SPI package is installed. Your session has been started without assistive technology support.")); + _("Assistive technology support has been requested for this session, but the accessibility registry was not found. Please ensure that the AT-SPI package is installed. Your session has been started without assistive technology support.")); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } diff --git a/gui/gdmlogin.c b/gui/gdmlogin.c index cab74c60..3f19982a 100644 --- a/gui/gdmlogin.c +++ b/gui/gdmlogin.c @@ -3209,7 +3209,9 @@ main (int argc, char *argv[]) * because the atk-bridge will crash. */ gdk_init (&argc, &argv); - gdm_common_atspi_launch (); + if ( ! DOING_GDM_DEVELOPMENT) { + gdm_common_atspi_launch (); + } gtk_init (&argc, &argv); diff --git a/gui/greeter/greeter.c b/gui/greeter/greeter.c index 65d38f18..5817f649 100644 --- a/gui/greeter/greeter.c +++ b/gui/greeter/greeter.c @@ -1050,7 +1050,9 @@ main (int argc, char *argv[]) * because the atk-bridge will crash. */ gdk_init (&argc, &argv); - gdm_common_atspi_launch (); + if (! DOING_GDM_DEVELOPMENT) { + gdm_common_atspi_launch (); + } gtk_init (&argc, &argv); diff --git a/gui/greeter/greeter_item_ulist.c b/gui/greeter/greeter_item_ulist.c index fd13da7f..64315e36 100644 --- a/gui/greeter/greeter_item_ulist.c +++ b/gui/greeter/greeter_item_ulist.c @@ -66,8 +66,10 @@ void greeter_item_ulist_unset_selected_user (void) { GtkTreeSelection *selection; - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (user_list)); - gtk_tree_selection_unselect_all (selection); + if (user_list != NULL) { + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (user_list)); + gtk_tree_selection_unselect_all (GTK_TREE_SELECTION (selection)); + } if (selected_user != NULL) g_free (selected_user); diff --git a/gui/greeter/greeter_parser.c b/gui/greeter/greeter_parser.c index 3c39715a..da8a1282 100644 --- a/gui/greeter/greeter_parser.c +++ b/gui/greeter/greeter_parser.c @@ -1582,8 +1582,6 @@ parse_items (xmlNodePtr node, return FALSE; } - xmlFree (type); - type = xmlGetProp (child, (const xmlChar *) "type"); if G_UNLIKELY (!type) { |