Author: juha
Date: 2006-08-26 15:48:24 +0000 (Sat, 26 Aug 2006)
New Revision: 22886
Modified:
xfcalendar/trunk/panel-plugin/orageclock.c
Log:
another trial to fix 2208:
Making strftime to return pure locale string instead of mixed utf8 & locale.
Modified: xfcalendar/trunk/panel-plugin/orageclock.c
===================================================================
--- xfcalendar/trunk/panel-plugin/orageclock.c 2006-08-26 15:34:59 UTC (rev
22885)
+++ xfcalendar/trunk/panel-plugin/orageclock.c 2006-08-26 15:48:24 UTC (rev
22886)
@@ -30,6 +30,7 @@
#include <time.h>
#include <unistd.h>
+#include <glib.h>
#include <gtk/gtk.h>
#include <gdk/gdkevents.h>
@@ -58,7 +59,9 @@
* %Y : four digit year
* %V : ISO week number
*/
- strftime(date_s, 255, _("%A %d %B %Y/%V"), &clock->now);
+ strftime(date_s, 255
+ , g_locale_from_utf8( _("%A %d %B %Y/%V"), -1, NULL, NULL, NULL)
+ , &clock->now);
/* Conversion to utf8 */
if (!g_utf8_validate(date_s, -1, NULL)) {
@@ -93,7 +96,9 @@
for (i = 0; i < OC_MAX_LINES; i++) {
line = &clock->line[i];
if (line->show) {
- strftime(time_s, sizeof(time_s), line->data->str, &clock->now);
+ strftime(time_s, sizeof(time_s)
+ , g_locale_from_utf8(line->data->str, -1, NULL, NULL, NULL)
+ , &clock->now);
if (!g_utf8_validate(time_s, -1, NULL)) {
utf8time_s = g_locale_to_utf8(time_s, -1, NULL, NULL, NULL);
if (utf8time_s) {
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
