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

[halfline svn gnome org]

Author: halfline
Date: Thu Feb  7 20:55:25 2008
New Revision: 5721
URL: http://svn.gnome.org/viewvc/gdm?rev=5721&view=rev

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

	* gui/simple-greeter/gdm-greeter-login-window.c
	(struct GdmGreeterLoginWindowPrivate), (update_clock),
	(set_clock_timeout), (update_clock_timeout_cb),
	(remove_clock_timeout), (get_time_format):
	* gui/simple-greeter/gdm-greeter-login-window.glade:
	Remove clock from login dialog since its on panel now


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  7 20:55:25 2008
@@ -92,8 +92,6 @@
         GtkWidget       *user_chooser;
         gboolean         display_is_local;
         char            *timeformat;
-        guint            update_clock_id;
-        gboolean         clock_show_seconds;
 
         guint            animation_timeout_id;
 };
@@ -122,8 +120,6 @@
 static void     gdm_greeter_login_window_init         (GdmGreeterLoginWindow      *greeter_login_window);
 static void     gdm_greeter_login_window_finalize     (GObject                    *object);
 
-static gboolean update_clock_timeout_cb               (GdmGreeterLoginWindow *login_window);
-
 G_DEFINE_TYPE (GdmGreeterLoginWindow, gdm_greeter_login_window, GTK_TYPE_WINDOW)
 
 static void
@@ -799,83 +795,6 @@
         do_cancel (login_window);
 }
 
-static void
-update_clock (GtkLabel   *label,
-              const char *format)
-{
-        time_t     t;
-        struct tm *tm;
-        char       buf[256];
-        char      *utf8;
-
-        time (&t);
-        tm = localtime (&t);
-        if (tm == NULL) {
-                g_warning ("Unable to get broken down local time");
-                return;
-        }
-        if (strftime (buf, sizeof (buf), format, tm) == 0) {
-                g_warning ("Couldn't format time: %s", format);
-                strcpy (buf, "???");
-        }
-        utf8 = g_locale_to_utf8 (buf, -1, NULL, NULL, NULL);
-        gtk_label_set_text (label, utf8);
-        g_free (utf8);
-}
-
-static void
-set_clock_timeout (GdmGreeterLoginWindow *login_window,
-                   time_t                 now)
-{
-        struct timeval tv;
-        int            timeouttime;
-
-        if (login_window->priv->update_clock_id > 0) {
-                g_source_remove (login_window->priv->update_clock_id);
-                login_window->priv->update_clock_id = 0;
-        }
-
-        gettimeofday (&tv, NULL);
-        timeouttime = (G_USEC_PER_SEC - tv.tv_usec) / 1000 + 1;
-
-        /* timeout of one minute if we don't care about the seconds */
-        if (! login_window->priv->clock_show_seconds) {
-                timeouttime += 1000 * (59 - now % 60);
-        }
-
-        login_window->priv->update_clock_id = g_timeout_add (timeouttime,
-                                                             (GSourceFunc)update_clock_timeout_cb,
-                                                             login_window);
-
-}
-
-static gboolean
-update_clock_timeout_cb (GdmGreeterLoginWindow *login_window)
-{
-        GtkWidget *label;
-        time_t     new_time;
-
-        time (&new_time);
-
-        label = glade_xml_get_widget (login_window->priv->xml, "computer-info-time-label");
-        if (label != NULL) {
-                update_clock (GTK_LABEL (label), login_window->priv->timeformat);
-        }
-
-        set_clock_timeout (login_window, new_time);
-
-        return FALSE;
-}
-
-static void
-remove_clock_timeout (GdmGreeterLoginWindow *login_window)
-{
-        if (login_window->priv->update_clock_id > 0) {
-                g_source_remove (login_window->priv->update_clock_id);
-                login_window->priv->update_clock_id = 0;
-        }
-}
-
 static gboolean
 on_computer_info_label_button_press (GtkWidget             *widget,
                                      GdkEventButton        *event,
@@ -884,7 +803,6 @@
         GtkWidget *notebook;
         int        current_page;
         int        n_pages;
-        GtkWidget *label;
 
         /* switch page */
         notebook = glade_xml_get_widget (login_window->priv->xml, "computer-info-notebook");
@@ -897,16 +815,6 @@
                 gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 0);
         }
 
-        /* if the clock is visible then start it */
-        label = glade_xml_get_widget (login_window->priv->xml, "computer-info-time-label");
-        if (gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook)) == gtk_notebook_page_num (GTK_NOTEBOOK (notebook), label)) {
-                time_t now;
-                time (&now);
-                set_clock_timeout (login_window, now);
-        } else {
-                remove_clock_timeout (login_window);
-        }
-
         return FALSE;
 }
 
@@ -987,35 +895,6 @@
         return version;
 }
 
-static char *
-get_time_format (GdmGreeterLoginWindow *login_window)
-{
-        const char *time_format;
-        const char *date_format;
-        char       *clock_format;
-        char       *result;
-
-        time_format = login_window->priv->clock_show_seconds ? _("%l:%M:%S %p") : _("%l:%M %p");
-        /* translators: replace %e with %d if, when the day of the
-         *              month as a decimal number is a single digit, it
-         *              should begin with a 0 in your locale (e.g. "May
-         *              01" instead of "May  1").
-         */
-        date_format = _("%a %b %e");
-        /* translators: reverse the order of these arguments
-         *              if the time should come before the
-         *              date on a clock in your locale.
-         */
-        clock_format = g_strdup_printf (_("%1$s, %2$s"),
-                                        date_format,
-                                        time_format);
-
-        result = g_locale_from_utf8 (clock_format, -1, NULL, NULL, NULL);
-        g_free (clock_format);
-
-        return result;
-}
-
 static void
 create_computer_info (GdmGreeterLoginWindow *login_window)
 {
@@ -1033,13 +912,6 @@
                 gtk_label_set_text (GTK_LABEL (label), version);
                 g_free (version);
         }
-
-
-        label = glade_xml_get_widget (login_window->priv->xml, "computer-info-time-label");
-        if (label != NULL) {
-                login_window->priv->timeformat = get_time_format (login_window);
-                update_clock (GTK_LABEL (label), login_window->priv->timeformat);
-        }
 }
 
 #define INVISIBLE_CHAR_DEFAULT       '*'
@@ -1392,8 +1264,6 @@
 {
         login_window->priv = GDM_GREETER_LOGIN_WINDOW_GET_PRIVATE (login_window);
 
-        login_window->priv->clock_show_seconds = TRUE;
-
         gtk_window_set_opacity (GTK_WINDOW (login_window), 0.85);
         gtk_window_set_position (GTK_WINDOW (login_window), GTK_WIN_POS_CENTER_ALWAYS);
         gtk_window_set_deletable (GTK_WINDOW (login_window), FALSE);
@@ -1416,8 +1286,6 @@
 
         g_return_if_fail (login_window->priv != NULL);
 
-        remove_clock_timeout (login_window);
-
         G_OBJECT_CLASS (gdm_greeter_login_window_parent_class)->finalize (object);
 }
 

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  7 20:55:25 2008
@@ -83,15 +83,6 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="computer-info-time-label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes"></property>
-                  </widget>
-                  <packing>
-                    <property name="position">4</property>
-                  </packing>
-                </child>
-                <child>
                   <placeholder/>
                   <packing>
                     <property name="type">tab</property>