[Goodies-commits] r2893 - in xfce4-time-out-plugin/trunk: . panel-plugin
Jannis Pohlmann
jannis at xfce.org
Sun Jul 8 16:39:30 CEST 2007
Author: jannis
Date: 2007-07-08 14:39:30 +0000 (Sun, 08 Jul 2007)
New Revision: 2893
Modified:
xfce4-time-out-plugin/trunk/ChangeLog
xfce4-time-out-plugin/trunk/panel-plugin/time-out-countdown.c
Log:
* panel-plugin/time-out-countdown.c: Properly display remaining
minutes when seconds are not displayed. Fixes bug #3221.
* panel-plugin/*.{c,h}: Fix license headers. The source is
under GPL, not LGPL. Fixes bug #3366.
Modified: xfce4-time-out-plugin/trunk/ChangeLog
===================================================================
--- xfce4-time-out-plugin/trunk/ChangeLog 2007-07-08 14:18:28 UTC (rev 2892)
+++ xfce4-time-out-plugin/trunk/ChangeLog 2007-07-08 14:39:30 UTC (rev 2893)
@@ -1,8 +1,13 @@
2007-07-08 Jannis Pohlmann <jannis at xfce.org>
- * panel-plugin/*.{c,h}: Fix license headers. The source
- is under GPL, not LGPL. Fixes bug #3366.
+ * panel-plugin/time-out-countdown.c: Properly display remaining
+ minutes when seconds are not displayed. Fixes bug #3221.
+2007-07-08 Jannis Pohlmann <jannis at xfce.org>
+
+ * panel-plugin/*.{c,h}: Fix license headers. The source is
+ under GPL, not LGPL. Fixes bug #3366.
+
2007-07-06 Nick Schermer <nick at xfce.org>
* panel-plugin/Makefile.am: Change LDFLAGS to LDADD to fix
Modified: xfce4-time-out-plugin/trunk/panel-plugin/time-out-countdown.c
===================================================================
--- xfce4-time-out-plugin/trunk/panel-plugin/time-out-countdown.c 2007-07-08 14:18:28 UTC (rev 2892)
+++ xfce4-time-out-plugin/trunk/panel-plugin/time-out-countdown.c 2007-07-08 14:39:30 UTC (rev 2893)
@@ -519,30 +519,31 @@
}
else
{
- g_string_printf (str, _("Time left: %d minutes"), minutes + 1);
+ if (seconds == 0)
+ g_string_printf (str, _("Time left: %d minutes"), minutes);
+ else
+ g_string_printf (str, _("Time left: %d minutes"), minutes + 1);
}
}
else if (hours == 1)
{
if (minutes < 1)
- {
- g_string_printf (str, _("Time left: 1 hour 1 minute"));
- }
+ g_string_printf (str, _("Time left: 1 hour 1 minute"));
else
- {
+ if (seconds == 0)
+ g_string_printf (str, _("Time left: 1 hour %d minutes"), minutes);
+ else
g_string_printf (str, _("Time left: 1 hour %d minutes"), minutes + 1);
- }
}
else
{
if (minutes < 1)
- {
- g_string_printf (str, _("Time left: %d hours 1 minute"), hours);
- }
+ g_string_printf (str, _("Time left: %d hours 1 minute"), hours);
else
- {
+ if (seconds == 0)
+ g_string_printf (str, _("Time left: %d hours %d minutes"), hours, minutes);
+ else
g_string_printf (str, _("Time left: %d hours %d minutes"), hours, minutes + 1);
- }
}
}
}
@@ -583,7 +584,10 @@
if (minutes < 1)
g_string_printf (str, _("Time left: 1 minute"));
else
- g_string_printf (str, _("Time left: %d minutes"), minutes + 1);
+ if (seconds == 0)
+ g_string_printf (str, _("Time left: %d minutes"), minutes);
+ else
+ g_string_printf (str, _("Time left: %d minutes"), minutes + 1);
}
}
}
More information about the Goodies-commits
mailing list