gdm r6376 - in trunk: . gui/simple-greeter po

[mccann svn gnome org]

Author: mccann
Date: Thu Aug 14 14:30:16 2008
New Revision: 6376
URL: http://svn.gnome.org/viewvc/gdm?rev=6376&view=rev

Log:
2008-08-14  William Jon McCann  <jmccann redhat com>

	* gui/simple-greeter/Makefile.am:
	* gui/simple-greeter/gdm-a11y-preferences-dialog.c:
	* gui/simple-greeter/gdm-a11y-preferences-dialog.glade:
	* gui/simple-greeter/gdm-a11y-preferences-dialog.h:
	* gui/simple-greeter/gdm-greeter-panel.c (gdm_greeter_panel_init):
	Remove a11y dialog and button on panel.  This is
	now provided by gnome-settings-daemon.



Removed:
   trunk/gui/simple-greeter/gdm-a11y-preferences-dialog.c
   trunk/gui/simple-greeter/gdm-a11y-preferences-dialog.glade
   trunk/gui/simple-greeter/gdm-a11y-preferences-dialog.h
Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/Makefile.am
   trunk/gui/simple-greeter/gdm-greeter-panel.c
   trunk/po/ChangeLog
   trunk/po/POTFILES.in

Modified: trunk/gui/simple-greeter/Makefile.am
==============================================================================
--- trunk/gui/simple-greeter/Makefile.am	(original)
+++ trunk/gui/simple-greeter/Makefile.am	Thu Aug 14 14:30:16 2008
@@ -56,7 +56,6 @@
 	$(NULL)
 
 noinst_PROGRAMS = 			\
-	test-a11y-preferences		\
 	test-filesystem-type		\
 	test-greeter-login-window	\
 	test-greeter-panel		\
@@ -136,8 +135,6 @@
 	gdm-sessions.c			\
 	gdm-session-option-widget.h	\
 	gdm-session-option-widget.c	\
-	gdm-a11y-preferences-dialog.h	\
-	gdm-a11y-preferences-dialog.c	\
 	$(NULL)
 
 test_greeter_panel_LDADD =	\
@@ -246,17 +243,6 @@
 	$(POLKIT_GNOME_LIBS)	\
 	$(NULL)
 
-test_a11y_preferences_SOURCES = 	\
-	gdm-a11y-preferences-dialog.h	\
-	gdm-a11y-preferences-dialog.c	\
-	test-a11y-preferences.c		\
-	$(NULL)
-
-test_a11y_preferences_LDADD =	\
-	$(COMMON_LIBS)		\
-	$(SIMPLE_GREETER_LIBS)	\
-	$(NULL)
-
 libexec_PROGRAMS =			\
 	gdm-simple-greeter
 
@@ -313,8 +299,6 @@
 	gdm-session-option-widget.c	\
 	gdm-user-chooser-widget.h	\
 	gdm-user-chooser-widget.c	\
-	gdm-a11y-preferences-dialog.h	\
-	gdm-a11y-preferences-dialog.c	\
 	$(NULL)
 
 gdm_simple_greeter_LDADD = 		\
@@ -331,7 +315,6 @@
 gladedir = $(pkgdatadir)
 glade_DATA = 					\
 	gdm-greeter-login-window.glade		\
-	gdm-a11y-preferences-dialog.glade	\
 	$(NULL)
 
 EXTRA_DIST = 			\

Modified: trunk/gui/simple-greeter/gdm-greeter-panel.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-panel.c	(original)
+++ trunk/gui/simple-greeter/gdm-greeter-panel.c	Thu Aug 14 14:30:16 2008
@@ -40,21 +40,16 @@
 #include "gdm-language-option-widget.h"
 #include "gdm-layout-option-widget.h"
 #include "gdm-session-option-widget.h"
-#include "gdm-a11y-preferences-dialog.h"
 #include "gdm-profile.h"
 
 #include "na-tray.h"
 
-#define KEY_DISABLE_A11Y_BUTTON "/apps/gdm/simple-greeter/disable_accessibility_button"
-
 #define GDM_GREETER_PANEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_GREETER_PANEL, GdmGreeterPanelPrivate))
 
 struct GdmGreeterPanelPrivate
 {
         int                     monitor;
         GdkRectangle            geometry;
-        GtkWidget              *a11y_button;
-        GtkWidget              *a11y_dialog;
         GtkWidget              *hbox;
         GtkWidget              *alignment;
         GtkWidget              *option_hbox;
@@ -484,58 +479,10 @@
 }
 
 static void
-on_a11y_dialog_response (GtkDialog       *dialog,
-                         int              response,
-                         GdmGreeterPanel *panel)
-{
-        g_signal_handlers_disconnect_by_func (dialog,
-                                              on_a11y_dialog_response,
-                                              panel);
-
-        gtk_widget_destroy (GTK_WIDGET (dialog));
-        panel->priv->a11y_dialog = NULL;
-}
-
-static void
-on_a11y_button_clicked (GtkButton       *button,
-                        GdmGreeterPanel *panel)
-{
-        if (panel->priv->a11y_dialog == NULL) {
-                panel->priv->a11y_dialog = gdm_a11y_preferences_dialog_new ();
-                g_signal_connect (panel->priv->a11y_dialog,
-                                  "response",
-                                  G_CALLBACK (on_a11y_dialog_response),
-                                  panel);
-        }
-        gtk_window_present (GTK_WINDOW (panel->priv->a11y_dialog));
-}
-
-static gboolean
-is_a11y_button_disabled (GdmGreeterPanel *panel)
-{
-        GConfClient *client;
-        GError      *error;
-        gboolean     disabled;
-
-        client = gconf_client_get_default ();
-        error = NULL;
-        disabled = gconf_client_get_bool (client, KEY_DISABLE_A11Y_BUTTON, &error);
-        if (error != NULL) {
-                g_debug ("GdmGreeterPanel: unable to get disable-accessibility-button configuration: %s", error->message);
-                g_error_free (error);
-        }
-        g_object_unref (client);
-
-        return disabled;
-}
-
-static void
 gdm_greeter_panel_init (GdmGreeterPanel *panel)
 {
         NaTray    *tray;
-        GtkWidget *image;
         GtkWidget *spacer;
-	AtkObject *atk_obj;
 
         gdm_profile_start (NULL);
 
@@ -560,23 +507,6 @@
         gtk_widget_show (panel->priv->hbox);
         gtk_container_add (GTK_CONTAINER (panel), panel->priv->hbox);
 
-        if (! is_a11y_button_disabled (panel)) {
-                panel->priv->a11y_button = gtk_button_new ();
-                image = gtk_image_new_from_icon_name ("preferences-desktop-accessibility", GTK_ICON_SIZE_BUTTON);
-                gtk_container_add (GTK_CONTAINER (panel->priv->a11y_button), image);
-		atk_obj = gtk_widget_get_accessible (panel->priv->a11y_button);
-		if (GTK_IS_ACCESSIBLE (atk_obj))
-			atk_object_set_name (atk_obj, _("Accessibility Preferences"));
-
-                gtk_widget_show (image);
-                gtk_widget_show (panel->priv->a11y_button);
-                g_signal_connect (G_OBJECT (panel->priv->a11y_button),
-                                  "clicked",
-                                  G_CALLBACK (on_a11y_button_clicked), panel);
-
-                gtk_box_pack_start (GTK_BOX (panel->priv->hbox), panel->priv->a11y_button, FALSE, FALSE, 0);
-        }
-
         panel->priv->alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
         gtk_box_pack_start (GTK_BOX (panel->priv->hbox), panel->priv->alignment, TRUE, TRUE, 0);
         gtk_widget_show (panel->priv->alignment);

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Thu Aug 14 14:30:16 2008
@@ -52,8 +52,6 @@
 data/gdm.schemas.in.in
 gui/simple-chooser/gdm-host-chooser-dialog.c
 gui/simple-chooser/gdm-host-chooser-widget.c
-gui/simple-greeter/gdm-a11y-preferences-dialog.c
-gui/simple-greeter/gdm-a11y-preferences-dialog.glade
 gui/simple-greeter/gdm-cell-renderer-timer.c
 gui/simple-greeter/gdm-chooser-widget.c
 gui/simple-greeter/gdm-clock-widget.c