[Xfce4-commits] r23083 - in libxfcegui4/trunk: . libxfcegui4

Olivier Fourdan olivier at xfce.org
Mon Sep 4 20:41:30 UTC 2006


Author: olivier
Date: 2006-09-04 20:41:19 +0000 (Mon, 04 Sep 2006)
New Revision: 23083

Modified:
   libxfcegui4/trunk/ChangeLog
   libxfcegui4/trunk/libxfcegui4/xfce_clock.c
   libxfcegui4/trunk/libxfcegui4/xfce_clock.h
Log:
Clock widget enhancements, patch from Tim Baga <fester at verbdev.com> (bug #2264)

Modified: libxfcegui4/trunk/ChangeLog
===================================================================
--- libxfcegui4/trunk/ChangeLog	2006-09-04 19:35:02 UTC (rev 23082)
+++ libxfcegui4/trunk/ChangeLog	2006-09-04 20:41:19 UTC (rev 23083)
@@ -1,3 +1,914 @@
+2006-07-08 19:39  olivier
+
+	* libxfcegui4/netk-tasklist.c: Small cleanup in libxfcegui4 (patch
+	  from Nick Schermer <nick at xfce.org>, bug #1952)
+
+2006-06-15 21:22  olivier
+
+	* docs/tmpl/dialogs.sgml, docs/tmpl/netk-window.sgml,
+	  libxfcegui4/netk-tasklist.c, libxfcegui4/netk-xutils.c: Fixes
+	  ported from libwnck by Nick Schermer <nick at xfce.org> (Bug #1874)
+
+2006-06-12 14:26  hydonsingore
+
+	* po/ChangeLog, po/zh_TW.po, mousepad/trunk/po/ChangeLog,
+	  mousepad/trunk/po/zh_TW.po, terminal/trunk/po/ChangeLog,
+	  terminal/trunk/po/zh_TW.po, thunar/trunk/po/ChangeLog,
+	  thunar/trunk/po/zh_TW.po, xfcalendar/trunk/po/ChangeLog,
+	  xfcalendar/trunk/po/zh_TW.po,
+	  xfce-mcs-manager/trunk/po/ChangeLog,
+	  xfce-mcs-manager/trunk/po/zh_TW.po,
+	  xfce-mcs-plugins/trunk/po/ChangeLog,
+	  xfce-mcs-plugins/trunk/po/zh_TW.po,
+	  xfce-utils/trunk/po/ChangeLog, xfce-utils/trunk/po/zh_TW.po,
+	  xfce4-appfinder/trunk/po/ChangeLog,
+	  xfce4-appfinder/trunk/po/zh_TW.po,
+	  xfce4-icon-theme/trunk/po/ChangeLog,
+	  xfce4-icon-theme/trunk/po/zh_TW.po,
+	  xfce4-mailwatch-plugin/trunk/po/ChangeLog,
+	  xfce4-mailwatch-plugin/trunk/po/zh_TW.po,
+	  xfce4-mixer/trunk/po/ChangeLog, xfce4-mixer/trunk/po/zh_TW.po,
+	  xfce4-panel/trunk/po/ChangeLog, xfce4-panel/trunk/po/zh_TW.po,
+	  xfce4-session/trunk/po/ChangeLog,
+	  xfce4-session/trunk/po/zh_TW.po,
+	  xfce4-trigger-launcher/trunk/po/ChangeLog,
+	  xfce4-trigger-launcher/trunk/po/zh_TW.po,
+	  xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/zh_TW.po,
+	  xfmedia/trunk/po/ChangeLog, xfmedia/trunk/po/zh_TW.po,
+	  xfprint/trunk/po/ChangeLog, xfprint/trunk/po/zh_TW.po,
+	  xfwm4/trunk/po/ChangeLog, xfwm4/trunk/po/zh_TW.po: Update
+	  traditional Chinese translations; Modify personal e-mail address.
+
+2006-06-04 12:02  olivier
+
+	* libxfcegui4/netk-xutils.c: Fix bug in 64-bit
+
+2006-06-04 08:12  eulex
+
+	* libexo/trunk/po/ChangeLog, po/ChangeLog,
+	  terminal/trunk/po/ChangeLog, thunar/trunk/po/ChangeLog,
+	  xfcalendar/trunk/po/ChangeLog,
+	  xfce-mcs-manager/trunk/po/ChangeLog,
+	  xfce-mcs-plugins/trunk/po/ChangeLog,
+	  xfce-utils/trunk/po/ChangeLog,
+	  xfce4-appfinder/trunk/po/ChangeLog,
+	  xfce4-mixer/trunk/po/ChangeLog, xfce4-panel/trunk/po/ChangeLog,
+	  xfce4-session/trunk/po/ChangeLog,
+	  xfce4-trigger-launcher/trunk/po/ChangeLog,
+	  xfdesktop/trunk/po/ChangeLog, xfwm4/trunk/po/ChangeLog:
+	  Changelogs for appfinder, exo, utils, mcs-plugins, mcs-manager,
+	  xfce4-session, xfce4-mixer, thunar, libgui, xfwm4, the panel,
+	  orage, trigger-launcher and terminal updated.
+	  Also couldn't resist to fix a small error in the xfce4-mixer
+	  Changelog.
+	  Didn't updated the changelog of xfprint, because I discovered
+	  that that translation wasn't updated, it had just slipped through
+	  the commit by mistake.
+
+2006-06-04 00:10  eulex
+
+	* po/sv.po, thunar/trunk/po/sv.po, xfcalendar/trunk/po/sv.po,
+	  xfce-mcs-plugins/trunk/po/sv.po, xfce-utils/trunk/po/sv.po,
+	  xfce4-panel/trunk/po/sv.po, xfce4-session/trunk/po/sv.po,
+	  xfdesktop/trunk/po/sv.po, xfprint/trunk/po/sv.po,
+	  xfwm4/trunk/po/sv.po: obsolete strings in the swedish
+	  translations removed
+
+2006-06-03 23:44  eulex
+
+	* libexo/trunk/po/LINGUAS, libexo/trunk/po/sv.po, po/sv.po,
+	  terminal/trunk/po/LINGUAS, terminal/trunk/po/sv.po,
+	  thunar/trunk/po/sv.po, xfcalendar/trunk/po/sv.po,
+	  xfce-mcs-manager/trunk/po/sv.po,
+	  xfce-mcs-plugins/trunk/po/sv.po, xfce-utils/trunk/po/sv.po,
+	  xfce4-appfinder/trunk/po/sv.po, xfce4-mixer/trunk/po/sv.po,
+	  xfce4-panel/trunk/po/sv.po, xfce4-session/trunk/po/sv.po,
+	  xfce4-trigger-launcher/trunk/po/sv.po, xfdesktop/trunk/po/sv.po,
+	  xfprint/trunk/po/sv.po, xfwm4/trunk/po/sv.po: Merged Swedish
+	  translations (by me and Jens Hagerman) into the xfce svn.
+	  This includes updated translations of appfinder, xfce-utils,
+	  mcs-plugins,
+	  xfprint, xfce4-session, xfce4-mixer, thunar, libxfcegui4, xfwm4,
+	  xfce4-panel, xfdesktop, orage, xfce4-trigger-launcher and
+	  mcs-manager,
+	  and added translations for libexo and terminal.
+	  The appropriate LINGUAS files were also updated.
+
+2006-05-29 13:02  benny
+
+	* libxfcegui4/xfce_clock.c: Move clock data to text. Patch from
+	  Nick Schermer <nick at xfce.org>.
+	  Bug #1865.
+
+2006-05-29 12:18  benny
+
+	* docs/tmpl/xfce-icontheme.sgml,
+	  docs/tmpl/xfce-titled-dialog.sgml, libxfcegui4/gtk_style.c,
+	  libxfcegui4/xfce_decorbutton.c, libxfcegui4/xfce_decortoggle.c,
+	  libxfcegui4/xfce_movehandler.c: Apply patch from Nick Schermer
+	  <nick at xfce.org> to reduce unshareable
+	  data size of the library. Bug #1865.
+
+2006-05-25 18:48  pollux
+
+	* po/fr.po: update FR translations
+
+2006-05-25 07:02  kelnos
+
+	* libxfcegui4/icons.c, libxfcegui4/icons.h: add
+	  XFCE_ICON_CATEGORY_OFFICE, and some more icon matches for a
+	  bunch of
+	  the categories, patch by daniele favara (bug 1847)
+
+2006-05-23 22:00  olivier
+
+	* libxfcegui4/xfce_systemtray.c: Remove and recreate a new socket
+	  if one is found, instead of just ignoring the request. That
+	  seems to fix a problem with krusader (Fix bug #1836). Also clean
+	  up some #ifdefs for older pre-gtk+-2.2.
+
+2006-05-23 12:28  piarres
+
+	* po/eu.po: [l10n:eu] Basque translation update
+
+2006-05-23 02:45  daichi
+
+	* libexo/trunk/po/ChangeLog, libexo/trunk/po/fi.po,
+	  libxfce4util/trunk/po/ChangeLog, libxfce4util/trunk/po/fi.po,
+	  libxfcegui4/branches/xfce_4_2/po/ChangeLog,
+	  libxfcegui4/branches/xfce_4_2/po/fi.po, po/ChangeLog, po/fi.po,
+	  mousepad/trunk/po/ChangeLog, mousepad/trunk/po/fi.po,
+	  terminal/trunk/po/ChangeLog, terminal/trunk/po/fi.po,
+	  thunar/trunk/po/ChangeLog, thunar/trunk/po/fi.po,
+	  xfcalendar/branches/xfce_4_2/po/ChangeLog,
+	  xfcalendar/trunk/po/ChangeLog, xfcalendar/trunk/po/fi.po,
+	  xfce-mcs-manager/branches/xfce_4_2/po/ChangeLog,
+	  xfce-mcs-manager/branches/xfce_4_2/po/fi.po,
+	  xfce-mcs-manager/trunk/po/ChangeLog,
+	  xfce-mcs-manager/trunk/po/fi.po,
+	  xfce-mcs-plugins/branches/xfce_4_2/po/ChangeLog,
+	  xfce-mcs-plugins/branches/xfce_4_2/po/fi.po,
+	  xfce-mcs-plugins/trunk/po/ChangeLog,
+	  xfce-mcs-plugins/trunk/po/fi.po,
+	  xfce-utils/branches/xfce_4_2/po/ChangeLog,
+	  xfce-utils/branches/xfce_4_2/po/fi.po,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.az,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.ca,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.de,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.es,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.eu,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.fi,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.fr,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.he,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.az,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.ca,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.de,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.es,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.eu,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.fi,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.fr,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.it,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.ja,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.lt,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.ro,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.ru,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.sk,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.vi,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.html.zh_TW,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.it,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.ja,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.lt,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.ro,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.ru,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.sk,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.uk,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.vi,
+	  xfce-utils/branches/xfce_4_2/xfce4-about/AUTHORS.zh_TW,
+	  xfce-utils/trunk/po/ChangeLog, xfce-utils/trunk/po/fi.po,
+	  xfce-utils/trunk/xfce4-about/AUTHORS,
+	  xfce4-appfinder/branches/xfce_4_2/po/ChangeLog,
+	  xfce4-appfinder/branches/xfce_4_2/po/fi.po,
+	  xfce4-appfinder/trunk/po/ChangeLog,
+	  xfce4-appfinder/trunk/po/fi.po,
+	  xfce4-icon-theme/trunk/po/ChangeLog,
+	  xfce4-icon-theme/trunk/po/fi.po,
+	  xfce4-iconbox/branches/xfce_4_2/po/fi.po,
+	  xfce4-mailwatch-plugin/trunk/po/fi.po,
+	  xfce4-mixer/branches/xfce_4_2/po/ChangeLog,
+	  xfce4-mixer/branches/xfce_4_2/po/fi.po,
+	  xfce4-mixer/trunk/po/ChangeLog, xfce4-mixer/trunk/po/fi.po,
+	  xfce4-panel/branches/xfce_4_2/po/ChangeLog,
+	  xfce4-panel/branches/xfce_4_2/po/fi.po,
+	  xfce4-panel/trunk/po/ChangeLog, xfce4-panel/trunk/po/fi.po,
+	  xfce4-session/branches/xfce_4_2/po/ChangeLog,
+	  xfce4-session/branches/xfce_4_2/po/fi.po,
+	  xfce4-session/trunk/po/ChangeLog, xfce4-session/trunk/po/fi.po,
+	  xfce4-toys/branches/xfce_4_2/po/ChangeLog,
+	  xfce4-toys/branches/xfce_4_2/po/fi.po,
+	  xfce4-trigger-launcher/branches/xfce_4_2/po/ChangeLog,
+	  xfce4-trigger-launcher/branches/xfce_4_2/po/fi.po,
+	  xfce4-trigger-launcher/trunk/po/ChangeLog,
+	  xfce4-trigger-launcher/trunk/po/fi.po,
+	  xfdesktop/branches/xfce_4_2/po/ChangeLog,
+	  xfdesktop/branches/xfce_4_2/po/fi.po,
+	  xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/fi.po,
+	  xffm/branches/xfce_4_2/po/ChangeLog,
+	  xffm/branches/xfce_4_2/po/fi.po, xfmedia/trunk/po/fi.po,
+	  xfprint/branches/xfce_4_2/po/ChangeLog,
+	  xfprint/branches/xfce_4_2/po/fi.po, xfprint/trunk/po/ChangeLog,
+	  xfprint/trunk/po/fi.po, xfwm4/branches/xfce_4_2/po/ChangeLog,
+	  xfwm4/branches/xfce_4_2/po/fi.po, xfwm4/trunk/po/ChangeLog,
+	  xfwm4/trunk/po/fi.po: Changed an address.
+
+2006-05-11 08:53  benny
+
+	* libxfcegui4/xfce-startup-notification.c: Fix compiler warning.
+	  Bug #1790.
+
+2006-05-06 22:56  benny
+
+	* libxfcegui4/xfce_aboutdialog.c: Use XfceHeading for the about
+	  dialog.
+
+2006-05-06 09:23  sas
+
+	* po/hu.po, terminal/trunk/po/hu.po, xfburn/trunk/po/hu.po: hu
+	  trunk: terminal gui & burn fixes
+
+2006-05-05 21:25  daichi
+
+	* libexo/trunk/po/ChangeLog, libexo/trunk/po/cs.po, po/ChangeLog,
+	  po/cs.po, xfce4-trigger-launcher/trunk/po/ChangeLog,
+	  xfce4-trigger-launcher/trunk/po/cs.po,
+	  xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/cs.po,
+	  xfprint/trunk/po/ChangeLog, xfprint/trunk/po/cs.po,
+	  xfwm4/trunk/po/ChangeLog, xfwm4/trunk/po/cs.po: Updated Czech
+	  translations by Michal Varady <miko.vaji at gmail.com>.
+
+2006-05-05 21:01  daichi
+
+	* po/be.po, po/bn_IN.po, po/ca.po, po/cs.po, po/de.po, po/el.po,
+	  po/en_GB.po, po/eo.po, po/es.po, po/et.po, po/eu.po, po/fa.po,
+	  po/fi.po, po/fr.po, po/gu.po, po/he.po, po/hu.po, po/hy.po,
+	  po/it.po, po/ja.po, po/ko.po, po/libxfcegui4.pot, po/lt.po,
+	  po/mr.po, po/nl.po, po/pa.po, po/pl.po, po/pt_BR.po, po/ro.po,
+	  po/ru.po, po/sk.po, po/sv.po, po/ta.po, po/uk.po, po/zh_CN.po,
+	  po/zh_TW.po, xfcalendar/trunk/po/ar.po,
+	  xfcalendar/trunk/po/az.po, xfcalendar/trunk/po/be.po,
+	  xfcalendar/trunk/po/bg.po, xfcalendar/trunk/po/bn_IN.po,
+	  xfcalendar/trunk/po/ca.po, xfcalendar/trunk/po/cs.po,
+	  xfcalendar/trunk/po/de.po, xfcalendar/trunk/po/el.po,
+	  xfcalendar/trunk/po/en_GB.po, xfcalendar/trunk/po/eo.po,
+	  xfcalendar/trunk/po/es.po, xfcalendar/trunk/po/et.po,
+	  xfcalendar/trunk/po/eu.po, xfcalendar/trunk/po/fa.po,
+	  xfcalendar/trunk/po/fi.po, xfcalendar/trunk/po/fr.po,
+	  xfcalendar/trunk/po/gu.po, xfcalendar/trunk/po/he.po,
+	  xfcalendar/trunk/po/hi.po, xfcalendar/trunk/po/hu.po,
+	  xfcalendar/trunk/po/hy.po, xfcalendar/trunk/po/it.po,
+	  xfcalendar/trunk/po/ja.po, xfcalendar/trunk/po/ko.po,
+	  xfcalendar/trunk/po/lt.po, xfcalendar/trunk/po/mr.po,
+	  xfcalendar/trunk/po/ms.po, xfcalendar/trunk/po/nb_NO.po,
+	  xfcalendar/trunk/po/nl.po, xfcalendar/trunk/po/orage.pot,
+	  xfcalendar/trunk/po/pa.po, xfcalendar/trunk/po/pl.po,
+	  xfcalendar/trunk/po/pt_BR.po, xfcalendar/trunk/po/pt_PT.po,
+	  xfcalendar/trunk/po/ro.po, xfcalendar/trunk/po/ru.po,
+	  xfcalendar/trunk/po/sk.po, xfcalendar/trunk/po/sv.po,
+	  xfcalendar/trunk/po/ta.po, xfcalendar/trunk/po/tr.po,
+	  xfcalendar/trunk/po/uk.po, xfcalendar/trunk/po/vi.po,
+	  xfcalendar/trunk/po/zh_CN.po, xfcalendar/trunk/po/zh_TW.po,
+	  xfce-mcs-manager/trunk/po/ar.po,
+	  xfce-mcs-manager/trunk/po/az.po,
+	  xfce-mcs-manager/trunk/po/be.po,
+	  xfce-mcs-manager/trunk/po/bg.po,
+	  xfce-mcs-manager/trunk/po/bn_IN.po,
+	  xfce-mcs-manager/trunk/po/ca.po,
+	  xfce-mcs-manager/trunk/po/cs.po,
+	  xfce-mcs-manager/trunk/po/el.po,
+	  xfce-mcs-manager/trunk/po/en_GB.po,
+	  xfce-mcs-manager/trunk/po/eo.po,
+	  xfce-mcs-manager/trunk/po/es.po,
+	  xfce-mcs-manager/trunk/po/es_MX.po,
+	  xfce-mcs-manager/trunk/po/et.po,
+	  xfce-mcs-manager/trunk/po/eu.po,
+	  xfce-mcs-manager/trunk/po/fa.po,
+	  xfce-mcs-manager/trunk/po/fi.po,
+	  xfce-mcs-manager/trunk/po/fr.po,
+	  xfce-mcs-manager/trunk/po/gu.po,
+	  xfce-mcs-manager/trunk/po/he.po,
+	  xfce-mcs-manager/trunk/po/hi.po,
+	  xfce-mcs-manager/trunk/po/hu.po,
+	  xfce-mcs-manager/trunk/po/it.po,
+	  xfce-mcs-manager/trunk/po/ja.po,
+	  xfce-mcs-manager/trunk/po/ko.po,
+	  xfce-mcs-manager/trunk/po/lt.po,
+	  xfce-mcs-manager/trunk/po/mr.po,
+	  xfce-mcs-manager/trunk/po/ms.po,
+	  xfce-mcs-manager/trunk/po/nb_NO.po,
+	  xfce-mcs-manager/trunk/po/nl.po,
+	  xfce-mcs-manager/trunk/po/pa.po,
+	  xfce-mcs-manager/trunk/po/pl.po,
+	  xfce-mcs-manager/trunk/po/pt_BR.po,
+	  xfce-mcs-manager/trunk/po/pt_PT.po,
+	  xfce-mcs-manager/trunk/po/ro.po,
+	  xfce-mcs-manager/trunk/po/ru.po,
+	  xfce-mcs-manager/trunk/po/sk.po,
+	  xfce-mcs-manager/trunk/po/sv.po,
+	  xfce-mcs-manager/trunk/po/ta.po,
+	  xfce-mcs-manager/trunk/po/tr.po,
+	  xfce-mcs-manager/trunk/po/uk.po,
+	  xfce-mcs-manager/trunk/po/vi.po,
+	  xfce-mcs-manager/trunk/po/zh_CN.po,
+	  xfce-mcs-manager/trunk/po/zh_TW.po,
+	  xfce-mcs-plugins/trunk/po/ar.po,
+	  xfce-mcs-plugins/trunk/po/az.po,
+	  xfce-mcs-plugins/trunk/po/be.po,
+	  xfce-mcs-plugins/trunk/po/bg.po,
+	  xfce-mcs-plugins/trunk/po/bn_IN.po,
+	  xfce-mcs-plugins/trunk/po/ca.po,
+	  xfce-mcs-plugins/trunk/po/cs.po,
+	  xfce-mcs-plugins/trunk/po/de.po,
+	  xfce-mcs-plugins/trunk/po/el.po,
+	  xfce-mcs-plugins/trunk/po/en_GB.po,
+	  xfce-mcs-plugins/trunk/po/eo.po,
+	  xfce-mcs-plugins/trunk/po/es.po,
+	  xfce-mcs-plugins/trunk/po/es_MX.po,
+	  xfce-mcs-plugins/trunk/po/et.po,
+	  xfce-mcs-plugins/trunk/po/eu.po,
+	  xfce-mcs-plugins/trunk/po/fa.po,
+	  xfce-mcs-plugins/trunk/po/fi.po,
+	  xfce-mcs-plugins/trunk/po/fr.po,
+	  xfce-mcs-plugins/trunk/po/gu.po,
+	  xfce-mcs-plugins/trunk/po/he.po,
+	  xfce-mcs-plugins/trunk/po/hi.po,
+	  xfce-mcs-plugins/trunk/po/hu.po,
+	  xfce-mcs-plugins/trunk/po/it.po,
+	  xfce-mcs-plugins/trunk/po/ja.po,
+	  xfce-mcs-plugins/trunk/po/ko.po,
+	  xfce-mcs-plugins/trunk/po/lt.po,
+	  xfce-mcs-plugins/trunk/po/mr.po,
+	  xfce-mcs-plugins/trunk/po/ms.po,
+	  xfce-mcs-plugins/trunk/po/nl.po,
+	  xfce-mcs-plugins/trunk/po/pa.po,
+	  xfce-mcs-plugins/trunk/po/pl.po,
+	  xfce-mcs-plugins/trunk/po/pt_BR.po,
+	  xfce-mcs-plugins/trunk/po/pt_PT.po,
+	  xfce-mcs-plugins/trunk/po/ro.po,
+	  xfce-mcs-plugins/trunk/po/ru.po,
+	  xfce-mcs-plugins/trunk/po/sk.po,
+	  xfce-mcs-plugins/trunk/po/sv.po,
+	  xfce-mcs-plugins/trunk/po/ta.po,
+	  xfce-mcs-plugins/trunk/po/tr.po,
+	  xfce-mcs-plugins/trunk/po/uk.po,
+	  xfce-mcs-plugins/trunk/po/vi.po,
+	  xfce-mcs-plugins/trunk/po/zh_CN.po,
+	  xfce-mcs-plugins/trunk/po/zh_TW.po, xfce-utils/trunk/po/af.po,
+	  xfce-utils/trunk/po/ar.po, xfce-utils/trunk/po/az.po,
+	  xfce-utils/trunk/po/be.po, xfce-utils/trunk/po/bg.po,
+	  xfce-utils/trunk/po/bn_IN.po, xfce-utils/trunk/po/ca.po,
+	  xfce-utils/trunk/po/cs.po, xfce-utils/trunk/po/de.po,
+	  xfce-utils/trunk/po/el.po, xfce-utils/trunk/po/en_GB.po,
+	  xfce-utils/trunk/po/eo.po, xfce-utils/trunk/po/es.po,
+	  xfce-utils/trunk/po/es_MX.po, xfce-utils/trunk/po/et.po,
+	  xfce-utils/trunk/po/eu.po, xfce-utils/trunk/po/fa.po,
+	  xfce-utils/trunk/po/fi.po, xfce-utils/trunk/po/fr.po,
+	  xfce-utils/trunk/po/gu.po, xfce-utils/trunk/po/he.po,
+	  xfce-utils/trunk/po/hi.po, xfce-utils/trunk/po/hu.po,
+	  xfce-utils/trunk/po/hy.po, xfce-utils/trunk/po/it.po,
+	  xfce-utils/trunk/po/ja.po, xfce-utils/trunk/po/ko.po,
+	  xfce-utils/trunk/po/lt.po, xfce-utils/trunk/po/mr.po,
+	  xfce-utils/trunk/po/ms.po, xfce-utils/trunk/po/nl.po,
+	  xfce-utils/trunk/po/pa.po, xfce-utils/trunk/po/pl.po,
+	  xfce-utils/trunk/po/pt_BR.po, xfce-utils/trunk/po/pt_PT.po,
+	  xfce-utils/trunk/po/ro.po, xfce-utils/trunk/po/ru.po,
+	  xfce-utils/trunk/po/sk.po, xfce-utils/trunk/po/sv.po,
+	  xfce-utils/trunk/po/ta.po, xfce-utils/trunk/po/tr.po,
+	  xfce-utils/trunk/po/uk.po, xfce-utils/trunk/po/vi.po,
+	  xfce-utils/trunk/po/xfce-utils.pot,
+	  xfce-utils/trunk/po/zh_CN.po, xfce-utils/trunk/po/zh_TW.po,
+	  xfce4-appfinder/trunk/po/be.po,
+	  xfce4-appfinder/trunk/po/bn_IN.po,
+	  xfce4-appfinder/trunk/po/ca.po, xfce4-appfinder/trunk/po/cs.po,
+	  xfce4-appfinder/trunk/po/de.po, xfce4-appfinder/trunk/po/el.po,
+	  xfce4-appfinder/trunk/po/en_GB.po,
+	  xfce4-appfinder/trunk/po/es.po,
+	  xfce4-appfinder/trunk/po/es_MX.po,
+	  xfce4-appfinder/trunk/po/et.po, xfce4-appfinder/trunk/po/eu.po,
+	  xfce4-appfinder/trunk/po/fa.po, xfce4-appfinder/trunk/po/fi.po,
+	  xfce4-appfinder/trunk/po/fr.po, xfce4-appfinder/trunk/po/gu.po,
+	  xfce4-appfinder/trunk/po/he.po, xfce4-appfinder/trunk/po/hu.po,
+	  xfce4-appfinder/trunk/po/hy.po, xfce4-appfinder/trunk/po/it.po,
+	  xfce4-appfinder/trunk/po/ja.po, xfce4-appfinder/trunk/po/ko.po,
+	  xfce4-appfinder/trunk/po/lt.po, xfce4-appfinder/trunk/po/mr.po,
+	  xfce4-appfinder/trunk/po/nl.po, xfce4-appfinder/trunk/po/pa.po,
+	  xfce4-appfinder/trunk/po/pl.po,
+	  xfce4-appfinder/trunk/po/pt_BR.po,
+	  xfce4-appfinder/trunk/po/pt_PT.po,
+	  xfce4-appfinder/trunk/po/ro.po, xfce4-appfinder/trunk/po/ru.po,
+	  xfce4-appfinder/trunk/po/sk.po, xfce4-appfinder/trunk/po/sv.po,
+	  xfce4-appfinder/trunk/po/tr.po, xfce4-appfinder/trunk/po/uk.po,
+	  xfce4-appfinder/trunk/po/zh_CN.po,
+	  xfce4-appfinder/trunk/po/zh_TW.po,
+	  xfce4-icon-theme/trunk/po/ca.po,
+	  xfce4-icon-theme/trunk/po/de.po,
+	  xfce4-icon-theme/trunk/po/el.po,
+	  xfce4-icon-theme/trunk/po/et.po,
+	  xfce4-icon-theme/trunk/po/fi.po,
+	  xfce4-icon-theme/trunk/po/hu.po,
+	  xfce4-icon-theme/trunk/po/ja.po,
+	  xfce4-icon-theme/trunk/po/ko.po,
+	  xfce4-icon-theme/trunk/po/pl.po,
+	  xfce4-icon-theme/trunk/po/ru.po,
+	  xfce4-icon-theme/trunk/po/sk.po,
+	  xfce4-icon-theme/trunk/po/uk.po,
+	  xfce4-icon-theme/trunk/po/zh_CN.po,
+	  xfce4-icon-theme/trunk/po/zh_TW.po,
+	  xfce4-mailwatch-plugin/trunk/po/ca.po,
+	  xfce4-mailwatch-plugin/trunk/po/de.po,
+	  xfce4-mailwatch-plugin/trunk/po/el.po,
+	  xfce4-mailwatch-plugin/trunk/po/eu.po,
+	  xfce4-mailwatch-plugin/trunk/po/fi.po,
+	  xfce4-mailwatch-plugin/trunk/po/fr.po,
+	  xfce4-mailwatch-plugin/trunk/po/gu.po,
+	  xfce4-mailwatch-plugin/trunk/po/he.po,
+	  xfce4-mailwatch-plugin/trunk/po/ja.po,
+	  xfce4-mailwatch-plugin/trunk/po/pt_BR.po,
+	  xfce4-mailwatch-plugin/trunk/po/ru.po,
+	  xfce4-mailwatch-plugin/trunk/po/uk.po,
+	  xfce4-mailwatch-plugin/trunk/po/vi.po,
+	  xfce4-mailwatch-plugin/trunk/po/xfce4-mailwatch-plugin.pot,
+	  xfce4-mailwatch-plugin/trunk/po/zh_TW.po,
+	  xfce4-mixer/trunk/po/ar.po, xfce4-mixer/trunk/po/az.po,
+	  xfce4-mixer/trunk/po/be.po, xfce4-mixer/trunk/po/bg.po,
+	  xfce4-mixer/trunk/po/bn_IN.po, xfce4-mixer/trunk/po/ca.po,
+	  xfce4-mixer/trunk/po/cs.po, xfce4-mixer/trunk/po/de.po,
+	  xfce4-mixer/trunk/po/el.po, xfce4-mixer/trunk/po/en_GB.po,
+	  xfce4-mixer/trunk/po/es.po, xfce4-mixer/trunk/po/es_MX.po,
+	  xfce4-mixer/trunk/po/et.po, xfce4-mixer/trunk/po/eu.po,
+	  xfce4-mixer/trunk/po/fa.po, xfce4-mixer/trunk/po/fi.po,
+	  xfce4-mixer/trunk/po/fr.po, xfce4-mixer/trunk/po/gu.po,
+	  xfce4-mixer/trunk/po/he.po, xfce4-mixer/trunk/po/hi.po,
+	  xfce4-mixer/trunk/po/hu.po, xfce4-mixer/trunk/po/hy.po,
+	  xfce4-mixer/trunk/po/it.po, xfce4-mixer/trunk/po/ja.po,
+	  xfce4-mixer/trunk/po/ko.po, xfce4-mixer/trunk/po/lt.po,
+	  xfce4-mixer/trunk/po/mr.po, xfce4-mixer/trunk/po/ms.po,
+	  xfce4-mixer/trunk/po/nb_NO.po, xfce4-mixer/trunk/po/nl.po,
+	  xfce4-mixer/trunk/po/pa.po, xfce4-mixer/trunk/po/pl.po,
+	  xfce4-mixer/trunk/po/pt_BR.po, xfce4-mixer/trunk/po/pt_PT.po,
+	  xfce4-mixer/trunk/po/ro.po, xfce4-mixer/trunk/po/ru.po,
+	  xfce4-mixer/trunk/po/sk.po, xfce4-mixer/trunk/po/sv.po,
+	  xfce4-mixer/trunk/po/ta.po, xfce4-mixer/trunk/po/tr.po,
+	  xfce4-mixer/trunk/po/uk.po, xfce4-mixer/trunk/po/vi.po,
+	  xfce4-mixer/trunk/po/xfce4-mixer.pot,
+	  xfce4-mixer/trunk/po/zh_CN.po, xfce4-mixer/trunk/po/zh_TW.po,
+	  xfce4-panel/trunk/po/ar.po, xfce4-panel/trunk/po/az.po,
+	  xfce4-panel/trunk/po/be.po, xfce4-panel/trunk/po/bg.po,
+	  xfce4-panel/trunk/po/bn_IN.po, xfce4-panel/trunk/po/ca.po,
+	  xfce4-panel/trunk/po/cs.po, xfce4-panel/trunk/po/de.po,
+	  xfce4-panel/trunk/po/el.po, xfce4-panel/trunk/po/en_GB.po,
+	  xfce4-panel/trunk/po/eo.po, xfce4-panel/trunk/po/es.po,
+	  xfce4-panel/trunk/po/es_MX.po, xfce4-panel/trunk/po/et.po,
+	  xfce4-panel/trunk/po/eu.po, xfce4-panel/trunk/po/fa.po,
+	  xfce4-panel/trunk/po/fi.po, xfce4-panel/trunk/po/fr.po,
+	  xfce4-panel/trunk/po/gu.po, xfce4-panel/trunk/po/he.po,
+	  xfce4-panel/trunk/po/hi.po, xfce4-panel/trunk/po/hu.po,
+	  xfce4-panel/trunk/po/hy.po, xfce4-panel/trunk/po/it.po,
+	  xfce4-panel/trunk/po/ja.po, xfce4-panel/trunk/po/ko.po,
+	  xfce4-panel/trunk/po/lt.po, xfce4-panel/trunk/po/mr.po,
+	  xfce4-panel/trunk/po/ms.po, xfce4-panel/trunk/po/nb_NO.po,
+	  xfce4-panel/trunk/po/nl.po, xfce4-panel/trunk/po/pa.po,
+	  xfce4-panel/trunk/po/pl.po, xfce4-panel/trunk/po/pt_BR.po,
+	  xfce4-panel/trunk/po/pt_PT.po, xfce4-panel/trunk/po/ro.po,
+	  xfce4-panel/trunk/po/ru.po, xfce4-panel/trunk/po/sk.po,
+	  xfce4-panel/trunk/po/sv.po, xfce4-panel/trunk/po/ta.po,
+	  xfce4-panel/trunk/po/tr.po, xfce4-panel/trunk/po/uk.po,
+	  xfce4-panel/trunk/po/vi.po,
+	  xfce4-panel/trunk/po/xfce4-panel.pot,
+	  xfce4-panel/trunk/po/zh_CN.po, xfce4-panel/trunk/po/zh_TW.po,
+	  xfce4-session/trunk/po/ar.po, xfce4-session/trunk/po/az.po,
+	  xfce4-session/trunk/po/be.po, xfce4-session/trunk/po/bn_IN.po,
+	  xfce4-session/trunk/po/ca.po, xfce4-session/trunk/po/cs.po,
+	  xfce4-session/trunk/po/de.po, xfce4-session/trunk/po/el.po,
+	  xfce4-session/trunk/po/en_GB.po, xfce4-session/trunk/po/eo.po,
+	  xfce4-session/trunk/po/es.po, xfce4-session/trunk/po/es_MX.po,
+	  xfce4-session/trunk/po/et.po, xfce4-session/trunk/po/eu.po,
+	  xfce4-session/trunk/po/fa.po, xfce4-session/trunk/po/fi.po,
+	  xfce4-session/trunk/po/fr.po, xfce4-session/trunk/po/gu.po,
+	  xfce4-session/trunk/po/hi.po, xfce4-session/trunk/po/hu.po,
+	  xfce4-session/trunk/po/it.po, xfce4-session/trunk/po/ja.po,
+	  xfce4-session/trunk/po/ko.po, xfce4-session/trunk/po/lt.po,
+	  xfce4-session/trunk/po/mr.po, xfce4-session/trunk/po/ms.po,
+	  xfce4-session/trunk/po/nb_NO.po, xfce4-session/trunk/po/nl.po,
+	  xfce4-session/trunk/po/pa.po, xfce4-session/trunk/po/pl.po,
+	  xfce4-session/trunk/po/pt_BR.po,
+	  xfce4-session/trunk/po/pt_PT.po, xfce4-session/trunk/po/ro.po,
+	  xfce4-session/trunk/po/ru.po, xfce4-session/trunk/po/sk.po,
+	  xfce4-session/trunk/po/sv.po, xfce4-session/trunk/po/ta.po,
+	  xfce4-session/trunk/po/tr.po, xfce4-session/trunk/po/uk.po,
+	  xfce4-session/trunk/po/vi.po,
+	  xfce4-session/trunk/po/xfce4-session.pot,
+	  xfce4-session/trunk/po/zh_CN.po,
+	  xfce4-session/trunk/po/zh_TW.po,
+	  xfce4-trigger-launcher/trunk/po/ar.po,
+	  xfce4-trigger-launcher/trunk/po/az.po,
+	  xfce4-trigger-launcher/trunk/po/be.po,
+	  xfce4-trigger-launcher/trunk/po/bg.po,
+	  xfce4-trigger-launcher/trunk/po/bn_IN.po,
+	  xfce4-trigger-launcher/trunk/po/ca.po,
+	  xfce4-trigger-launcher/trunk/po/cs.po,
+	  xfce4-trigger-launcher/trunk/po/de.po,
+	  xfce4-trigger-launcher/trunk/po/el.po,
+	  xfce4-trigger-launcher/trunk/po/en_GB.po,
+	  xfce4-trigger-launcher/trunk/po/eo.po,
+	  xfce4-trigger-launcher/trunk/po/es.po,
+	  xfce4-trigger-launcher/trunk/po/es_MX.po,
+	  xfce4-trigger-launcher/trunk/po/et.po,
+	  xfce4-trigger-launcher/trunk/po/eu.po,
+	  xfce4-trigger-launcher/trunk/po/fa.po,
+	  xfce4-trigger-launcher/trunk/po/fi.po,
+	  xfce4-trigger-launcher/trunk/po/fr.po,
+	  xfce4-trigger-launcher/trunk/po/gu.po,
+	  xfce4-trigger-launcher/trunk/po/hi.po,
+	  xfce4-trigger-launcher/trunk/po/hu.po,
+	  xfce4-trigger-launcher/trunk/po/it.po,
+	  xfce4-trigger-launcher/trunk/po/ja.po,
+	  xfce4-trigger-launcher/trunk/po/ko.po,
+	  xfce4-trigger-launcher/trunk/po/lt.po,
+	  xfce4-trigger-launcher/trunk/po/mr.po,
+	  xfce4-trigger-launcher/trunk/po/ms.po,
+	  xfce4-trigger-launcher/trunk/po/nl.po,
+	  xfce4-trigger-launcher/trunk/po/pa.po,
+	  xfce4-trigger-launcher/trunk/po/pl.po,
+	  xfce4-trigger-launcher/trunk/po/pt_BR.po,
+	  xfce4-trigger-launcher/trunk/po/pt_PT.po,
+	  xfce4-trigger-launcher/trunk/po/ro.po,
+	  xfce4-trigger-launcher/trunk/po/ru.po,
+	  xfce4-trigger-launcher/trunk/po/sk.po,
+	  xfce4-trigger-launcher/trunk/po/sv.po,
+	  xfce4-trigger-launcher/trunk/po/ta.po,
+	  xfce4-trigger-launcher/trunk/po/tr.po,
+	  xfce4-trigger-launcher/trunk/po/uk.po,
+	  xfce4-trigger-launcher/trunk/po/vi.po,
+	  xfce4-trigger-launcher/trunk/po/zh_CN.po,
+	  xfce4-trigger-launcher/trunk/po/zh_TW.po,
+	  xfdesktop/trunk/po/ar.po, xfdesktop/trunk/po/az.po,
+	  xfdesktop/trunk/po/be.po, xfdesktop/trunk/po/bg.po,
+	  xfdesktop/trunk/po/bn_IN.po, xfdesktop/trunk/po/ca.po,
+	  xfdesktop/trunk/po/cs.po, xfdesktop/trunk/po/de.po,
+	  xfdesktop/trunk/po/el.po, xfdesktop/trunk/po/en_GB.po,
+	  xfdesktop/trunk/po/eo.po, xfdesktop/trunk/po/es.po,
+	  xfdesktop/trunk/po/es_MX.po, xfdesktop/trunk/po/et.po,
+	  xfdesktop/trunk/po/eu.po, xfdesktop/trunk/po/fa.po,
+	  xfdesktop/trunk/po/fi.po, xfdesktop/trunk/po/fr.po,
+	  xfdesktop/trunk/po/gu.po, xfdesktop/trunk/po/he.po,
+	  xfdesktop/trunk/po/hi.po, xfdesktop/trunk/po/hu.po,
+	  xfdesktop/trunk/po/hy.po, xfdesktop/trunk/po/it.po,
+	  xfdesktop/trunk/po/ja.po, xfdesktop/trunk/po/ko.po,
+	  xfdesktop/trunk/po/lt.po, xfdesktop/trunk/po/mr.po,
+	  xfdesktop/trunk/po/ms.po, xfdesktop/trunk/po/nb_NO.po,
+	  xfdesktop/trunk/po/nl.po, xfdesktop/trunk/po/pa.po,
+	  xfdesktop/trunk/po/pl.po, xfdesktop/trunk/po/pt_BR.po,
+	  xfdesktop/trunk/po/pt_PT.po, xfdesktop/trunk/po/ro.po,
+	  xfdesktop/trunk/po/ru.po, xfdesktop/trunk/po/sk.po,
+	  xfdesktop/trunk/po/sv.po, xfdesktop/trunk/po/ta.po,
+	  xfdesktop/trunk/po/tr.po, xfdesktop/trunk/po/uk.po,
+	  xfdesktop/trunk/po/vi.po, xfdesktop/trunk/po/xfdesktop.pot,
+	  xfdesktop/trunk/po/zh_CN.po, xfdesktop/trunk/po/zh_TW.po,
+	  xfprint/trunk/po/ar.po, xfprint/trunk/po/az.po,
+	  xfprint/trunk/po/be.po, xfprint/trunk/po/bg.po,
+	  xfprint/trunk/po/bn_IN.po, xfprint/trunk/po/ca.po,
+	  xfprint/trunk/po/cs.po, xfprint/trunk/po/de.po,
+	  xfprint/trunk/po/el.po, xfprint/trunk/po/en_GB.po,
+	  xfprint/trunk/po/es.po, xfprint/trunk/po/es_MX.po,
+	  xfprint/trunk/po/et.po, xfprint/trunk/po/eu.po,
+	  xfprint/trunk/po/fa.po, xfprint/trunk/po/fi.po,
+	  xfprint/trunk/po/fr.po, xfprint/trunk/po/gu.po,
+	  xfprint/trunk/po/he.po, xfprint/trunk/po/hi.po,
+	  xfprint/trunk/po/hu.po, xfprint/trunk/po/it.po,
+	  xfprint/trunk/po/ja.po, xfprint/trunk/po/ko.po,
+	  xfprint/trunk/po/lt.po, xfprint/trunk/po/mr.po,
+	  xfprint/trunk/po/ms.po, xfprint/trunk/po/nl.po,
+	  xfprint/trunk/po/pa.po, xfprint/trunk/po/pl.po,
+	  xfprint/trunk/po/pt_BR.po, xfprint/trunk/po/pt_PT.po,
+	  xfprint/trunk/po/ro.po, xfprint/trunk/po/ru.po,
+	  xfprint/trunk/po/sk.po, xfprint/trunk/po/sv.po,
+	  xfprint/trunk/po/ta.po, xfprint/trunk/po/tr.po,
+	  xfprint/trunk/po/uk.po, xfprint/trunk/po/vi.po,
+	  xfprint/trunk/po/zh_CN.po, xfprint/trunk/po/zh_TW.po: Bump.
+
+2006-05-04 21:23  benny
+
+	* configure.in.in, docs/libxfcegui4-docs.sgml,
+	  docs/libxfcegui4-sections.txt, docs/libxfcegui4.types,
+	  docs/tmpl/xfce-heading.sgml, docs/tmpl/xfce-titled-dialog.sgml,
+	  docs/xfce4-modules-docs.sgml, docs/xfce4-modules-overrides.txt,
+	  docs/xfce4-modules-sections.txt, docs/xfce4-modules.types,
+	  libxfcegui4/Makefile.am, libxfcegui4/libxfcegui4.h,
+	  libxfcegui4/xfce-colorbutton.c, libxfcegui4/xfce-colorbutton.h,
+	  libxfcegui4/xfce-gdk-extensions.c, libxfcegui4/xfce-heading.c,
+	  libxfcegui4/xfce-heading.h, libxfcegui4/xfce-titled-dialog.c,
+	  libxfcegui4/xfce-titled-dialog.h, libxfcegui4/xinerama.c,
+	  libxfcegui4/xinerama.h: Import XfceHeading and XfceTitledDialog
+	  widget classes. Cleanup some
+	  deprecated stuff. Update the API docs.
+
+2006-05-02 16:06  daichi
+
+	* po/ChangeLog, xfburn/trunk/po/ChangeLog,
+	  xfcalendar/trunk/po/ChangeLog,
+	  xfce-mcs-manager/trunk/po/ChangeLog,
+	  xfce-mcs-plugins/trunk/po/ChangeLog,
+	  xfce-utils/trunk/po/ChangeLog,
+	  xfce4-appfinder/trunk/po/ChangeLog,
+	  xfce4-icon-theme/trunk/po/ChangeLog,
+	  xfce4-mailwatch-plugin/trunk/po/ChangeLog,
+	  xfce4-mixer/trunk/po/ChangeLog, xfce4-panel/trunk/po/ChangeLog,
+	  xfce4-trigger-launcher/trunk/po/ChangeLog,
+	  xfdesktop/trunk/po/ChangeLog, xffm/trunk/fgr/po/ChangeLog,
+	  xffm/trunk/libxffm/po/ChangeLog,
+	  xffm/trunk/plugins/xfapps/po/ChangeLog,
+	  xffm/trunk/plugins/xfbook/po/ChangeLog,
+	  xffm/trunk/plugins/xffstab/po/ChangeLog,
+	  xffm/trunk/plugins/xflocate/po/ChangeLog,
+	  xffm/trunk/plugins/xfproc/po/ChangeLog,
+	  xffm/trunk/plugins/xfrecent/po/ChangeLog,
+	  xffm/trunk/plugins/xfsamba/po/ChangeLog,
+	  xffm/trunk/plugins/xftrash/po/ChangeLog,
+	  xffm/trunk/scramble/po/ChangeLog,
+	  xffm/trunk/xfdiff/po/ChangeLog,
+	  xffm/trunk/xffm-gui/po/ChangeLog,
+	  xffm/trunk/xfmime-edit/po/ChangeLog, xfmedia/trunk/po/ChangeLog,
+	  xfprint/trunk/po/ChangeLog, xfwm4/trunk/po/ChangeLog: Removed
+	  timestamps so that a translator isn't bothered:
+	  "Then, what time is it now in UTC?"
+
+2006-05-01 20:17  jasper
+
+	* libxfcegui4/netk-tasklist.c: Improve urgent/demands_attention
+	  handling. Now also works with grouped tasks (Bug #53).
+
+2006-05-01 15:09  benny
+
+	* ., Makefile.am, autogen.sh, configure.ac, configure.in.in,
+	  docs/Makefile.am, docs/tmpl/netk-window.sgml,
+	  docs/version.xml.in, examples/aboutdlg/aboutdlg.c,
+	  examples/decorbutton/decorbutton.c,
+	  examples/iconbutton/iconbutton.c, examples/margins/margins.c,
+	  examples/menubutton/menubutton.c,
+	  examples/movehandler/movehandler.c, examples/netk/netk.c,
+	  examples/pager/pager.c,
+	  examples/preview_filesel/preview_filesel.c,
+	  examples/session/session.c, examples/tasklist/tasklist.c,
+	  examples/togglebutton/togglebutton.c, libxfcegui4/Makefile.am,
+	  libxfcegui4/dialogs.c, libxfcegui4/dialogs.h,
+	  libxfcegui4/gtk_style.c, libxfcegui4/gtk_style.h,
+	  libxfcegui4/gtktoxevent.c, libxfcegui4/gtktoxevent.h,
+	  libxfcegui4/icons.c, libxfcegui4/icons.h, libxfcegui4/libnetk.h,
+	  libxfcegui4/libxfcegui4.h, libxfcegui4/netk-application.c,
+	  libxfcegui4/netk-application.h, libxfcegui4/netk-class-group.c,
+	  libxfcegui4/netk-class-group.h,
+	  libxfcegui4/netk-inlinepixbufs.h, libxfcegui4/netk-marshal.c,
+	  libxfcegui4/netk-marshal.h, libxfcegui4/netk-pager.c,
+	  libxfcegui4/netk-pager.h, libxfcegui4/netk-private.h,
+	  libxfcegui4/netk-screen.c, libxfcegui4/netk-screen.h,
+	  libxfcegui4/netk-tasklist.c, libxfcegui4/netk-tasklist.h,
+	  libxfcegui4/netk-trayicon.c, libxfcegui4/netk-trayicon.h,
+	  libxfcegui4/netk-util.c, libxfcegui4/netk-util.h,
+	  libxfcegui4/netk-window-action-menu.c,
+	  libxfcegui4/netk-window-action-menu.h,
+	  libxfcegui4/netk-window-menu.c, libxfcegui4/netk-window-menu.h,
+	  libxfcegui4/netk-window.c, libxfcegui4/netk-window.h,
+	  libxfcegui4/netk-workspace.c, libxfcegui4/netk-workspace.h,
+	  libxfcegui4/netk-xutils.c, libxfcegui4/netk-xutils.h,
+	  libxfcegui4/preview_filesel.c, libxfcegui4/preview_filesel.h,
+	  libxfcegui4/session-client.c, libxfcegui4/session-client.h,
+	  libxfcegui4/xfce-appmenuitem.c, libxfcegui4/xfce-appmenuitem.h,
+	  libxfcegui4/xfce-colorbutton.c, libxfcegui4/xfce-colorbutton.h,
+	  libxfcegui4/xfce-exec.c, libxfcegui4/xfce-exec.h,
+	  libxfcegui4/xfce-filechooser.c, libxfcegui4/xfce-filechooser.h,
+	  libxfcegui4/xfce-gdk-extensions.c,
+	  libxfcegui4/xfce-gdk-extensions.h,
+	  libxfcegui4/xfce-gtk-extensions.c,
+	  libxfcegui4/xfce-gtk-extensions.h, libxfcegui4/xfce-icontheme.c,
+	  libxfcegui4/xfce-icontheme.h, libxfcegui4/xfce-internals.c,
+	  libxfcegui4/xfce-internals.h,
+	  libxfcegui4/xfce-startup-notification.c,
+	  libxfcegui4/xfce-startup-notification.h,
+	  libxfcegui4/xfce-widget-helpers.c,
+	  libxfcegui4/xfce-widget-helpers.h,
+	  libxfcegui4/xfce_aboutdialog.c, libxfcegui4/xfce_aboutdialog.h,
+	  libxfcegui4/xfce_clock.c, libxfcegui4/xfce_clock.h,
+	  libxfcegui4/xfce_decorbutton.c, libxfcegui4/xfce_decorbutton.h,
+	  libxfcegui4/xfce_decortoggle.c, libxfcegui4/xfce_decortoggle.h,
+	  libxfcegui4/xfce_framebox.c, libxfcegui4/xfce_framebox.h,
+	  libxfcegui4/xfce_iconbutton.c, libxfcegui4/xfce_iconbutton.h,
+	  libxfcegui4/xfce_marshal.c, libxfcegui4/xfce_marshal.h,
+	  libxfcegui4/xfce_menubutton.c, libxfcegui4/xfce_menubutton.h,
+	  libxfcegui4/xfce_movehandler.c, libxfcegui4/xfce_movehandler.h,
+	  libxfcegui4/xfce_scaled_image.c,
+	  libxfcegui4/xfce_scaled_image.h, libxfcegui4/xfce_systemtray.c,
+	  libxfcegui4/xfce_systemtray.h, libxfcegui4/xfce_togglebutton.c,
+	  libxfcegui4/xfce_togglebutton.h, libxfcegui4/xinerama.c,
+	  libxfcegui4/xinerama.h, pixmaps/Makefile.am, po/LINGUAS: Use
+	  po/LINGUAS. libxml is no longer required.
+
+2006-04-30 09:07  sas
+
+	* po/hu.po, xarchiver/trunk/po/hu.po,
+	  xfce-mcs-plugins/trunk/po/hu.po, xfdesktop/trunk/po/hu.po,
+	  xfwm4/trunk/po/hu.po: hu trunk: updates
+
+2006-04-30 08:36  daichi
+
+	* po/be.po, po/bn_IN.po, po/ca.po, po/cs.po, po/de.po, po/el.po,
+	  po/en_GB.po, po/eo.po, po/es.po, po/et.po, po/eu.po, po/fa.po,
+	  po/fi.po, po/fr.po, po/gu.po, po/he.po, po/hu.po, po/hy.po,
+	  po/it.po, po/ja.po, po/ko.po, po/libxfcegui4.pot, po/lt.po,
+	  po/mr.po, po/nl.po, po/pa.po, po/pl.po, po/pt_BR.po, po/ro.po,
+	  po/ru.po, po/sk.po, po/sv.po, po/ta.po, po/uk.po, po/zh_CN.po,
+	  po/zh_TW.po, xfcalendar/trunk/po/POTFILES.in,
+	  xfcalendar/trunk/po/ar.po, xfcalendar/trunk/po/az.po,
+	  xfcalendar/trunk/po/be.po, xfcalendar/trunk/po/bg.po,
+	  xfcalendar/trunk/po/bn_IN.po, xfcalendar/trunk/po/ca.po,
+	  xfcalendar/trunk/po/cs.po, xfcalendar/trunk/po/de.po,
+	  xfcalendar/trunk/po/el.po, xfcalendar/trunk/po/en_GB.po,
+	  xfcalendar/trunk/po/eo.po, xfcalendar/trunk/po/es.po,
+	  xfcalendar/trunk/po/et.po, xfcalendar/trunk/po/eu.po,
+	  xfcalendar/trunk/po/fa.po, xfcalendar/trunk/po/fi.po,
+	  xfcalendar/trunk/po/fr.po, xfcalendar/trunk/po/gu.po,
+	  xfcalendar/trunk/po/he.po, xfcalendar/trunk/po/hi.po,
+	  xfcalendar/trunk/po/hu.po, xfcalendar/trunk/po/hy.po,
+	  xfcalendar/trunk/po/it.po, xfcalendar/trunk/po/ja.po,
+	  xfcalendar/trunk/po/ko.po, xfcalendar/trunk/po/lt.po,
+	  xfcalendar/trunk/po/mr.po, xfcalendar/trunk/po/ms.po,
+	  xfcalendar/trunk/po/nb_NO.po, xfcalendar/trunk/po/nl.po,
+	  xfcalendar/trunk/po/orage.pot, xfcalendar/trunk/po/pa.po,
+	  xfcalendar/trunk/po/pl.po, xfcalendar/trunk/po/pt_BR.po,
+	  xfcalendar/trunk/po/pt_PT.po, xfcalendar/trunk/po/ro.po,
+	  xfcalendar/trunk/po/ru.po, xfcalendar/trunk/po/sk.po,
+	  xfcalendar/trunk/po/sv.po, xfcalendar/trunk/po/ta.po,
+	  xfcalendar/trunk/po/tr.po, xfcalendar/trunk/po/uk.po,
+	  xfcalendar/trunk/po/vi.po, xfcalendar/trunk/po/zh_CN.po,
+	  xfcalendar/trunk/po/zh_TW.po, xfce-mcs-plugins/trunk/po/ar.po,
+	  xfce-mcs-plugins/trunk/po/az.po,
+	  xfce-mcs-plugins/trunk/po/be.po,
+	  xfce-mcs-plugins/trunk/po/bg.po,
+	  xfce-mcs-plugins/trunk/po/bn_IN.po,
+	  xfce-mcs-plugins/trunk/po/ca.po,
+	  xfce-mcs-plugins/trunk/po/cs.po,
+	  xfce-mcs-plugins/trunk/po/de.po,
+	  xfce-mcs-plugins/trunk/po/el.po,
+	  xfce-mcs-plugins/trunk/po/en_GB.po,
+	  xfce-mcs-plugins/trunk/po/eo.po,
+	  xfce-mcs-plugins/trunk/po/es.po,
+	  xfce-mcs-plugins/trunk/po/es_MX.po,
+	  xfce-mcs-plugins/trunk/po/et.po,
+	  xfce-mcs-plugins/trunk/po/eu.po,
+	  xfce-mcs-plugins/trunk/po/fa.po,
+	  xfce-mcs-plugins/trunk/po/fi.po,
+	  xfce-mcs-plugins/trunk/po/fr.po,
+	  xfce-mcs-plugins/trunk/po/gu.po,
+	  xfce-mcs-plugins/trunk/po/he.po,
+	  xfce-mcs-plugins/trunk/po/hi.po,
+	  xfce-mcs-plugins/trunk/po/hu.po,
+	  xfce-mcs-plugins/trunk/po/it.po,
+	  xfce-mcs-plugins/trunk/po/ja.po,
+	  xfce-mcs-plugins/trunk/po/ko.po,
+	  xfce-mcs-plugins/trunk/po/lt.po,
+	  xfce-mcs-plugins/trunk/po/mr.po,
+	  xfce-mcs-plugins/trunk/po/ms.po,
+	  xfce-mcs-plugins/trunk/po/nl.po,
+	  xfce-mcs-plugins/trunk/po/pa.po,
+	  xfce-mcs-plugins/trunk/po/pl.po,
+	  xfce-mcs-plugins/trunk/po/pt_BR.po,
+	  xfce-mcs-plugins/trunk/po/pt_PT.po,
+	  xfce-mcs-plugins/trunk/po/ro.po,
+	  xfce-mcs-plugins/trunk/po/ru.po,
+	  xfce-mcs-plugins/trunk/po/sk.po,
+	  xfce-mcs-plugins/trunk/po/sv.po,
+	  xfce-mcs-plugins/trunk/po/ta.po,
+	  xfce-mcs-plugins/trunk/po/tr.po,
+	  xfce-mcs-plugins/trunk/po/uk.po,
+	  xfce-mcs-plugins/trunk/po/vi.po,
+	  xfce-mcs-plugins/trunk/po/xfce-mcs-plugins.pot,
+	  xfce-mcs-plugins/trunk/po/zh_CN.po,
+	  xfce-mcs-plugins/trunk/po/zh_TW.po,
+	  xfce4-appfinder/trunk/po/be.po,
+	  xfce4-appfinder/trunk/po/bn_IN.po,
+	  xfce4-appfinder/trunk/po/ca.po, xfce4-appfinder/trunk/po/cs.po,
+	  xfce4-appfinder/trunk/po/de.po, xfce4-appfinder/trunk/po/el.po,
+	  xfce4-appfinder/trunk/po/en_GB.po,
+	  xfce4-appfinder/trunk/po/es.po,
+	  xfce4-appfinder/trunk/po/es_MX.po,
+	  xfce4-appfinder/trunk/po/et.po, xfce4-appfinder/trunk/po/eu.po,
+	  xfce4-appfinder/trunk/po/fa.po, xfce4-appfinder/trunk/po/fi.po,
+	  xfce4-appfinder/trunk/po/fr.po, xfce4-appfinder/trunk/po/gu.po,
+	  xfce4-appfinder/trunk/po/he.po, xfce4-appfinder/trunk/po/hu.po,
+	  xfce4-appfinder/trunk/po/hy.po, xfce4-appfinder/trunk/po/it.po,
+	  xfce4-appfinder/trunk/po/ja.po, xfce4-appfinder/trunk/po/ko.po,
+	  xfce4-appfinder/trunk/po/lt.po, xfce4-appfinder/trunk/po/mr.po,
+	  xfce4-appfinder/trunk/po/nl.po, xfce4-appfinder/trunk/po/pa.po,
+	  xfce4-appfinder/trunk/po/pl.po,
+	  xfce4-appfinder/trunk/po/pt_BR.po,
+	  xfce4-appfinder/trunk/po/pt_PT.po,
+	  xfce4-appfinder/trunk/po/ro.po, xfce4-appfinder/trunk/po/ru.po,
+	  xfce4-appfinder/trunk/po/sk.po, xfce4-appfinder/trunk/po/sv.po,
+	  xfce4-appfinder/trunk/po/tr.po, xfce4-appfinder/trunk/po/uk.po,
+	  xfce4-appfinder/trunk/po/xfce4-appfinder.pot,
+	  xfce4-appfinder/trunk/po/zh_CN.po,
+	  xfce4-appfinder/trunk/po/zh_TW.po, xfdesktop/trunk/po/ar.po,
+	  xfdesktop/trunk/po/az.po, xfdesktop/trunk/po/be.po,
+	  xfdesktop/trunk/po/bg.po, xfdesktop/trunk/po/bn_IN.po,
+	  xfdesktop/trunk/po/ca.po, xfdesktop/trunk/po/cs.po,
+	  xfdesktop/trunk/po/de.po, xfdesktop/trunk/po/el.po,
+	  xfdesktop/trunk/po/en_GB.po, xfdesktop/trunk/po/eo.po,
+	  xfdesktop/trunk/po/es.po, xfdesktop/trunk/po/es_MX.po,
+	  xfdesktop/trunk/po/et.po, xfdesktop/trunk/po/eu.po,
+	  xfdesktop/trunk/po/fa.po, xfdesktop/trunk/po/fi.po,
+	  xfdesktop/trunk/po/fr.po, xfdesktop/trunk/po/gu.po,
+	  xfdesktop/trunk/po/he.po, xfdesktop/trunk/po/hi.po,
+	  xfdesktop/trunk/po/hu.po, xfdesktop/trunk/po/hy.po,
+	  xfdesktop/trunk/po/it.po, xfdesktop/trunk/po/ja.po,
+	  xfdesktop/trunk/po/ko.po, xfdesktop/trunk/po/lt.po,
+	  xfdesktop/trunk/po/mr.po, xfdesktop/trunk/po/ms.po,
+	  xfdesktop/trunk/po/nb_NO.po, xfdesktop/trunk/po/nl.po,
+	  xfdesktop/trunk/po/pa.po, xfdesktop/trunk/po/pl.po,
+	  xfdesktop/trunk/po/pt_BR.po, xfdesktop/trunk/po/pt_PT.po,
+	  xfdesktop/trunk/po/ro.po, xfdesktop/trunk/po/ru.po,
+	  xfdesktop/trunk/po/sk.po, xfdesktop/trunk/po/sv.po,
+	  xfdesktop/trunk/po/ta.po, xfdesktop/trunk/po/tr.po,
+	  xfdesktop/trunk/po/uk.po, xfdesktop/trunk/po/vi.po,
+	  xfdesktop/trunk/po/xfdesktop.pot, xfdesktop/trunk/po/zh_CN.po,
+	  xfdesktop/trunk/po/zh_TW.po, xfwm4/trunk/po/ar.po,
+	  xfwm4/trunk/po/az.po, xfwm4/trunk/po/be.po,
+	  xfwm4/trunk/po/bg.po, xfwm4/trunk/po/bn_IN.po,
+	  xfwm4/trunk/po/ca.po, xfwm4/trunk/po/cs.po,
+	  xfwm4/trunk/po/de.po, xfwm4/trunk/po/el.po,
+	  xfwm4/trunk/po/en_GB.po, xfwm4/trunk/po/eo.po,
+	  xfwm4/trunk/po/es.po, xfwm4/trunk/po/es_MX.po,
+	  xfwm4/trunk/po/et.po, xfwm4/trunk/po/eu.po,
+	  xfwm4/trunk/po/fa.po, xfwm4/trunk/po/fi.po,
+	  xfwm4/trunk/po/fr.po, xfwm4/trunk/po/gu.po,
+	  xfwm4/trunk/po/he.po, xfwm4/trunk/po/hi.po,
+	  xfwm4/trunk/po/hu.po, xfwm4/trunk/po/it.po,
+	  xfwm4/trunk/po/ja.po, xfwm4/trunk/po/ko.po,
+	  xfwm4/trunk/po/lt.po, xfwm4/trunk/po/mr.po,
+	  xfwm4/trunk/po/ms.po, xfwm4/trunk/po/nb_NO.po,
+	  xfwm4/trunk/po/nl.po, xfwm4/trunk/po/pa.po,
+	  xfwm4/trunk/po/pl.po, xfwm4/trunk/po/pt_BR.po,
+	  xfwm4/trunk/po/pt_PT.po, xfwm4/trunk/po/ro.po,
+	  xfwm4/trunk/po/ru.po, xfwm4/trunk/po/sk.po,
+	  xfwm4/trunk/po/sv.po, xfwm4/trunk/po/ta.po,
+	  xfwm4/trunk/po/tr.po, xfwm4/trunk/po/uk.po,
+	  xfwm4/trunk/po/vi.po, xfwm4/trunk/po/xfwm4.pot,
+	  xfwm4/trunk/po/zh_CN.po, xfwm4/trunk/po/zh_TW.po: Updated.
+
+2006-04-29 19:33  jasper
+
+	* libxfcegui4/netk-pager.c: Switch workspace when dragging
+	  something over the pager (bug #1735).
+
+2006-04-29 18:42  jasper
+
+	* libxfcegui4/netk-private.h, libxfcegui4/netk-tasklist.c,
+	  libxfcegui4/netk-util.c, libxfcegui4/netk-window.c,
+	  libxfcegui4/netk-window.h, libxfcegui4/netk-xutils.c,
+	  libxfcegui4/xfce-icontheme.c: * Add support for
+	  _NET_WM_STATE_DEMANDS_ATTENTION. Mostly copied from libwnck.
+	  * Make tasklist do something with this hint (bug #1287). Also
+	  make label bold when a window demands attention.
+	  * Add spacing between label and icon (bug #1672).
+	  * Get rid of XfceIconTheme.
+	  * Add some missing prototypes to netk-window.h.
+
+2006-04-28 23:44  hydonsingore
+
+	* po/ChangeLog, po/zh_TW.po, mousepad/trunk/po/ChangeLog,
+	  mousepad/trunk/po/zh_TW.po, xfce-mcs-plugins/trunk/po/ChangeLog,
+	  xfce-mcs-plugins/trunk/po/zh_TW.po: Update traditional Chinese
+	  translations for several packages.
+
+2006-04-19 13:59  mvd
+
+	* po/uk.po: 2006-04-19 Maxim Dziumanenko <mvd at mylinux.ua>
+	  
+	  * Updated Ukrainian translation.
+
+2006-04-18 19:44  benny
+
+	* libxfcegui4/xfce_aboutdialog.c: Add shadow to the license box,
+	  and 6px left/right margin.
+
+2006-04-16 08:37  benny
+
+	* ., Makefile.am, configure.ac, docs, docs/tmpl,
+	  libxfcegui4.spec.in, pixmaps, po/hu.po: Update for 4.4beta1.
+
+2006-04-15 17:34  olivier
+
+	* ChangeLog: Update ChangeLog
+
 2006-04-15 12:10  daichi
 
 	* libexo/trunk/po/ca.po, libexo/trunk/po/el.po,

Modified: libxfcegui4/trunk/libxfcegui4/xfce_clock.c
===================================================================
--- libxfcegui4/trunk/libxfcegui4/xfce_clock.c	2006-09-04 19:35:02 UTC (rev 23082)
+++ libxfcegui4/trunk/libxfcegui4/xfce_clock.c	2006-09-04 20:41:19 UTC (rev 23083)
@@ -42,6 +42,7 @@
 #include <time.h>
 #endif
 
+
 #include <gtk/gtkmain.h>
 #include <pango/pango.h>
 
@@ -265,17 +266,17 @@
 static void xfce_clock_finalize (GObject * object);
 static void xfce_clock_realize (GtkWidget * widget);
 static void xfce_clock_size_request (GtkWidget * widget,
-				     GtkRequisition * requisition);
+                                     GtkRequisition * requisition);
 static void xfce_clock_size_allocate (GtkWidget * widget,
-				      GtkAllocation * allocation);
+                                      GtkAllocation * allocation);
 static gint xfce_clock_expose (GtkWidget * widget, GdkEventExpose * event);
 static void xfce_clock_draw (GtkWidget * widget, GdkRectangle * area);
 static gint xfce_clock_timer (XfceClock * clock);
 static void xfce_clock_draw_internal (GtkWidget * widget,
-				      GdkRectangle * area);
+                                      GdkRectangle * area);
 
 static void draw_digits (XfceClock * clock, GdkGC * gc, gint x, gint y,
-			 gchar c);
+                         gchar c);
 
 /* Local data */
 
@@ -288,22 +289,22 @@
 
     if (!clock_type)
     {
-	static const GTypeInfo clock_info = {
-	    sizeof (XfceClockClass),
-	    NULL,		/* base_init */
-	    NULL,		/* base_finalize */
-	    (GClassInitFunc) xfce_clock_class_init,
-	    NULL,		/* class_finalize */
-	    NULL,		/* class_data */
-	    sizeof (XfceClock),
-	    0,			/* n_preallocs */
-	    (GInstanceInitFunc) xfce_clock_init,
-	    NULL		/* value_table */
-	};
+        static const GTypeInfo clock_info = {
+            sizeof (XfceClockClass),
+            NULL,               /* base_init */
+            NULL,               /* base_finalize */
+            (GClassInitFunc) xfce_clock_class_init,
+            NULL,               /* class_finalize */
+            NULL,               /* class_data */
+            sizeof (XfceClock),
+            0,                  /* n_preallocs */
+            (GInstanceInitFunc) xfce_clock_init,
+            NULL                /* value_table */
+        };
 
-	clock_type =
-	    g_type_register_static (GTK_TYPE_WIDGET, "XfceClock", &clock_info,
-				    0);
+        clock_type =
+            g_type_register_static (GTK_TYPE_WIDGET, "XfceClock", &clock_info,
+                                    0);
     }
 
     return clock_type;
@@ -351,13 +352,13 @@
     attributes.wclass = GDK_INPUT_OUTPUT;
     attributes.window_type = GDK_WINDOW_CHILD;
     attributes.event_mask =
-	gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
+        gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
     attributes.visual = gtk_widget_get_visual (widget);
     attributes.colormap = gtk_widget_get_colormap (widget);
 
     attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
     widget->window =
-	gdk_window_new (widget->parent->window, &attributes, attributes_mask);
+        gdk_window_new (widget->parent->window, &attributes, attributes_mask);
 
     widget->style = gtk_style_attach (widget->style, widget->window);
 
@@ -367,16 +368,16 @@
 
     if (!(clock->digits_bmap))
     {
-	clock->digits_bmap =
-	    gdk_bitmap_create_from_data (widget->window, (gchar*) digits_bits,
-					 DIGITS_WIDTH, DIGITS_HEIGHT);
+        clock->digits_bmap =
+            gdk_bitmap_create_from_data (widget->window, (gchar*) digits_bits,
+                                         DIGITS_WIDTH, DIGITS_HEIGHT);
     }
     if (!(clock->timer))
     {
-	clock->timer =
-	    g_timeout_add_full (0, clock->interval,
-				(GtkFunction) xfce_clock_timer,
-				(gpointer) clock, NULL);
+        clock->timer =
+            g_timeout_add_full (0, clock->interval,
+                                (GtkFunction) xfce_clock_timer,
+                                (gpointer) clock, NULL);
     }
 }
 
@@ -399,16 +400,18 @@
     clock->radius = 0;
     clock->pointer_width = 0;
     clock->mode = XFCE_CLOCK_ANALOG;
-    clock->military_time = 0;	/* use 12 hour mode by default */
-    clock->display_am_pm = 1;	/* display am or pm by default. */
-    clock->display_secs = 0;	/* do not display secs by default */
-    clock->interval = 100;	/* 1/10 seconds update interval by default */
+    clock->military_time = 0;   /* use 12 hour mode by default */
+    clock->display_am_pm = 1;   /* display am or pm by default. */
+    clock->display_secs = 0;    /* do not display secs by default */
+    clock->interval = 100;      /* 1/10 seconds update interval by default */
     clock->led_size = DIGIT_MEDIUM;
     clock->digits_bmap = NULL;
     clock->timer = 0;
     clock->old_hour = 0;
     clock->old_minute = 0;
     clock->old_second = 0;
+    clock->show_formatted = 0;
+    clock->format_string = NULL;
 }
 
 GtkWidget *
@@ -424,7 +427,7 @@
     g_return_if_fail (XFCE_IS_CLOCK (object));
 
     if (GTK_OBJECT_CLASS (parent_class)->destroy)
-	(*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+        (*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
 
 static void
@@ -440,13 +443,13 @@
 
     if (clock->digits_bmap)
     {
-	g_object_unref (G_OBJECT (clock->digits_bmap));
-	clock->digits_bmap = NULL;
+        g_object_unref (G_OBJECT (clock->digits_bmap));
+        clock->digits_bmap = NULL;
     }
     if (clock->timer)
     {
-	g_source_remove (clock->timer);
-	clock->timer = 0;
+        g_source_remove (clock->timer);
+        clock->timer = 0;
     }
 
     G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -461,7 +464,7 @@
     clock->display_am_pm = show;
     if (GTK_WIDGET_VISIBLE (GTK_WIDGET (clock)))
     {
-	gtk_widget_queue_draw (GTK_WIDGET (clock));
+        gtk_widget_queue_draw (GTK_WIDGET (clock));
     }
 }
 
@@ -472,12 +475,12 @@
     g_return_if_fail (XFCE_IS_CLOCK (clock));
 
     if (clock->display_am_pm)
-	clock->display_am_pm = 0;
+        clock->display_am_pm = 0;
     else
-	clock->display_am_pm = 1;
+        clock->display_am_pm = 1;
     if (GTK_WIDGET_VISIBLE (GTK_WIDGET (clock)))
     {
-	gtk_widget_queue_draw (GTK_WIDGET (clock));
+        gtk_widget_queue_draw (GTK_WIDGET (clock));
     }
 }
 
@@ -497,7 +500,7 @@
     clock->display_secs = show;
     if (GTK_WIDGET_VISIBLE (GTK_WIDGET (clock)))
     {
-	gtk_widget_queue_draw (GTK_WIDGET (clock));
+        gtk_widget_queue_draw (GTK_WIDGET (clock));
     }
 }
 
@@ -508,12 +511,12 @@
     g_return_if_fail (XFCE_IS_CLOCK (clock));
 
     if (clock->display_secs)
-	clock->display_secs = 0;
+        clock->display_secs = 0;
     else
-	clock->display_secs = 1;
+        clock->display_secs = 1;
     if (GTK_WIDGET_VISIBLE (GTK_WIDGET (clock)))
     {
-	gtk_widget_queue_draw (GTK_WIDGET (clock));
+        gtk_widget_queue_draw (GTK_WIDGET (clock));
     }
 }
 
@@ -533,7 +536,7 @@
     clock->military_time = show;
     if (GTK_WIDGET_VISIBLE (GTK_WIDGET (clock)))
     {
-	gtk_widget_queue_draw (GTK_WIDGET (clock));
+        gtk_widget_queue_draw (GTK_WIDGET (clock));
     }
 }
 
@@ -545,14 +548,14 @@
 
     if (clock->military_time)
     {
-	clock->military_time = 0;
-	xfce_clock_show_ampm (clock, 0);
+        clock->military_time = 0;
+        xfce_clock_show_ampm (clock, 0);
     }
     else
-	clock->military_time = 1;
+        clock->military_time = 1;
     if (GTK_WIDGET_VISIBLE (GTK_WIDGET (clock)))
     {
-	gtk_widget_queue_draw (GTK_WIDGET (clock));
+        gtk_widget_queue_draw (GTK_WIDGET (clock));
     }
 }
 
@@ -573,11 +576,11 @@
 
     if (clock->timer)
     {
-	g_source_remove (clock->timer);
-	clock->timer =
-	    g_timeout_add_full (0, clock->interval,
-				(GtkFunction) xfce_clock_timer,
-				(gpointer) clock, NULL);
+        g_source_remove (clock->timer);
+        clock->timer =
+            g_timeout_add_full (0, clock->interval,
+                                (GtkFunction) xfce_clock_timer,
+                                (gpointer) clock, NULL);
     }
 }
 
@@ -597,7 +600,7 @@
     clock->led_size = size;
     if (GTK_WIDGET_VISIBLE (GTK_WIDGET (clock)))
     {
-	gtk_widget_queue_draw (GTK_WIDGET (clock));
+        gtk_widget_queue_draw (GTK_WIDGET (clock));
     }
 }
 
@@ -617,8 +620,8 @@
 
     if (clock->timer)
     {
-	g_source_remove (clock->timer);
-	clock->timer = 0;
+        g_source_remove (clock->timer);
+        clock->timer = 0;
     }
 }
 
@@ -629,14 +632,14 @@
     g_return_if_fail (XFCE_IS_CLOCK (clock));
 
     if (clock->timer)
-	return;
+        return;
     if (!(clock->interval))
-	return;
+        return;
 
     clock->timer =
-	g_timeout_add_full (0, clock->interval,
-			    (GtkFunction) xfce_clock_timer, (gpointer) clock,
-			    NULL);
+        g_timeout_add_full (0, clock->interval,
+                            (GtkFunction) xfce_clock_timer, (gpointer) clock,
+                            NULL);
 }
 
 void
@@ -647,7 +650,7 @@
     clock->mode = mode;
     if (GTK_WIDGET_VISIBLE (GTK_WIDGET (clock)))
     {
-	gtk_widget_queue_draw (GTK_WIDGET (clock));
+        gtk_widget_queue_draw (GTK_WIDGET (clock));
     }
 }
 
@@ -659,7 +662,7 @@
     clock->mode = mode;
     if (GTK_WIDGET_VISIBLE (GTK_WIDGET (clock)))
     {
-	gtk_widget_queue_draw (GTK_WIDGET (clock));
+        gtk_widget_queue_draw (GTK_WIDGET (clock));
     }
 }
 
@@ -670,19 +673,19 @@
     g_return_if_fail (XFCE_IS_CLOCK (clock));
     switch (clock->mode)
     {
-	case XFCE_CLOCK_ANALOG:
-	    clock->mode = XFCE_CLOCK_DIGITAL;
-	    break;
-	case XFCE_CLOCK_DIGITAL:
-	    clock->mode = XFCE_CLOCK_LEDS;
-	    break;
-	case XFCE_CLOCK_LEDS:
-	default:
-	    clock->mode = XFCE_CLOCK_ANALOG;
+        case XFCE_CLOCK_ANALOG:
+            clock->mode = XFCE_CLOCK_DIGITAL;
+            break;
+        case XFCE_CLOCK_DIGITAL:
+            clock->mode = XFCE_CLOCK_LEDS;
+            break;
+        case XFCE_CLOCK_LEDS:
+        default:
+            clock->mode = XFCE_CLOCK_ANALOG;
     }
     if (GTK_WIDGET_VISIBLE (GTK_WIDGET (clock)))
     {
-	gtk_widget_queue_draw (GTK_WIDGET (clock));
+        gtk_widget_queue_draw (GTK_WIDGET (clock));
     }
 }
 
@@ -694,10 +697,42 @@
     return (clock->mode);
 }
 
+void
+xfce_clock_set_format (XfceClock * clock, const gchar * format)
+{
+    if (clock->format_string != NULL)
+    {
+        g_free (clock->format_string);
+        clock->format_string = NULL;
+    }
+
+    clock->format_string = NULL;
+    if (format != NULL)
+    {
+        clock->format_string = g_strdup (format);
+    }
+}
+
 static void
+xfce_clock_format_time_to_utf8 (gchar * dest, gsize dst_size,
+                                const gchar * fmt, struct tm *tm)
+{
+    if (dest == NULL || fmt == NULL || tm == NULL)
+        return;
+
+    gchar *dummy = g_locale_from_utf8 (fmt, -1, NULL, NULL, NULL);
+
+    strftime (dest, 256, dummy, tm);
+    g_free (dummy);
+    dummy = g_locale_to_utf8 (dest, -1, NULL, NULL, NULL);
+    g_strlcpy (dest, dummy, dst_size);
+    g_free (dummy);
+}
+
+static void
 xfce_clock_size_request (GtkWidget * widget, GtkRequisition * requisition)
 {
-    gchar buffer[16];
+    gchar buffer[256];
     XfceClock *clock;
     guint ln = 0;
     guint width = 0;
@@ -712,109 +747,119 @@
 
     switch (clock->mode)
     {
-	case XFCE_CLOCK_DIGITAL:
-	    if (clock->military_time)
-	    {
-		if (clock->display_secs)
-		{
-		    strcpy (buffer, "88:88:88");
-		}
-		else
-		{
-		    strcpy (buffer, "88:88");
-		}
-	    }
-	    else if (clock->display_am_pm)
-	    {
-		if (clock->display_secs)
-		{
-		    strcpy (buffer, "88:88:88XX");
-		}
-		else
-		{
-		    strcpy (buffer, "88:88XX");
-		}
-	    }
-	    else
-	    {
-		if (clock->display_secs)
-		{
-		    strcpy (buffer, "88:88:88");
-		}
-		else
-		{
-		    strcpy (buffer, "88:88");
-		}
-	    }
-	    layout = gtk_widget_create_pango_layout (widget, buffer);
-	    pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
-	    requisition->width = logical_rect.width + 6;
-	    requisition->height = logical_rect.height + 6;
-	    g_object_unref (G_OBJECT (layout));
-	    break;
-	case XFCE_CLOCK_LEDS:
-	    if (clock->military_time)
-	    {
-		if (clock->display_secs)
-		{
-		    ln = 8;
-		}
-		else
-		{
-		    ln = 5;
-		}
-	    }
-	    else if (clock->display_am_pm)
-	    {
-		if (clock->display_secs)
-		{
-		    ln = 9;
-		}
-		else
-		{
-		    ln = 6;
-		}
-	    }
-	    else
-	    {
-		if (clock->display_secs)
-		{
-		    ln = 8;
-		}
-		else
-		{
-		    ln = 5;
-		}
-	    }
-	    if (clock->led_size == DIGIT_HUGE)
-	    {
-		width = ln * DIGITS_HUGE_WIDTH;
-		height = DIGITS_HUGE_HEIGHT;
+        case XFCE_CLOCK_DIGITAL:
+            if (clock->show_formatted)
+            {
 
-	    }
-	    else if (clock->led_size == DIGIT_LARGE)
-	    {
-		width = ln * DIGITS_LARGE_WIDTH;
-		height = DIGITS_LARGE_HEIGHT;
+                time_t ticks = time (0);
+                struct tm *tm = localtime (&ticks);
 
-	    }
-	    else if (clock->led_size == DIGIT_MEDIUM)
-	    {
-		width = ln * DIGITS_MEDIUM_WIDTH;
-		height = DIGITS_MEDIUM_HEIGHT;
-	    }
-	    else
-	    {
-		width = ln * DIGITS_SMALL_WIDTH;
-		height = DIGITS_SMALL_HEIGHT;
-	    }
-	    requisition->width = width + 6;
-	    requisition->height = height + 6;
-	    break;
-	case XFCE_CLOCK_ANALOG:
-	default:
-	    requisition->width = XFCE_CLOCK_DEFAULT_SIZE;
-	    requisition->height = XFCE_CLOCK_DEFAULT_SIZE;
+                xfce_clock_format_time_to_utf8 (buffer, 256,
+                                                clock->format_string, tm);
+
+            }
+            else if (clock->military_time)
+            {
+                if (clock->display_secs)
+                {
+                    strcpy (buffer, "88:88:88");
+                }
+                else
+                {
+                    strcpy (buffer, "88:88");
+                }
+            }
+            else if (clock->display_am_pm)
+            {
+                if (clock->display_secs)
+                {
+                    strcpy (buffer, "88:88:88XX");
+                }
+                else
+                {
+                    strcpy (buffer, "88:88XX");
+                }
+            }
+            else
+            {
+                if (clock->display_secs)
+                {
+                    strcpy (buffer, "88:88:88");
+                }
+                else
+                {
+                    strcpy (buffer, "88:88");
+                }
+            }
+            layout = gtk_widget_create_pango_layout (widget, buffer);
+            pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+            requisition->width = logical_rect.width + 6;
+            requisition->height = logical_rect.height + 6;
+            g_object_unref (G_OBJECT (layout));
+            break;
+        case XFCE_CLOCK_LEDS:
+            if (clock->military_time)
+            {
+                if (clock->display_secs)
+                {
+                    ln = 8;
+                }
+                else
+                {
+                    ln = 5;
+                }
+            }
+            else if (clock->display_am_pm)
+            {
+                if (clock->display_secs)
+                {
+                    ln = 9;
+                }
+                else
+                {
+                    ln = 6;
+                }
+            }
+            else
+            {
+                if (clock->display_secs)
+                {
+                    ln = 8;
+                }
+                else
+                {
+                    ln = 5;
+                }
+            }
+            if (clock->led_size == DIGIT_HUGE)
+            {
+                width = ln * DIGITS_HUGE_WIDTH;
+                height = DIGITS_HUGE_HEIGHT;
+
+            }
+            else if (clock->led_size == DIGIT_LARGE)
+            {
+                width = ln * DIGITS_LARGE_WIDTH;
+                height = DIGITS_LARGE_HEIGHT;
+
+            }
+            else if (clock->led_size == DIGIT_MEDIUM)
+            {
+                width = ln * DIGITS_MEDIUM_WIDTH;
+                height = DIGITS_MEDIUM_HEIGHT;
+            }
+            else
+            {
+                width = ln * DIGITS_SMALL_WIDTH;
+                height = DIGITS_SMALL_HEIGHT;
+            }
+            requisition->width = width + 6;
+            requisition->height = height + 6;
+            break;
+        case XFCE_CLOCK_ANALOG:
+        default:
+            requisition->width = XFCE_CLOCK_DEFAULT_SIZE;
+            requisition->height = XFCE_CLOCK_DEFAULT_SIZE;
     }
 }
 
@@ -833,8 +878,8 @@
     clock = XFCE_CLOCK (widget);
 
     if (GTK_WIDGET_REALIZED (widget))
-	gdk_window_move_resize (widget->window, allocation->x, allocation->y,
-				allocation->width, allocation->height);
+        gdk_window_move_resize (widget->window, allocation->x, allocation->y,
+                                allocation->width, allocation->height);
 
 
     size = MIN (allocation->width, allocation->height);
@@ -864,39 +909,39 @@
 
     if (clock->pointer_width / 4 > 0)
     {
-	for (i = 0; i < 12; i++)
-	{
-	    theta = (i * M_PI / 6.);
-	    s = sin (theta);
-	    c = cos (theta);
+        for (i = 0; i < 12; i++)
+        {
+            theta = (i * M_PI / 6.);
+            s = sin (theta);
+            c = cos (theta);
 
-	    points[0].x = xc + s * (clock->radius - demi) - quarter;
-	    points[0].y = yc + c * (clock->radius - demi) - quarter;
-	    points[1].x = xc + s * (clock->radius - demi) - quarter;
-	    points[1].y = yc + c * (clock->radius - demi) + quarter;
-	    points[2].x = xc + s * (clock->radius - demi) + quarter;
-	    points[2].y = yc + c * (clock->radius - demi) + quarter;
-	    points[3].x = xc + s * (clock->radius - demi) + quarter;
-	    points[3].y = yc + c * (clock->radius - demi) - quarter;
-	    points[4].x = xc + s * (clock->radius - demi) - quarter;
-	    points[4].y = yc + c * (clock->radius - demi) - quarter;
+            points[0].x = xc + s * (clock->radius - demi) - quarter;
+            points[0].y = yc + c * (clock->radius - demi) - quarter;
+            points[1].x = xc + s * (clock->radius - demi) - quarter;
+            points[1].y = yc + c * (clock->radius - demi) + quarter;
+            points[2].x = xc + s * (clock->radius - demi) + quarter;
+            points[2].y = yc + c * (clock->radius - demi) + quarter;
+            points[3].x = xc + s * (clock->radius - demi) + quarter;
+            points[3].y = yc + c * (clock->radius - demi) - quarter;
+            points[4].x = xc + s * (clock->radius - demi) - quarter;
+            points[4].y = yc + c * (clock->radius - demi) - quarter;
 
-	    gdk_draw_polygon (widget->window, gc, TRUE, points, 5);
-	}
+            gdk_draw_polygon (widget->window, gc, TRUE, points, 5);
+        }
     }
     else
     {
-	for (i = 0; i < 12; i++)
-	{
-	    theta = (i * M_PI / 6.);
-	    s = sin (theta);
-	    c = cos (theta);
+        for (i = 0; i < 12; i++)
+        {
+            theta = (i * M_PI / 6.);
+            s = sin (theta);
+            c = cos (theta);
 
-	    gdk_draw_line (widget->window, gc, xc + s * (clock->radius - 1),
-			   yc + c * (clock->radius - 1),
-			   xc + s * (clock->radius + 1),
-			   yc + c * (clock->radius + 1));
-	}
+            gdk_draw_line (widget->window, gc, xc + s * (clock->radius - 1),
+                           yc + c * (clock->radius - 1),
+                           xc + s * (clock->radius + 1),
+                           yc + c * (clock->radius + 1));
+        }
     }
 }
 
@@ -1012,8 +1057,8 @@
     gint h, m, s;
     gint x, y;
     gchar ampm[3] = "AM";
-    gchar time_buf[24];
-    gint width, height;		/* to measure out string. */
+    gchar time_buf[256];
+    gint width, height;         /* to measure out string. */
     PangoLayout *layout = NULL;
 
     g_return_if_fail (widget != NULL);
@@ -1027,37 +1072,45 @@
     m = tm->tm_min;
     s = tm->tm_sec;
 
+    time_buf[0] = '\0';
+
     if (h >= 12)
-	ampm[0] = 'P';
+        ampm[0] = 'P';
 
     if (!(clock->military_time))
     {
-	if (h > 12)
-	    h -= 12;
-	if (h == 0)
-	    h = 12;
+        if (h > 12)
+            h -= 12;
+        if (h == 0)
+            h = 12;
     }
 
-    if (clock->military_time)
+    if (clock->show_formatted &&
+        clock->format_string != NULL && strlen (clock->format_string) != 0)
     {
-	if (clock->display_secs)
-	    sprintf (time_buf, "%d:%02d:%02d", h, m, s);
-	else
-	    sprintf (time_buf, "%d:%02d", h, m);
+        xfce_clock_format_time_to_utf8 (time_buf, sizeof(time_buf), clock->format_string, tm);
+
     }
+    else if (clock->military_time)
+    {
+        if (clock->display_secs)
+            sprintf (time_buf, "%d:%02d:%02d", h, m, s);
+        else
+            sprintf (time_buf, "%d:%02d", h, m);
+    }
     else if (clock->display_am_pm)
     {
-	if (clock->display_secs)
-	    sprintf (time_buf, "%d:%02d:%02d %s", h, m, s, ampm);
-	else
-	    sprintf (time_buf, "%d:%02d %s", h, m, ampm);
+        if (clock->display_secs)
+            sprintf (time_buf, "%d:%02d:%02d %s", h, m, s, ampm);
+        else
+            sprintf (time_buf, "%d:%02d %s", h, m, ampm);
     }
     else
     {
-	if (clock->display_secs)
-	    sprintf (time_buf, "%d:%02d:%02d", h, m, s);
-	else
-	    sprintf (time_buf, "%d:%02d", h, m);
+        if (clock->display_secs)
+            sprintf (time_buf, "%d:%02d:%02d", h, m, s);
+        else
+            sprintf (time_buf, "%d:%02d", h, m);
     }
 
     layout = gtk_widget_create_pango_layout (widget, time_buf);
@@ -1069,40 +1122,59 @@
 
     if (area)
     {
-	gdk_gc_set_clip_rectangle (widget->style->light_gc[widget->state],
-				   area);
-	gdk_gc_set_clip_rectangle (widget->style->dark_gc[widget->state],
-				   area);
-	gdk_gc_set_clip_rectangle (widget->style->mid_gc[widget->state],
-				   area);
-	gdk_gc_set_clip_rectangle (widget->style->black_gc, area);
-	gdk_gc_set_clip_rectangle (widget->style->bg_gc[widget->state], area);
-	gdk_window_clear_area (widget->window, area->x, area->y, area->width,
-			       area->height);
+        gdk_gc_set_clip_rectangle (widget->style->light_gc[widget->state],
+                                   area);
+        gdk_gc_set_clip_rectangle (widget->style->dark_gc[widget->state],
+                                   area);
+        gdk_gc_set_clip_rectangle (widget->style->mid_gc[widget->state],
+                                   area);
+        gdk_gc_set_clip_rectangle (widget->style->black_gc, area);
+        gdk_gc_set_clip_rectangle (widget->style->bg_gc[widget->state], area);
+        gdk_window_clear_area (widget->window, area->x, area->y, area->width,
+                               area->height);
     }
     else
     {
-	gdk_window_clear_area (widget->window, 0, 0, widget->allocation.width,
-			       widget->allocation.height);
+        gdk_window_clear_area (widget->window, 0, 0, widget->allocation.width,
+                               widget->allocation.height);
     }
 
     gdk_draw_layout (widget->window, widget->style->text_gc[widget->state], x,
-		     y, layout);
+                     y, layout);
     g_object_unref (G_OBJECT (layout));
 
     if (area)
     {
-	gdk_gc_set_clip_rectangle (widget->style->light_gc[widget->state],
-				   NULL);
-	gdk_gc_set_clip_rectangle (widget->style->dark_gc[widget->state],
-				   NULL);
-	gdk_gc_set_clip_rectangle (widget->style->mid_gc[widget->state],
-				   NULL);
-	gdk_gc_set_clip_rectangle (widget->style->black_gc, NULL);
-	gdk_gc_set_clip_rectangle (widget->style->bg_gc[widget->state], NULL);
+        gdk_gc_set_clip_rectangle (widget->style->light_gc[widget->state],
+                                   NULL);
+        gdk_gc_set_clip_rectangle (widget->style->dark_gc[widget->state],
+                                   NULL);
+        gdk_gc_set_clip_rectangle (widget->style->mid_gc[widget->state],
+                                   NULL);
+        gdk_gc_set_clip_rectangle (widget->style->black_gc, NULL);
+        gdk_gc_set_clip_rectangle (widget->style->bg_gc[widget->state], NULL);
     }
 }
 
+void
+xfce_clock_set_formatted_view (XfceClock * clock, gboolean formatted)
+{
+    g_return_if_fail (clock != NULL);
+    g_return_if_fail (XFCE_IS_CLOCK (clock));
+
+    clock->show_formatted = formatted;
+}
+
+gboolean
+xfce_clock_get_formatted_view (XfceClock * clock)
+{
+    g_return_val_if_fail (clock != NULL, 0);
+    g_return_val_if_fail (XFCE_IS_CLOCK (clock), 0);
+
+    return clock->show_formatted;
+}
+
+
 static void
 xfce_clock_draw_analog (GtkWidget * widget, GdkRectangle * area)
 {
@@ -1120,21 +1192,21 @@
 
     if (area)
     {
-	gdk_gc_set_clip_rectangle (widget->style->light_gc[widget->state],
-				   area);
-	gdk_gc_set_clip_rectangle (widget->style->dark_gc[widget->state],
-				   area);
-	gdk_gc_set_clip_rectangle (widget->style->mid_gc[widget->state],
-				   area);
-	gdk_gc_set_clip_rectangle (widget->style->black_gc, area);
-	gdk_gc_set_clip_rectangle (widget->style->bg_gc[widget->state], area);
-	gdk_window_clear_area (widget->window, area->x, area->y, area->width,
-			       area->height);
+        gdk_gc_set_clip_rectangle (widget->style->light_gc[widget->state],
+                                   area);
+        gdk_gc_set_clip_rectangle (widget->style->dark_gc[widget->state],
+                                   area);
+        gdk_gc_set_clip_rectangle (widget->style->mid_gc[widget->state],
+                                   area);
+        gdk_gc_set_clip_rectangle (widget->style->black_gc, area);
+        gdk_gc_set_clip_rectangle (widget->style->bg_gc[widget->state], area);
+        gdk_window_clear_area (widget->window, area->x, area->y, area->width,
+                               area->height);
     }
     else
     {
-	gdk_window_clear_area (widget->window, 0, 0, widget->allocation.width,
-			       widget->allocation.height);
+        gdk_window_clear_area (widget->window, 0, 0, widget->allocation.width,
+                               widget->allocation.height);
     }
 
     /* 
@@ -1143,39 +1215,39 @@
      */
     if (MIN (xc, yc) >= 20)
     {
-	draw_ticks (widget, widget->style->dark_gc[widget->state], xc, yc);
-	draw_hrs_pointer (widget, widget->style->dark_gc[widget->state], xc,
-			  yc);
-	draw_min_pointer (widget, widget->style->dark_gc[widget->state], xc,
-			  yc);
-	if (clock->display_secs)
-	{
-	    draw_sec_pointer (widget, widget->style->dark_gc[widget->state],
-			      xc, yc);
-	}
+        draw_ticks (widget, widget->style->dark_gc[widget->state], xc, yc);
+        draw_hrs_pointer (widget, widget->style->dark_gc[widget->state], xc,
+                          yc);
+        draw_min_pointer (widget, widget->style->dark_gc[widget->state], xc,
+                          yc);
+        if (clock->display_secs)
+        {
+            draw_sec_pointer (widget, widget->style->dark_gc[widget->state],
+                              xc, yc);
+        }
     }
     draw_ticks (widget, widget->style->text_gc[widget->state], xc - 1,
-		yc - 1);
+                yc - 1);
     draw_hrs_pointer (widget, widget->style->text_gc[widget->state], xc - 1,
-		      yc - 1);
+                      yc - 1);
     draw_min_pointer (widget, widget->style->text_gc[widget->state], xc - 1,
-		      yc - 1);
+                      yc - 1);
     if (clock->display_secs)
     {
-	draw_sec_pointer (widget, widget->style->text_gc[widget->state],
-			  xc - 1, yc - 1);
+        draw_sec_pointer (widget, widget->style->text_gc[widget->state],
+                          xc - 1, yc - 1);
     }
 
     if (area)
     {
-	gdk_gc_set_clip_rectangle (widget->style->light_gc[widget->state],
-				   NULL);
-	gdk_gc_set_clip_rectangle (widget->style->dark_gc[widget->state],
-				   NULL);
-	gdk_gc_set_clip_rectangle (widget->style->mid_gc[widget->state],
-				   NULL);
-	gdk_gc_set_clip_rectangle (widget->style->black_gc, NULL);
-	gdk_gc_set_clip_rectangle (widget->style->bg_gc[widget->state], NULL);
+        gdk_gc_set_clip_rectangle (widget->style->light_gc[widget->state],
+                                   NULL);
+        gdk_gc_set_clip_rectangle (widget->style->dark_gc[widget->state],
+                                   NULL);
+        gdk_gc_set_clip_rectangle (widget->style->mid_gc[widget->state],
+                                   NULL);
+        gdk_gc_set_clip_rectangle (widget->style->black_gc, NULL);
+        gdk_gc_set_clip_rectangle (widget->style->bg_gc[widget->state], NULL);
     }
 }
 
@@ -1206,78 +1278,77 @@
     s = tm->tm_sec;
 
     if (h >= 12)
-	ampm[0] = 'p';
+        ampm[0] = 'p';
 
     if (s & 1)
-	separator[0] = ':';
+        separator[0] = ':';
     else
-	separator[0] = ' ';
+        separator[0] = ' ';
 
     if (!(clock->military_time))
     {
-	if (h > 12)
-	    h -= 12;
-	if (h == 0)
-	    h = 12;
+        if (h > 12)
+            h -= 12;
+        if (h == 0)
+            h = 12;
     }
 
     if (clock->military_time)
     {
-	if (clock->display_secs)
-	    sprintf (time_buf, "%02d%s%02d%s%02d", h, separator, m, separator,
-		     s);
-	else
-	    sprintf (time_buf, "%02d%s%02d", h, separator, m);
+        if (clock->display_secs)
+            sprintf (time_buf, "%02d%s%02d%s%02d", h, separator, m, separator, s);
+        else
+            sprintf (time_buf, "%02d%s%02d", h, separator, m);
     }
     else if (clock->display_am_pm)
     {
 
-	if (clock->display_secs)
-	    sprintf (time_buf, "%02d%s%02d%s%02d%s", h, separator, m,
-		     separator, s, ampm);
-	else
-	    sprintf (time_buf, "%02d%s%02d%s", h, separator, m, ampm);
+        if (clock->display_secs)
+            sprintf (time_buf, "%02d%s%02d%s%02d%s", h, separator, m,
+                     separator, s, ampm);
+        else
+            sprintf (time_buf, "%02d%s%02d%s", h, separator, m, ampm);
     }
     else
     {
-	if (clock->display_secs)
-	    sprintf (time_buf, "%02d%s%02d%s%02d", h, separator, m,
-		     separator, s);
-	else
-	    sprintf (time_buf, "%02d%s%02d", h, separator, m);
+        if (clock->display_secs)
+            sprintf (time_buf, "%02d%s%02d%s%02d", h, separator, m,
+                     separator, s);
+        else
+            sprintf (time_buf, "%02d%s%02d", h, separator, m);
     }
     if (time_buf[0] == '0')
-	time_buf[0] = ' ';
+        time_buf[0] = ' ';
 
     len = strlen (time_buf);
 
 
     if (clock->led_size == DIGIT_HUGE)
     {
-	c_width = DIGITS_HUGE_WIDTH;
-	c_height = DIGITS_HUGE_HEIGHT;
+        c_width = DIGITS_HUGE_WIDTH;
+        c_height = DIGITS_HUGE_HEIGHT;
     }
     else if (clock->led_size == DIGIT_LARGE)
     {
-	c_width = DIGITS_LARGE_WIDTH;
-	c_height = DIGITS_LARGE_HEIGHT;
+        c_width = DIGITS_LARGE_WIDTH;
+        c_height = DIGITS_LARGE_HEIGHT;
     }
     else if (clock->led_size == DIGIT_MEDIUM)
     {
-	c_width = DIGITS_MEDIUM_WIDTH;
-	c_height = DIGITS_MEDIUM_HEIGHT;
+        c_width = DIGITS_MEDIUM_WIDTH;
+        c_height = DIGITS_MEDIUM_HEIGHT;
     }
     else
     {
-	c_width = DIGITS_SMALL_WIDTH;
-	c_height = DIGITS_SMALL_HEIGHT;
+        c_width = DIGITS_SMALL_WIDTH;
+        c_height = DIGITS_SMALL_HEIGHT;
 
     }
 
     /* Center in the widget (if it fits in) */
     if ((x = (widget->allocation.width - (c_width * len))) <= 0)
     {
-	x = 0;
+        x = 0;
     }
 
     x = x / 2;
@@ -1286,41 +1357,41 @@
 
     if (area)
     {
-	gdk_gc_set_clip_rectangle (widget->style->light_gc[widget->state],
-				   area);
-	gdk_gc_set_clip_rectangle (widget->style->dark_gc[widget->state],
-				   area);
-	gdk_gc_set_clip_rectangle (widget->style->mid_gc[widget->state],
-				   area);
-	gdk_gc_set_clip_rectangle (widget->style->black_gc, area);
-	gdk_gc_set_clip_rectangle (widget->style->bg_gc[widget->state], area);
-	gdk_window_clear_area (widget->window, area->x, area->y, area->width,
-			       area->height);
+        gdk_gc_set_clip_rectangle (widget->style->light_gc[widget->state],
+                                   area);
+        gdk_gc_set_clip_rectangle (widget->style->dark_gc[widget->state],
+                                   area);
+        gdk_gc_set_clip_rectangle (widget->style->mid_gc[widget->state],
+                                   area);
+        gdk_gc_set_clip_rectangle (widget->style->black_gc, area);
+        gdk_gc_set_clip_rectangle (widget->style->bg_gc[widget->state], area);
+        gdk_window_clear_area (widget->window, area->x, area->y, area->width,
+                               area->height);
     }
     else
     {
-	gdk_window_clear_area (widget->window, 0, 0, widget->allocation.width,
-			       widget->allocation.height);
+        gdk_window_clear_area (widget->window, 0, 0, widget->allocation.width,
+                               widget->allocation.height);
     }
 
     for (i = 0; i < len; i++)
     {
-	draw_digits (clock, widget->style->dark_gc[widget->state],
-		     x + i * c_width + 1, y + 1, time_buf[i]);
-	draw_digits (clock, widget->style->text_gc[widget->state],
-		     x + i * c_width, y, time_buf[i]);
+        draw_digits (clock, widget->style->dark_gc[widget->state],
+                     x + i * c_width + 1, y + 1, time_buf[i]);
+        draw_digits (clock, widget->style->text_gc[widget->state],
+                     x + i * c_width, y, time_buf[i]);
     }
 
     if (area)
     {
-	gdk_gc_set_clip_rectangle (widget->style->light_gc[widget->state],
-				   NULL);
-	gdk_gc_set_clip_rectangle (widget->style->dark_gc[widget->state],
-				   NULL);
-	gdk_gc_set_clip_rectangle (widget->style->mid_gc[widget->state],
-				   NULL);
-	gdk_gc_set_clip_rectangle (widget->style->black_gc, NULL);
-	gdk_gc_set_clip_rectangle (widget->style->bg_gc[widget->state], NULL);
+        gdk_gc_set_clip_rectangle (widget->style->light_gc[widget->state],
+                                   NULL);
+        gdk_gc_set_clip_rectangle (widget->style->dark_gc[widget->state],
+                                   NULL);
+        gdk_gc_set_clip_rectangle (widget->style->mid_gc[widget->state],
+                                   NULL);
+        gdk_gc_set_clip_rectangle (widget->style->black_gc, NULL);
+        gdk_gc_set_clip_rectangle (widget->style->bg_gc[widget->state], NULL);
     }
 }
 
@@ -1336,19 +1407,19 @@
 
     if (GTK_WIDGET_DRAWABLE (widget))
     {
-	switch (clock->mode)
-	{
-	    case XFCE_CLOCK_ANALOG:
-		xfce_clock_draw_analog (widget, area);
-		break;
-	    case XFCE_CLOCK_LEDS:
-		xfce_clock_draw_leds (widget, area);
-		break;
-	    case XFCE_CLOCK_DIGITAL:
-	    default:
-		xfce_clock_draw_digital (widget, area);
-		break;
-	}
+        switch (clock->mode)
+        {
+            case XFCE_CLOCK_ANALOG:
+                xfce_clock_draw_analog (widget, area);
+                break;
+            case XFCE_CLOCK_LEDS:
+                xfce_clock_draw_leds (widget, area);
+                break;
+            case XFCE_CLOCK_DIGITAL:
+            default:
+                xfce_clock_draw_digital (widget, area);
+                break;
+        }
     }
 }
 
@@ -1396,18 +1467,17 @@
     h = tm->tm_hour;
     m = tm->tm_min;
     s = tm->tm_sec;
-    if (!
-	(((!((clock->display_secs) || (clock->mode == XFCE_CLOCK_LEDS)))
-	  || (s == clock->old_second)) && (m == clock->old_minute)
-	 && (h == clock->old_hour)))
+    if (!(((!((clock->display_secs) || (clock->mode == XFCE_CLOCK_LEDS)))
+           || (s == clock->old_second)) && (m == clock->old_minute)
+          && (h == clock->old_hour)))
     {
-	clock->old_hour = h;
-	clock->old_minute = m;
-	clock->old_second = s;
-	clock->hrs_angle = 2.5 * M_PI - (h % 12) * M_PI / 6 - m * M_PI / 360;
-	clock->min_angle = 2.5 * M_PI - m * M_PI / 30;
-	clock->sec_angle = 2.5 * M_PI - s * M_PI / 30;
-	gtk_widget_queue_draw (GTK_WIDGET (clock));
+        clock->old_hour = h;
+        clock->old_minute = m;
+        clock->old_second = s;
+        clock->hrs_angle = 2.5 * M_PI - (h % 12) * M_PI / 6 - m * M_PI / 360;
+        clock->min_angle = 2.5 * M_PI - m * M_PI / 30;
+        clock->sec_angle = 2.5 * M_PI - s * M_PI / 30;
+        gtk_widget_queue_draw (GTK_WIDGET (clock));
     }
 
     return TRUE;
@@ -1423,51 +1493,51 @@
     g_return_if_fail (XFCE_IS_CLOCK (clock));
 
     if ((c >= '0') && (c <= '9'))
-	tc = c - '0';
+        tc = c - '0';
     else if ((c == 'A') || (c == 'a'))
-	tc = 10;
+        tc = 10;
     else if ((c == 'P') || (c == 'p'))
-	tc = 11;
+        tc = 11;
     else if (c == ':')
-	tc = 12;
+        tc = 12;
     else
-	return;
+        return;
 
     switch (clock->led_size)
     {
-	case DIGIT_HUGE:
-	    tsx = tc * DIGITS_HUGE_WIDTH;
-	    tsy =
-		DIGITS_SMALL_HEIGHT + DIGITS_MEDIUM_HEIGHT +
-		DIGITS_LARGE_HEIGHT;
-	    tsw = DIGITS_HUGE_WIDTH;
-	    tsh = DIGITS_HUGE_HEIGHT;
-	    break;
-	case DIGIT_LARGE:
-	    tsx = tc * DIGITS_LARGE_WIDTH;
-	    tsy = DIGITS_SMALL_HEIGHT + DIGITS_MEDIUM_HEIGHT;
-	    tsw = DIGITS_LARGE_WIDTH;
-	    tsh = DIGITS_LARGE_HEIGHT;
-	    break;
-	case DIGIT_MEDIUM:
-	    tsx = tc * DIGITS_MEDIUM_WIDTH;
-	    tsy = DIGITS_SMALL_HEIGHT;
-	    tsw = DIGITS_MEDIUM_WIDTH;
-	    tsh = DIGITS_MEDIUM_HEIGHT;
-	    break;
-	case DIGIT_SMALL:
-	default:
-	    tsx = tc * DIGITS_SMALL_WIDTH;
-	    tsy = 0;
-	    tsw = DIGITS_SMALL_WIDTH;
-	    tsh = DIGITS_SMALL_HEIGHT;
-	    break;
+        case DIGIT_HUGE:
+            tsx = tc * DIGITS_HUGE_WIDTH;
+            tsy =
+                DIGITS_SMALL_HEIGHT + DIGITS_MEDIUM_HEIGHT +
+                DIGITS_LARGE_HEIGHT;
+            tsw = DIGITS_HUGE_WIDTH;
+            tsh = DIGITS_HUGE_HEIGHT;
+            break;
+        case DIGIT_LARGE:
+            tsx = tc * DIGITS_LARGE_WIDTH;
+            tsy = DIGITS_SMALL_HEIGHT + DIGITS_MEDIUM_HEIGHT;
+            tsw = DIGITS_LARGE_WIDTH;
+            tsh = DIGITS_LARGE_HEIGHT;
+            break;
+        case DIGIT_MEDIUM:
+            tsx = tc * DIGITS_MEDIUM_WIDTH;
+            tsy = DIGITS_SMALL_HEIGHT;
+            tsw = DIGITS_MEDIUM_WIDTH;
+            tsh = DIGITS_MEDIUM_HEIGHT;
+            break;
+        case DIGIT_SMALL:
+        default:
+            tsx = tc * DIGITS_SMALL_WIDTH;
+            tsy = 0;
+            tsw = DIGITS_SMALL_WIDTH;
+            tsh = DIGITS_SMALL_HEIGHT;
+            break;
     }
 
     gdk_gc_set_stipple (gc, clock->digits_bmap);
     gdk_gc_set_fill (gc, GDK_STIPPLED);
     gdk_gc_set_ts_origin (gc, DIGITS_WIDTH - tsx + x,
-			  DIGITS_HEIGHT - tsy + y);
+                          DIGITS_HEIGHT - tsy + y);
 
     gdk_draw_rectangle (GTK_WIDGET (clock)->window, gc, TRUE, x, y, tsw, tsh);
 

Modified: libxfcegui4/trunk/libxfcegui4/xfce_clock.h
===================================================================
--- libxfcegui4/trunk/libxfcegui4/xfce_clock.h	2006-09-04 19:35:02 UTC (rev 23082)
+++ libxfcegui4/trunk/libxfcegui4/xfce_clock.h	2006-09-04 20:41:19 UTC (rev 23083)
@@ -73,6 +73,8 @@
 	gboolean military_time;	/* true=24 hour clock, false = 12 hour clock. */
 	gboolean display_am_pm;
 	gboolean display_secs;
+	gboolean show_formatted;
+	gchar *format_string;
 	XfceClockLedSize led_size;
 
 	/* Private data */
@@ -111,6 +113,9 @@
     void xfce_clock_resume (XfceClock * clock);
     void xfce_clock_set_mode (XfceClock * clock, XfceClockMode mode);
     void xfce_clock_toggle_mode (XfceClock * clock);
+    void xfce_clock_set_format (XfceClock * clock, const gchar * format);
+    void xfce_clock_set_formatted_view (XfceClock * clock, gboolean formatted);
+    gboolean xfce_clock_get_formatted_view (XfceClock * clock);
     XfceClockMode xfce_clock_get_mode (XfceClock * clock);
 
 G_END_DECLS



More information about the Xfce4-commits mailing list