debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use a 60 second timeout if format has no seconds

Browse source
This commit is contained in:
Arno Renevier 2010-03-22 21:52:06 +01:00 committed by Christian Dywan
parent 342aaeb2d6
commit 9b9440d49e
1 changed files with 34 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
extensions/status-clock.c
View file

@ -36,6 +36,10 @@ static void
clock_deactivate_cb (MidoriExtension* extension,
MidoriApp* app);
static void
clock_set_timeout (MidoriBrowser* browser,
guint interval);
static gboolean
clock_set_current_time (MidoriBrowser* browser)
{
@ -45,6 +49,7 @@ clock_set_current_time (MidoriBrowser* browser)
struct tm *tm;
time_t rawtime;
char datestring[60];
guint interval;
extension = g_object_get_data (G_OBJECT (browser), "clock-extension");
label = g_object_get_data (G_OBJECT (browser), "clock-label");
@ -55,7 +60,34 @@ clock_set_current_time (MidoriBrowser* browser)
strftime (datestring, 60, format, tm);
gtk_label_set_label (GTK_LABEL (label), datestring);
return TRUE;
if (g_strstr_len (format, -1, "%c")
|| g_strstr_len (format, -1, "%N")
|| g_strstr_len (format, -1, "%s")
|| g_strstr_len (format, -1, "%S")
|| g_strstr_len (format, -1, "%T")
|| g_strstr_len (format, -1, "%X")
)
interval = 1;
else
/* FIXME: Occasionally there are more than 60 seconds in a minute. */
interval = MAX (60 - tm->tm_sec, 1);
clock_set_timeout (browser, interval);
return FALSE;
}
static void
clock_set_timeout (MidoriBrowser* browser,
guint interval)
{
GSource* source;
source = g_timeout_source_new_seconds (interval);
g_source_set_callback (source, (GSourceFunc)clock_set_current_time, browser, NULL);
g_source_attach (source, NULL);
g_object_set_data (G_OBJECT (browser), "clock-timer", source);
g_source_unref (source);
}
static void
@ -75,7 +107,6 @@ clock_app_add_browser_cb (MidoriApp* app,
{
GtkWidget* statusbar;
GtkWidget* label;
GSource* source;
label = gtk_label_new (NULL);
@ -88,13 +119,6 @@ clock_app_add_browser_cb (MidoriApp* app,
clock_set_current_time (browser);
gtk_widget_show (label);
/* FIXME: Use a 60 second timeout depending on format */
source = g_timeout_source_new_seconds (1);
g_source_set_callback (source, (GSourceFunc)clock_set_current_time, browser, NULL);
g_source_attach (source, NULL);
g_object_set_data (G_OBJECT (browser), "clock-timer", source);
g_source_unref (source);
g_object_unref (statusbar);
g_signal_connect (browser, "destroy", G_CALLBACK (clock_browser_destroy_cb), NULL);