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

[mccann svn gnome org]

Author: mccann
Date: Thu Feb 14 02:13:33 2008
New Revision: 5761
URL: http://svn.gnome.org/viewvc/gdm?rev=5761&view=rev

Log:
2008-02-13  William Jon McCann  <jmccann redhat com>

	* gui/simple-greeter/gdm-greeter-login-window.c: (do_disconnect),
	(disconnect_button_clicked), (load_theme):
	* gui/simple-greeter/gdm-greeter-login-window.glade:
	Use disconnect stock button.  Hook up to quit.



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

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 14 02:13:33 2008
@@ -292,6 +292,12 @@
 }
 
 static void
+do_disconnect (GdmGreeterLoginWindow *login_window)
+{
+        gtk_main_quit ();
+}
+
+static void
 do_cancel (GdmGreeterLoginWindow *login_window)
 {
 
@@ -500,6 +506,13 @@
         do_cancel (login_window);
 }
 
+static void
+disconnect_button_clicked (GtkButton             *button,
+                           GdmGreeterLoginWindow *login_window)
+{
+        do_disconnect (login_window);
+}
+
 static gboolean
 try_system_stop (DBusGConnection *connection,
                  GError         **error)
@@ -992,6 +1005,9 @@
         button = glade_xml_get_widget (login_window->priv->xml, "cancel-button");
         g_signal_connect (button, "clicked", G_CALLBACK (cancel_button_clicked), login_window);
 
+        button = glade_xml_get_widget (login_window->priv->xml, "disconnect-button");
+        g_signal_connect (button, "clicked", G_CALLBACK (disconnect_button_clicked), login_window);
+
         button = glade_xml_get_widget (login_window->priv->xml, "restart-button");
         g_signal_connect (button, "clicked", G_CALLBACK (restart_button_clicked), login_window);
         button = glade_xml_get_widget (login_window->priv->xml, "shutdown-button");

Modified: trunk/gui/simple-greeter/gdm-greeter-login-window.glade
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-login-window.glade	(original)
+++ trunk/gui/simple-greeter/gdm-greeter-login-window.glade	Thu Feb 14 02:13:33 2008
@@ -82,12 +82,6 @@
                     <property name="type">tab</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                  <packing>
-                    <property name="type">tab</property>
-                  </packing>
-                </child>
               </widget>
             </child>
           </widget>
@@ -116,7 +110,6 @@
                     <child>
                       <widget class="GtkLabel" id="auth-prompt-label">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes"></property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
@@ -176,30 +169,11 @@
               <widget class="GtkButton" id="disconnect-button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">gtk-disconnect</property>
+                <property name="use_stock">True</property>
                 <property name="response_id">0</property>
-                <child>
-                  <widget class="GtkHBox" id="hbox2">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkImage" id="image10">
-                        <property name="visible">True</property>
-                        <property name="pixel_size">16</property>
-                        <property name="icon_name">window-close</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label3">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Disconnect</property>
-                      </widget>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
               </widget>
             </child>
             <child>