Revert "Focus on login dialog after language dialog or layout dialog is closed."

This reverts commit 6def173499c2f0da3306046ebe711757bfbe9d9e.

It was only a stop gap measure until metacity was fixed.

https://bugzilla.gnome.org/show_bug.cgi?id=598235

7 files changed, 0 insertions, 74 deletions

diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c
index ba5c31be..021cd017 100644
--- a/gui/simple-greeter/gdm-greeter-panel.c
+++ b/gui/simple-greeter/gdm-greeter-panel.c
@@ -105,7 +105,6 @@ enum {
         LANGUAGE_SELECTED,
         LAYOUT_SELECTED,
         SESSION_SELECTED,
-        DIALOG_HIDDEN,
         NUMBER_OF_SIGNALS
 };
 
@@ -501,17 +500,6 @@ gdm_greeter_panel_class_init (GdmGreeterPanelClass *klass)
                               G_TYPE_NONE,
                               1, G_TYPE_STRING);
 
-        signals[DIALOG_HIDDEN] =
-                g_signal_new ("dialog-hidden",
-                              G_TYPE_FROM_CLASS (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (GdmGreeterPanelClass, dialog_hidden),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__VOID,
-                              G_TYPE_NONE,
-                              0);
-
         g_object_class_install_property (object_class,
                                          PROP_MONITOR,
                                          g_param_spec_int ("monitor",
@@ -551,14 +539,6 @@ on_language_activated (GdmLanguageOptionWidget *widget,
 }
 
 static void
-on_language_dialog_hidden(GdmLanguageOptionWidget *widget,
-                          GdmGreeterPanel         *panel)
-{
-
-        g_signal_emit (panel, signals[DIALOG_HIDDEN], 0);
-}
-
-static void
 on_layout_activated (GdmLayoutOptionWidget *widget,
                      GdmGreeterPanel       *panel)
 {
@@ -578,15 +558,6 @@ on_layout_activated (GdmLayoutOptionWidget *widget,
 
         g_free (layout);
 }
-
-static void
-on_layout_dialog_hidden (GdmLayoutOptionWidget *widget,
-                         GdmGreeterPanel         *panel)
-{
-
-        g_signal_emit (panel, signals[DIALOG_HIDDEN], 0);
-}
-
 static void
 on_session_activated (GdmSessionOptionWidget *widget,
                       GdmGreeterPanel        *panel)
@@ -885,9 +856,6 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel)
         g_signal_connect (G_OBJECT (panel->priv->language_option_widget),
                           "language-activated",
                           G_CALLBACK (on_language_activated), panel);
-        g_signal_connect (G_OBJECT (panel->priv->language_option_widget),
-                          "dialog-hidden",
-                          G_CALLBACK (on_language_dialog_hidden), panel);
         gtk_box_pack_start (GTK_BOX (panel->priv->option_hbox), panel->priv->language_option_widget, FALSE, FALSE, 6);
         gdm_profile_end ("creating option widget");
 
@@ -895,9 +863,6 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel)
         g_signal_connect (G_OBJECT (panel->priv->layout_option_widget),
                           "layout-activated",
                           G_CALLBACK (on_layout_activated), panel);
-        g_signal_connect (G_OBJECT (panel->priv->layout_option_widget),
-                          "dialog-hidden",
-                          G_CALLBACK (on_layout_dialog_hidden), panel);
         gtk_box_pack_start (GTK_BOX (panel->priv->option_hbox), panel->priv->layout_option_widget, FALSE, FALSE, 6);
 
         panel->priv->session_option_widget = gdm_session_option_widget_new ();
diff --git a/gui/simple-greeter/gdm-greeter-panel.h b/gui/simple-greeter/gdm-greeter-panel.h
index 625c80d8..f7e968fe 100644
--- a/gui/simple-greeter/gdm-greeter-panel.h
+++ b/gui/simple-greeter/gdm-greeter-panel.h
@@ -53,8 +53,6 @@ typedef struct
 
         void (* session_selected)            (GdmGreeterPanel *panel,
                                               const char      *text);
-
-        void (* dialog_hidden)               (GdmGreeterPanel *panel);
 } GdmGreeterPanelClass;
 
 GType                  gdm_greeter_panel_get_type                       (void);
diff --git a/gui/simple-greeter/gdm-greeter-session.c b/gui/simple-greeter/gdm-greeter-session.c
index e7d206a4..41336c63 100644
--- a/gui/simple-greeter/gdm-greeter-session.c
+++ b/gui/simple-greeter/gdm-greeter-session.c
@@ -249,12 +249,6 @@ on_select_layout (GdmGreeterSession      *session,
 }
 
 static void
-on_dialog_hidden (GdmGreeterSession     *session)
-{
-        gtk_window_present (GTK_WINDOW (session->priv->login_window));
-}
-
-static void
 on_select_user (GdmGreeterLoginWindow *login_window,
                 const char            *text,
                 GdmGreeterSession     *session)
@@ -357,11 +351,6 @@ toggle_panel (GdmGreeterSession *session,
                                           G_CALLBACK (on_select_session),
                                           session);
 
-                g_signal_connect_swapped (session->priv->panel,
-                                          "dialog-hidden",
-                                          G_CALLBACK (on_dialog_hidden),
-                                          session);
-
                 gtk_widget_show (session->priv->panel);
         } else {
                 gtk_widget_destroy (session->priv->panel);
diff --git a/gui/simple-greeter/gdm-language-option-widget.c b/gui/simple-greeter/gdm-language-option-widget.c
index fcd0c1db..dc02a7fe 100644
--- a/gui/simple-greeter/gdm-language-option-widget.c
+++ b/gui/simple-greeter/gdm-language-option-widget.c
@@ -50,7 +50,6 @@ struct GdmLanguageOptionWidgetPrivate
 
 enum {
         LANGUAGE_ACTIVATED,
-        DIALOG_HIDDEN,
         NUMBER_OF_SIGNALS
 };
 
@@ -95,7 +94,6 @@ gdm_language_option_widget_hide_dialog (GdmLanguageOptionWidget *widget)
 {
         gtk_widget_destroy (widget->priv->dialog);
         widget->priv->dialog = NULL;
-        g_signal_emit (G_OBJECT (widget), signals[DIALOG_HIDDEN], 0);
 }
 
 static void
@@ -172,16 +170,6 @@ gdm_language_option_widget_class_init (GdmLanguageOptionWidgetClass *klass)
                                                      G_TYPE_NONE,
                                                      0);
 
-        signals[DIALOG_HIDDEN] = g_signal_new ("dialog-hidden",
-                                               G_TYPE_FROM_CLASS (object_class),
-                                               G_SIGNAL_RUN_FIRST,
-                                               G_STRUCT_OFFSET (GdmLanguageOptionWidgetClass, dialog_hidden),
-                                               NULL,
-                                               NULL,
-                                               g_cclosure_marshal_VOID__VOID,
-                                               G_TYPE_NONE,
-                                               0);
-
         g_type_class_add_private (klass, sizeof (GdmLanguageOptionWidgetPrivate));
 }
 
diff --git a/gui/simple-greeter/gdm-language-option-widget.h b/gui/simple-greeter/gdm-language-option-widget.h
index fdbc4e13..2d3e3c7d 100644
--- a/gui/simple-greeter/gdm-language-option-widget.h
+++ b/gui/simple-greeter/gdm-language-option-widget.h
@@ -48,7 +48,6 @@ typedef struct
         GdmRecentOptionWidgetClass    parent_class;
 
         void (* language_activated)        (GdmLanguageOptionWidget *widget);
-        void (* dialog_hidden)             (GdmLanguageOptionWidget *widget);
 } GdmLanguageOptionWidgetClass;
 
 GType                  gdm_language_option_widget_get_type               (void);
diff --git a/gui/simple-greeter/gdm-layout-option-widget.c b/gui/simple-greeter/gdm-layout-option-widget.c
index 57b62195..68a11660 100644
--- a/gui/simple-greeter/gdm-layout-option-widget.c
+++ b/gui/simple-greeter/gdm-layout-option-widget.c
@@ -50,7 +50,6 @@ struct GdmLayoutOptionWidgetPrivate
 
 enum {
         LAYOUT_ACTIVATED,
-        DIALOG_HIDDEN,
         NUMBER_OF_SIGNALS
 };
 
@@ -98,7 +97,6 @@ gdm_layout_option_widget_hide_dialog (GdmLayoutOptionWidget *widget)
 {
         gtk_widget_destroy (widget->priv->dialog);
         widget->priv->dialog = NULL;
-        g_signal_emit (G_OBJECT (widget), signals [DIALOG_HIDDEN], 0);
 }
 
 static void
@@ -175,16 +173,6 @@ gdm_layout_option_widget_class_init (GdmLayoutOptionWidgetClass *klass)
                                                   G_TYPE_NONE,
                                                   0);
 
-        signals[DIALOG_HIDDEN] = g_signal_new ("dialog-hidden",
-                                               G_TYPE_FROM_CLASS (object_class),
-                                               G_SIGNAL_RUN_FIRST,
-                                               G_STRUCT_OFFSET (GdmLayoutOptionWidgetClass, dialog_hidden),
-                                               NULL,
-                                               NULL,
-                                               g_cclosure_marshal_VOID__VOID,
-                                               G_TYPE_NONE,
-                                               0);
-
         g_type_class_add_private (klass, sizeof (GdmLayoutOptionWidgetPrivate));
 }
 
diff --git a/gui/simple-greeter/gdm-layout-option-widget.h b/gui/simple-greeter/gdm-layout-option-widget.h
index abe460e2..8dba3b6a 100644
--- a/gui/simple-greeter/gdm-layout-option-widget.h
+++ b/gui/simple-greeter/gdm-layout-option-widget.h
@@ -48,7 +48,6 @@ typedef struct
         GdmRecentOptionWidgetClass    parent_class;
 
         void (* layout_activated)        (GdmLayoutOptionWidget *widget);
-        void (* dialog_hidden)           (GdmLayoutOptionWidget *widget);
 } GdmLayoutOptionWidgetClass;
 
 GType                  gdm_layout_option_widget_get_type               (void);