gdm r5723 - in trunk: . gui/simple-greeter

[halfline svn gnome org]

Author: halfline
Date: Thu Feb  7 21:14:49 2008
New Revision: 5723
URL: http://svn.gnome.org/viewvc/gdm?rev=5723&view=rev

Log:
2008-02-07  Ray Strode  <rstrode redhat com>

	* gui/simple-greeter/gdm-greeter-login-window.[ch]:
	* gui/simple-greeter/gdm-greeter-session.c:
	drop some signals that aren't used anymore


Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-greeter-login-window.c
   trunk/gui/simple-greeter/gdm-greeter-login-window.h
   trunk/gui/simple-greeter/gdm-greeter-session.c

Modified: trunk/gui/simple-greeter/gdm-greeter-login-window.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-login-window.c	(original)
+++ trunk/gui/simple-greeter/gdm-greeter-login-window.c	Thu Feb  7 21:14:49 2008
@@ -105,10 +105,7 @@
         BEGIN_VERIFICATION,
         BEGIN_VERIFICATION_FOR_USER,
         QUERY_ANSWER,
-        SESSION_SELECTED,
-        LANGUAGE_SELECTED,
         USER_SELECTED,
-        HOSTNAME_SELECTED,
         DISCONNECTED,
         CANCELLED,
         LAST_SIGNAL
@@ -1188,16 +1185,6 @@
                               g_cclosure_marshal_VOID__STRING,
                               G_TYPE_NONE,
                               1, G_TYPE_STRING);
-        signals [LANGUAGE_SELECTED] =
-                g_signal_new ("language-selected",
-                              G_TYPE_FROM_CLASS (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, language_selected),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__STRING,
-                              G_TYPE_NONE,
-                              1, G_TYPE_STRING);
         signals [USER_SELECTED] =
                 g_signal_new ("user-selected",
                               G_TYPE_FROM_CLASS (object_class),
@@ -1208,26 +1195,6 @@
                               g_cclosure_marshal_VOID__STRING,
                               G_TYPE_NONE,
                               1, G_TYPE_STRING);
-        signals [SESSION_SELECTED] =
-                g_signal_new ("session-selected",
-                              G_TYPE_FROM_CLASS (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, session_selected),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__STRING,
-                              G_TYPE_NONE,
-                              1, G_TYPE_STRING);
-        signals [HOSTNAME_SELECTED] =
-                g_signal_new ("hostname-selected",
-                              G_TYPE_FROM_CLASS (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, hostname_selected),
-                              NULL,
-                              NULL,
-                              g_cclosure_marshal_VOID__STRING,
-                              G_TYPE_NONE,
-                              1, G_TYPE_STRING);
         signals [CANCELLED] =
                 g_signal_new ("cancelled",
                               G_TYPE_FROM_CLASS (object_class),

Modified: trunk/gui/simple-greeter/gdm-greeter-login-window.h
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-login-window.h	(original)
+++ trunk/gui/simple-greeter/gdm-greeter-login-window.h	Thu Feb  7 21:14:49 2008
@@ -50,14 +50,8 @@
                                               const char            *username);
         void (* query_answer)                (GdmGreeterLoginWindow *login_window,
                                               const char            *text);
-        void (* session_selected)            (GdmGreeterLoginWindow *login_window,
-                                              const char            *text);
-        void (* language_selected)           (GdmGreeterLoginWindow *login_window,
-                                              const char            *text);
         void (* user_selected)               (GdmGreeterLoginWindow *login_window,
                                               const char            *text);
-        void (* hostname_selected)           (GdmGreeterLoginWindow *login_window,
-                                              const char            *text);
         void (* cancelled)                   (GdmGreeterLoginWindow *login_window);
         void (* disconnected)                (GdmGreeterLoginWindow *login_window);
 

Modified: trunk/gui/simple-greeter/gdm-greeter-session.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-session.c	(original)
+++ trunk/gui/simple-greeter/gdm-greeter-session.c	Thu Feb  7 21:14:49 2008
@@ -179,15 +179,6 @@
 }
 
 static void
-on_select_hostname (GdmGreeterLoginWindow *login_window,
-                    const char            *text,
-                    GdmGreeterSession     *session)
-{
-        gdm_greeter_client_call_select_hostname (session->priv->client,
-                                                 text);
-}
-
-static void
 on_cancelled (GdmGreeterLoginWindow *login_window,
               GdmGreeterSession     *session)
 {
@@ -252,22 +243,10 @@
                                   G_CALLBACK (on_query_answer),
                                   session);
                 g_signal_connect (session->priv->login_window,
-                                  "session-selected",
-                                  G_CALLBACK (on_select_session),
-                                  session);
-                g_signal_connect_swapped (session->priv->login_window,
-                                          "language-selected",
-                                          G_CALLBACK (on_select_language),
-                                          session);
-                g_signal_connect (session->priv->login_window,
                                   "user-selected",
                                   G_CALLBACK (on_select_user),
                                   session);
                 g_signal_connect (session->priv->login_window,
-                                  "hostname-selected",
-                                  G_CALLBACK (on_select_hostname),
-                                  session);
-                g_signal_connect (session->priv->login_window,
                                   "cancelled",
                                   G_CALLBACK (on_cancelled),
                                   session);