From 925a6437c312b755674834f2dc4172beb8572761 Mon Sep 17 00:00:00 2001
From: Jasper Huijsmans <jbhuijsmans@home.nl>
Date: Thu, 19 Aug 2004 11:39:18 +0000
Subject: [PATCH] Rip out thread support. threads + gtk == trouble ;-)

(Old svn revision: 4104)
---
 ChangeLog                         | 1137 +++++++++++++----------------
 Makefile.in                       |    5 -
 TODO                              |    3 +-
 configure                         |  114 +--
 configure.ac                      |   10 +-
 doc/C/Makefile.in                 |    5 -
 doc/C/images/Makefile.in          |    5 -
 doc/Makefile.in                   |    5 -
 doc/fr/Makefile.in                |    5 -
 doc/fr/images/Makefile.in         |    5 -
 doc/it/Makefile.in                |    5 -
 doc/it/images/Makefile.in         |    5 -
 icons/Makefile.in                 |    5 -
 panel/Makefile.am                 |    6 +-
 panel/Makefile.in                 |   11 +-
 panel/item.c                      |    4 -
 panel/main.c                      |   16 -
 panel/panel.c                     |    7 -
 panel/xfce_support.c              |    2 -
 plugins/Makefile.in               |    5 -
 plugins/clock/Makefile.in         |    5 -
 plugins/clock/clock.c             |   12 +-
 plugins/mailcheck/Makefile.in     |    5 -
 plugins/mailcheck/mailcheck.c     |    4 -
 plugins/pager/Makefile.in         |    5 -
 plugins/sample-plugin/Makefile.in |    5 -
 plugins/separator/Makefile.in     |    5 -
 plugins/switcher/Makefile.in      |    5 -
 plugins/systembuttons/Makefile.in |    5 -
 settings/Makefile.in              |    5 -
 themes/Makefile.in                |    5 -
 31 files changed, 511 insertions(+), 910 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index efd671791..94bb5242f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,400 @@
+2004-08-15 21:39  olivier
+
+	* panel/add-control-dialog.c, panel/controls.c, po/ar.gmo,
+	  po/ar.po, po/az.gmo, po/az.po, po/bg.gmo, po/bg.po, po/ca.gmo,
+	  po/ca.po, po/cs.gmo, po/cs.po, po/de.gmo, po/de.po, po/es.gmo,
+	  po/es.po, po/es_MX.gmo, po/es_MX.po, po/eu.gmo, po/eu.po,
+	  po/fa_IR.gmo, po/fa_IR.po, po/fi.gmo, po/fi.po, po/fr.gmo,
+	  po/fr.po, po/hi.gmo, po/hi.po, po/hu.gmo, po/hu.po, po/it.gmo,
+	  po/it.po, po/ja.gmo, po/ja.po, po/ko.gmo, po/ko.po, po/lt.gmo,
+	  po/lt.po, po/ms.gmo, po/ms.po, po/nl.gmo, po/nl.po, po/no.gmo,
+	  po/no.po, po/pl.gmo, po/pl.po, po/pt_BR.gmo, po/pt_BR.po,
+	  po/pt_PT.gmo, po/pt_PT.po, po/ru.gmo, po/ru.po, po/sv.gmo,
+	  po/sv.po, po/ta.gmo, po/ta.po, po/tr.gmo, po/tr.po, po/vi.gmo,
+	  po/vi.po, po/xfce4-panel.pot, po/zh_CN.gmo, po/zh_CN.po,
+	  po/zh_TW.gmo, po/zh_TW.po, settings/xfce-panel-settings.desktop:
+	  Resync with repository, most notably: - libxfcegui4 fixes with
+	  gtk 2.2 - xfwm4 updates - Present panel plugins in alphabetical
+	  order - Fix add plugin dialog being placed over the panel when
+	  using SM - French po updates - Other various small bug fixes
+
+2004-08-14 21:44  pollux
+
+	* configure, configure.ac, po/he.gmo, po/he.po: Hebrew translations
+	  from Yuval Tanny <tanai@int.gov.il>
+
+2004-08-13 11:36  pollux
+
+	* Makefile.am, Makefile.in, aclocal.m4, xfce4rc.ro: adds xfce4rc
+	  Romanian translation from Razvan T. Coloja
+
+2004-08-12 23:28  jasper
+
+	* panel/item_dialog.c: Add preliminary, minimal appfinder DND
+	  support. Patch by Eduard.
+
+2004-08-10 10:14  jasper
+
+	* panel/panel.c: Small tweak I apparently forgot to commit earlier
+
+2004-08-08 19:25  benny
+
+	* doc/C/: xfce4-panel.html, xfce4-panel.xml,
+	  images/clock-properties.png, images/default_panel.png,
+	  images/handle-popup.png, images/item-popup.png,
+	  images/launcher-properties.png, images/mailcheck-properties.png,
+	  images/menuitem-properties.png, images/nooptions-properties.png,
+	  images/panel-settings.png, images/systembuttons-properties.png:
+	  Updated documentation, thanks to Francois.
+
+2004-07-29 22:28  benny
+
+	* Makefile.in, aclocal.m4, config.guess, config.sub, configure,
+	  depcomp, install-sh, ltmain.sh, doc/Makefile.in,
+	  doc/C/Makefile.in, doc/C/images/Makefile.in, doc/fr/Makefile.in,
+	  doc/fr/images/Makefile.in, doc/it/Makefile.in,
+	  doc/it/images/Makefile.in, icons/Makefile.in, panel/Makefile.in,
+	  panel/add-control-dialog.c, panel/icons.c, plugins/Makefile.in,
+	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
+	  plugins/pager/Makefile.in, plugins/sample-plugin/Makefile.in,
+	  plugins/separator/Makefile.in, plugins/switcher/Makefile.in,
+	  plugins/systembuttons/Makefile.in, settings/Makefile.in,
+	  themes/Makefile.in: Fix get_panel_icon() borkage and try to fix
+	  the 'Add new item' positioning.
+
+2004-07-28 23:22  benny
+
+	* m4/depends.m4: Fixed (module)_FOUND bug reported by brian.
+	  Hopefully nothing else broke this time.
+
+2004-07-27 22:04  benny
+
+	* icons/Makefile.am, icons/xfce4-panel-icon.h,
+	  icons/xfce4-panel.png, settings/xfce_settings_plugin.c: Use
+	  xfce_themed_icon_load() for the mcs plugin.
+
+2004-07-27 00:51  kelnos
+
+	* Makefile.in, aclocal.m4, config.guess, config.sub, configure,
+	  configure.ac, depcomp, install-sh, ltmain.sh, doc/Makefile.in,
+	  doc/C/Makefile.in, doc/C/images/Makefile.in, doc/fr/Makefile.in,
+	  doc/fr/images/Makefile.in, doc/it/Makefile.in,
+	  doc/it/images/Makefile.in, icons/Makefile.in, panel/Makefile.in,
+	  plugins/Makefile.in, plugins/clock/Makefile.in,
+	  plugins/mailcheck/Makefile.in, plugins/pager/Makefile.in,
+	  plugins/sample-plugin/Makefile.in, plugins/separator/Makefile.in,
+	  plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in,
+	  settings/Makefile.in, themes/Makefile.in: well that's an annoying
+	  typo... depending on libxfcegui4 twice but libxfce4util not at
+	  all
+
+2004-07-26 21:05  benny
+
+	* Makefile.in, README.Kiosk, aclocal.m4, configure, configure.ac,
+	  doc/Makefile.in, doc/C/Makefile.in, doc/C/images/Makefile.in,
+	  doc/fr/Makefile.in, doc/fr/images/Makefile.in,
+	  doc/it/Makefile.in, doc/it/images/Makefile.in, icons/Makefile.in,
+	  panel/Makefile.in, panel/settings.c, plugins/Makefile.in,
+	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
+	  plugins/pager/Makefile.in, plugins/sample-plugin/Makefile.in,
+	  plugins/separator/Makefile.in, plugins/switcher/Makefile.in,
+	  plugins/systembuttons/Makefile.in, settings/Makefile.in,
+	  themes/Makefile.in: Added support for KIOSK mode.
+
+2004-07-24 20:52  benny
+
+	* m4/depends.m4: Readded XFCE_MCS_PLUGIN() again, dunno how I
+	  manage to remove it everytime I edit depends.m4!
+
+2004-07-24 19:59  jasper
+
+	* panel/panel.c: First threading bug. Expect some more to show up
+	  ;-)
+
+2004-07-24 19:31  jasper
+
+	* plugins/pager/pager.c: Allow multiple rows for pager
+
+2004-07-24 19:30  benny
+
+	* m4/depends.m4: XFCE_PANEL_PLUGIN had wrong panel version for the
+	  threaded test.
+
+2004-07-24 19:28  benny
+
+	* m4/depends.m4: Extended the XFCE_PANEL_PLUGIN macro to include
+	  some magic for threaded panels.
+
+2004-07-23 23:09  jasper
+
+	* Makefile.in, aclocal.m4, configure, configure.ac,
+	  doc/Makefile.in, doc/C/Makefile.in, doc/C/images/Makefile.in,
+	  doc/fr/Makefile.in, doc/fr/images/Makefile.in,
+	  doc/it/Makefile.in, doc/it/images/Makefile.in, icons/Makefile.in,
+	  panel/Makefile.am, panel/Makefile.in, panel/item.c, panel/main.c,
+	  panel/panel.c, panel/xfce_support.c, plugins/Makefile.in,
+	  plugins/clock/Makefile.in, plugins/clock/clock.c,
+	  plugins/mailcheck/Makefile.in, plugins/mailcheck/mailcheck.c,
+	  plugins/pager/Makefile.in, plugins/sample-plugin/Makefile.in,
+	  plugins/separator/Makefile.in, plugins/switcher/Makefile.in,
+	  plugins/systembuttons/Makefile.in, settings/Makefile.in,
+	  themes/Makefile.in: Patch by brian to add threading to the panel.
+
+2004-07-23 20:06  jasper
+
+	* plugins/systembuttons/systembuttons.c: Oops
+
+2004-07-23 19:45  jasper
+
+	* plugins/systembuttons/systembuttons.c: Apparently needs stricter
+	  size settings.
+
+2004-07-22 17:00  jasper
+
+	* panel/: panel.c, panel.h: Find out which side of the screen the
+	  panel is on
+
+2004-07-22 01:00  benny
+
+	* m4/depends.m4: Readded the XFCE_MCS_PLUGIN macro. I didn't ment
+	  to remove it, tho.
+
+2004-07-21 15:23  jasper
+
+	* panel/: add-control-dialog.c, controls.c, panel.c, panel.h:
+	  Synthesize leave notify event when a registered gtk menu is
+	  closed. First step to fixing #266.
+
+2004-07-21 10:07  jasper
+
+	* panel/add-control-dialog.c: Center dialog (bug #263)
+
+2004-07-20 22:58  benny
+
+	* m4/depends.m4: Modifed panel plugin check, so one (the installer)
+	  can choose to install into a different plugin dir.
+
+2004-07-19 20:37  pollux
+
+	* po/: no.gmo, no.po: definitively fix #162
+
+2004-07-18 19:36  jasper
+
+	* panel/panel.c: Strange, stickyness was lost. Perhaps because of
+	  setting layer?
+
+2004-07-18 19:25  jasper
+
+	* panel/panel.c: Layer settings were lost after reorientation
+
+2004-07-18 10:46  jasper
+
+	* panel/panel.c: YAA (Yet Another Attempt ;) to fix autohiding. It
+	  works for me, please test.
+
+2004-07-15 14:23  jasper
+
+	* panel/main.c: Override theme for focus padding popup buttons
+
+2004-07-15 13:29  jasper
+
+	* settings/xfce_settings_plugin.c: Fix bug #235: changes to panel
+	  settings not accepted at first login
+
+2004-07-14 22:22  jasper
+
+	* NEWS, doc/C/xfce4-panel.html, doc/C/xfce4-panel.xml,
+	  doc/fr/xfce4-panel.html, doc/fr/xfce4-panel.xml,
+	  doc/it/xfce4-panel.html, doc/it/xfce4-panel.xml: Get rid of
+	  moongroup.com references
+
+2004-07-14 20:27  jasper
+
+	* panel/: item.c, panel.c: Fix for bug #215: crash when dropping
+	  large number of files
+
+2004-07-13 17:39  pollux
+
+	* po/: ca.gmo, ca.po: Catalan translation correction from Xan
+	  <DXpublica@telefonica.net>
+
+2004-07-12 08:22  jasper
+
+	* panel/panel.c: Create framework after reading settings, but
+	  create window before that.
+
+2004-07-11 14:41  jasper
+
+	* panel/: panel.c, panel.h, xfce_support.c, xfce_support.h: More
+	  positioning stuff. Let's hope I didn't break anything ...
+
+2004-07-11 09:51  olivier
+
+	* panel/main.c: Connect signal after session mgt.
+
+2004-07-11 09:33  olivier
+
+	* panel/: main.c, xfce_support.c: Use gtk EWMH functions if
+	  applicable, Fix a race condition with the WM because session was
+	  connected before even creating the panel (so now the correct EWMH
+	  hints are applied correctly)
+
+2004-07-09 22:18  pollux
+
+	* doc/it/images/default-session.png: oups little error
+
+2004-07-09 22:17  pollux
+
+	* aclocal.m4, configure, configure.ac, doc/Makefile.am,
+	  doc/Makefile.in, doc/it/Makefile.am, doc/it/Makefile.in,
+	  doc/it/xfce4-panel.html, doc/it/xfce4-panel.xml,
+	  doc/it/images/Makefile.am, doc/it/images/Makefile.in,
+	  doc/it/images/clock-properties.png,
+	  doc/it/images/default-session.png,
+	  doc/it/images/default_panel.png, doc/it/images/handle-popup.png,
+	  doc/it/images/item-popup.png,
+	  doc/it/images/launcher-properties.png,
+	  doc/it/images/mailcheck-properties.png,
+	  doc/it/images/menuitem-properties.png,
+	  doc/it/images/nooptions-properties.png,
+	  doc/it/images/panel-settings.png,
+	  doc/it/images/systembuttons-properties.png: more italian doc
+	  translation from Sascha Ales
+
+2004-07-09 15:28  jasper
+
+	* panel/panel.c: Remove dock type again. Use window state to set
+	  panel always on top.
+
+2004-07-08 08:38  jasper
+
+	* panel/panel.c: Fix some issues with positioning and struts
+
+2004-06-20 22:23  olivier
+
+	* panel/mcs_client.c: Fix panel crash with gtk+-2.2.x
+
+2004-06-18 21:42  jasper
+
+	* panel/panel.c: Grr, why did I agree to add the option in the
+	  first place? Options are trouble. Fix issue with autohide and
+	  always on top.
+
+2004-06-18 13:41  jasper
+
+	* panel/panel.c, settings/xfce_settings_dialog.c,
+	  settings/xfce_settings_plugin.c: Make always on top behaviour
+	  optional
+
+2004-06-17 23:10  jasper
+
+	* panel/: add-control-dialog.c, panel.c: Fix strut when autohiding
+	  and patch from brian for double click on add item dialog.
+
+2004-06-17 15:49  jasper
+
+	* configure, configure.ac, icons/Makefile.am, icons/Makefile.in,
+	  icons/xfce-edit.png, icons/xfce-filemanager.png,
+	  icons/xfce-games.png, icons/xfce-graphics.png,
+	  icons/xfce-internet.png, icons/xfce-man.png,
+	  icons/xfce-multimedia.png, icons/xfce-print.png,
+	  icons/xfce-schedule.png, icons/xfce-sound.png,
+	  icons/xfce-system-exit.png, icons/xfce-system-info.png,
+	  icons/xfce-system-lock.png, icons/xfce-system-settings.png,
+	  icons/xfce-terminal.png, icons/xfce-unknown.png,
+	  icons/xfce-utils.png, panel/controls.c, panel/controls_dialog.c,
+	  panel/groups.c, panel/groups.h, panel/icons.c, panel/icons.h,
+	  panel/mcs_client.c, panel/panel.c, panel/settings.c,
+	  plugins/mailcheck/mailcheck.c, plugins/sample-plugin/sample.c,
+	  plugins/systembuttons/systembuttons.c, po/xfce4-panel.pot,
+	  settings/xfce_settings_dialog.c, themes/Makefile.am,
+	  themes/Makefile.in: Oh dear, big changes. Please test.  Changes
+	  include: * Icon themeing based on icon spec. No more
+	  panel-specific theme option.	  Panel themes can still be
+	  created, but additionally the panel looks for    gnome and kde
+	  icons, when no xfce- namespaced icons were found.    Old panel
+	  themes will no longer work.  * Removed old icon themes.  *
+	  Removed panel layer option. The panel now is a dock-type window
+	  and sets   partial struts to allow the wm to do the right thing.
+
+2004-06-13 23:18  pollux
+
+	* po/: lt.gmo, lt.po: Updated lt translations from Mantas Zapolskas
+
+2004-06-13 11:40  pollux
+
+	* po/zh_CN.gmo: .gmo files updated
+
+2004-06-13 10:09  jasper
+
+	* panel/: item.c, popup.c: minor cleanups by Eduard
+
+2004-06-11 21:59  pollux
+
+	* po/zh_CN.po: Update zh_CN translations
+
+2004-05-29 09:47  jasper
+
+	* panel/: controls.c, panel.c, panel.h: Cleaning up panel
+	  internals. First step to get rid of global variables.
+
+2004-05-19 11:24  jasper
+
+	* panel/panel.c: Attempt to fix moving to different xinerama
+	  screens
+
+2004-05-18 23:55  olivier
+
+	* panel/panel.c: Get rid of libxfcegui4 xinerama impl, align panel
+	  on screen edges ignoring previous struts.
+
+2004-05-17 09:50  jasper
+
+	* panel/panel.c: Attempt to fix problem with autohide on startup as
+	  reported on IRC.
+
+2004-05-15 09:57  benny
+
+	* panel/main.c: Let apps start on the correct screen.
+
+2004-05-13 13:09  jasper
+
+	* icons/Makefile.am, icons/Makefile.in, icons/xfce-mail.png,
+	  plugins/mailcheck/mailcheck.c, plugins/sample-plugin/sample.c: A
+	  bit of a proof of concept for icon theme handling.
+
+2004-05-10 13:57  jasper
+
+	* ChangeLog, NEWS, aclocal.m4, configure, configure.ac, ltmain.sh,
+	  panel/global.h, panel/icons.c, panel/panel.h,
+	  plugins/Makefile.am, plugins/Makefile.in,
+	  plugins/sample-plugin/Makefile.am,
+	  plugins/sample-plugin/Makefile.in, plugins/sample-plugin/README,
+	  plugins/sample-plugin/sample.c, po/xfce4-panel.pot: Add a new
+	  sample plugin to the panel. It will not be installed.
+
+2004-05-08 03:06  edscott
+
+	* panel/: item_dialog.c, item_dialog.h: xffm_theme_maker is now
+	  replaced by xfmime_edit.
+
+2004-05-03 23:44  olivier
+
+	* Makefile.in, aclocal.m4, config.guess, config.sub, configure,
+	  install-sh, ltmain.sh, mkinstalldirs, doc/Makefile.in,
+	  doc/C/Makefile.in, doc/C/images/Makefile.in, doc/fr/Makefile.in,
+	  doc/fr/images/Makefile.in, icons/Makefile.in, panel/Makefile.in,
+	  plugins/Makefile.in, plugins/clock/Makefile.in,
+	  plugins/mailcheck/Makefile.in, plugins/pager/Makefile.in,
+	  plugins/separator/Makefile.in, plugins/switcher/Makefile.in,
+	  plugins/systembuttons/Makefile.in, po/zh_TW.gmo, po/zh_TW.po,
+	  themes/Makefile.in: Update zh_TW translations from umm
+	  <umm@pchome.com.tw>
+
+2004-05-03 22:20  kelnos
+
+	* settings/: Makefile.am, Makefile.in: EXTRA_DIST
+
 2004-05-01 17:32  jasper
 
 	* panel/: main.c, xfce_support.c: First try at multihead support.
@@ -149,49 +546,11 @@
 	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
 	  plugins/pager/Makefile.in, plugins/separator/Makefile.in,
 	  plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in,
-	  settings/Makefile.in, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Crystal/22x22/Makefile.in,
-	  themes/Crystal/22x22/emblems/Makefile.in,
-	  themes/Crystal/48x48/Makefile.in,
-	  themes/Crystal/48x48/emblems/Makefile.in,
-	  themes/Curve/Makefile.in, themes/Curve/22x22/Makefile.in,
-	  themes/Curve/22x22/emblems/Makefile.in,
-	  themes/Curve/48x48/Makefile.in,
-	  themes/Curve/48x48/emblems/Makefile.in,
-	  themes/FreeIcons/Makefile.in, themes/FreeIcons/22x22/Makefile.in,
-	  themes/FreeIcons/22x22/emblems/Makefile.in,
-	  themes/FreeIcons/24x24/Makefile.in,
-	  themes/FreeIcons/24x24/emblems/Makefile.in,
-	  themes/FreeIcons/48x48/Makefile.in,
-	  themes/FreeIcons/48x48/emblems/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Gnome/24x24/Makefile.in,
-	  themes/Gnome/24x24/emblems/Makefile.in,
-	  themes/Gnome/48x48/Makefile.in,
-	  themes/Gnome/48x48/emblems/Makefile.in,
-	  themes/Gnome/50x50/Makefile.in,
-	  themes/Gnome/50x50/emblems/Makefile.in, themes/Noia/Makefile.in,
-	  themes/Noia/22x22/Makefile.in,
-	  themes/Noia/22x22/emblems/Makefile.in,
-	  themes/Noia/48x48/Makefile.in,
-	  themes/Noia/48x48/emblems/Makefile.in, themes/XFce/Makefile.in,
-	  themes/XFce/14x14/Makefile.in,
-	  themes/XFce/14x14/emblems/Makefile.in,
-	  themes/XFce/16x16/Makefile.in,
-	  themes/XFce/16x16/emblems/Makefile.in,
-	  themes/XFce/19x19/Makefile.in,
-	  themes/XFce/19x19/emblems/Makefile.in,
-	  themes/XFce/24x24/Makefile.in,
-	  themes/XFce/24x24/emblems/Makefile.in,
-	  themes/XFce/48x48/Makefile.in,
-	  themes/XFce/48x48/emblems/Makefile.in,
-	  themes/XFce/50x50/Makefile.in,
-	  themes/XFce/50x50/emblems/Makefile.in,
-	  themes/XFce/53x53/Makefile.in,
-	  themes/XFce/53x53/emblems/Makefile.in: - Reduce handle width to
-	  show only one line of dots - disable completion combo, because it
-	  doesn't work on new installs - put 'Properties...' and 'Remove'
-	  in a submenu of panel item right-click   menus. May prevent some
-	  accidental removals.
+	  settings/Makefile.in, themes/Makefile.in: - Reduce handle width
+	  to show only one line of dots - disable completion combo, because
+	  it doesn't work on new installs - put 'Properties...' and
+	  'Remove' in a submenu of panel item right-click   menus. May
+	  prevent some accidental removals.
 
 2004-03-31 17:15  kelnos
 
@@ -208,42 +567,9 @@
 
 2004-03-30 05:54  kelnos
 
-	* themes/: Makefile.am, Makefile.in, Crystal/Makefile.am,
-	  Crystal/Makefile.in, Crystal/22x22/emblems/Makefile.am,
-	  Crystal/22x22/emblems/Makefile.in,
-	  Crystal/48x48/emblems/Makefile.am,
-	  Crystal/48x48/emblems/Makefile.in, Curve/Makefile.am,
-	  Curve/Makefile.in, Curve/22x22/emblems/Makefile.am,
-	  Curve/22x22/emblems/Makefile.in, Curve/48x48/emblems/Makefile.am,
-	  Curve/48x48/emblems/Makefile.in, FreeIcons/Makefile.am,
-	  FreeIcons/Makefile.in, FreeIcons/22x22/emblems/Makefile.am,
-	  FreeIcons/22x22/emblems/Makefile.in,
-	  FreeIcons/24x24/emblems/Makefile.am,
-	  FreeIcons/24x24/emblems/Makefile.in,
-	  FreeIcons/48x48/emblems/Makefile.am,
-	  FreeIcons/48x48/emblems/Makefile.in, Gnome/Makefile.am,
-	  Gnome/Makefile.in, Gnome/24x24/emblems/Makefile.am,
-	  Gnome/24x24/emblems/Makefile.in, Gnome/48x48/emblems/Makefile.am,
-	  Gnome/48x48/emblems/Makefile.in, Gnome/50x50/emblems/Makefile.am,
-	  Gnome/50x50/emblems/Makefile.in, Noia/Makefile.am,
-	  Noia/Makefile.in, Noia/22x22/emblems/Makefile.am,
-	  Noia/22x22/emblems/Makefile.in, Noia/48x48/emblems/Makefile.am,
-	  Noia/48x48/emblems/Makefile.in, XFce/Makefile.am,
-	  XFce/Makefile.in, XFce/14x14/emblems/Makefile.am,
-	  XFce/14x14/emblems/Makefile.in, XFce/16x16/emblems/Makefile.am,
-	  XFce/16x16/emblems/Makefile.in, XFce/19x19/emblems/Makefile.am,
-	  XFce/19x19/emblems/Makefile.in, XFce/24x24/emblems/Makefile.am,
-	  XFce/24x24/emblems/Makefile.in, XFce/48x48/emblems/Makefile.am,
-	  XFce/48x48/emblems/Makefile.in, XFce/50x50/emblems/Makefile.am,
-	  XFce/50x50/emblems/Makefile.in, XFce/53x53/emblems/Makefile.am,
-	  XFce/53x53/emblems/Makefile.in: move panel icon themes to
+	* themes/: Makefile.am, Makefile.in: move panel icon themes to
 	  $datadir/xfce4/icons
 
-2004-03-29 12:55  kelnos
-
-	* themes/Gnome/index.theme: match the 'official' gnome icon theme
-	  name
-
 2004-03-20 21:22  jasper
 
 	* panel/item.c: Revert tweaks to dnd :)
@@ -304,265 +630,14 @@
 	  in dialog and remove position settings from dialog (not a real
 	  setting)
 
-2004-02-26 01:19  kelnos
-
-	* themes/: Crystal/index.theme, Curve/index.theme,
-	  FreeIcons/index.theme, Gnome/index.theme, Noia/index.theme,
-	  XFce/index.theme: add Inherits= so we have some defaults
-
 2004-02-25 20:16  kelnos
 
 	* panel/: icons.c, panel.c: make the panel use GtkIconTheme and the
 	  new layout
 
-2004-02-25 20:13  kelnos
-
-	* themes/: Crystal/edit.png, Crystal/file1.png, Crystal/file2.png,
-	  Crystal/games.png, Crystal/man.png, Crystal/miniinfo.png,
-	  Crystal/minilock.png, Crystal/minipalet.png,
-	  Crystal/minipower.png, Crystal/multimedia.png,
-	  Crystal/network.png, Crystal/newmail.png, Crystal/nomail.png,
-	  Crystal/oldmail.png, Crystal/paint.png, Crystal/print.png,
-	  Crystal/schedule.png, Crystal/sound.png, Crystal/terminal.png,
-	  Crystal/trash_empty.png, Crystal/trash_full.png,
-	  Crystal/unknown.png, Curve/edit.png, Curve/file1.png,
-	  Curve/file2.png, Curve/games.png, Curve/man.png,
-	  Curve/miniinfo.png, Curve/minilock.png, Curve/minipalet.png,
-	  Curve/minipower.png, Curve/multimedia.png, Curve/network.png,
-	  Curve/newmail.png, Curve/nomail.png, Curve/oldmail.png,
-	  Curve/paint.png, Curve/print.png, Curve/schedule.png,
-	  Curve/sound.png, Curve/terminal.png, Curve/trash_empty.png,
-	  Curve/trash_full.png, Curve/unknown.png, FreeIcons/edit.png,
-	  FreeIcons/file1.png, FreeIcons/file2.png, FreeIcons/games.png,
-	  FreeIcons/man.png, FreeIcons/miniinfo.png,
-	  FreeIcons/minilock.png, FreeIcons/minipalet.png,
-	  FreeIcons/minipower.png, FreeIcons/multimedia.png,
-	  FreeIcons/network.png, FreeIcons/newmail.png,
-	  FreeIcons/nomail.png, FreeIcons/oldmail.png, FreeIcons/paint.png,
-	  FreeIcons/print.png, FreeIcons/schedule.png, FreeIcons/sound.png,
-	  FreeIcons/terminal.png, FreeIcons/unknown.png, Gnome/edit.png,
-	  Gnome/file1.png, Gnome/file2.png, Gnome/games.png, Gnome/man.png,
-	  Gnome/miniinfo.png, Gnome/minilock.png, Gnome/minipalet.png,
-	  Gnome/minipower.png, Gnome/multimedia.png, Gnome/network.png,
-	  Gnome/paint.png, Gnome/print.png, Gnome/schedule.png,
-	  Gnome/sound.png, Gnome/terminal.png, Gnome/trash_empty.png,
-	  Gnome/trash_full.png, Gnome/unknown.png, Noia/edit.png,
-	  Noia/file1.png, Noia/file2.png, Noia/games.png, Noia/man.png,
-	  Noia/miniinfo.png, Noia/minilock.png, Noia/minipalet.png,
-	  Noia/minipower.png, Noia/multimedia.png, Noia/network.png,
-	  Noia/newmail.png, Noia/nomail.png, Noia/oldmail.png,
-	  Noia/paint.png, Noia/print.png, Noia/schedule.png,
-	  Noia/sound.png, Noia/terminal.png, Noia/trash_empty.png,
-	  Noia/trash_full.png, Noia/unknown.png, XFce/edit.xpm,
-	  XFce/file1.xpm, XFce/file2.xpm, XFce/games.xpm, XFce/man.xpm,
-	  XFce/miniinfo.xpm, XFce/minilock.xpm, XFce/minipalet.xpm,
-	  XFce/minipower.xpm, XFce/multimedia.xpm, XFce/network.xpm,
-	  XFce/newmail.xpm, XFce/nomail.xpm, XFce/oldmail.xpm,
-	  XFce/paint.xpm, XFce/print.xpm, XFce/schedule.xpm,
-	  XFce/sound.xpm, XFce/terminal.xpm, XFce/trash_empty.xpm,
-	  XFce/trash_full.xpm, XFce/unknown.xpm: add was successful, remove
-	  the old
-
-2004-02-25 20:09  kelnos
-
-	* themes/Crystal/Makefile.am, themes/Crystal/Makefile.in,
-	  themes/Crystal/index.theme, themes/Crystal/22x22/Makefile.am,
-	  themes/Crystal/22x22/Makefile.in,
-	  themes/Crystal/22x22/emblems/Makefile.am,
-	  themes/Crystal/22x22/emblems/Makefile.in,
-	  themes/Crystal/22x22/emblems/miniinfo.png,
-	  themes/Crystal/22x22/emblems/minilock.png,
-	  themes/Crystal/22x22/emblems/minipalet.png,
-	  themes/Crystal/22x22/emblems/minipower.png,
-	  themes/Crystal/48x48/Makefile.am,
-	  themes/Crystal/48x48/Makefile.in,
-	  themes/Crystal/48x48/emblems/Makefile.am,
-	  themes/Crystal/48x48/emblems/Makefile.in,
-	  themes/Crystal/48x48/emblems/edit.png,
-	  themes/Crystal/48x48/emblems/file1.png,
-	  themes/Crystal/48x48/emblems/file2.png,
-	  themes/Crystal/48x48/emblems/games.png,
-	  themes/Crystal/48x48/emblems/man.png,
-	  themes/Crystal/48x48/emblems/multimedia.png,
-	  themes/Crystal/48x48/emblems/network.png,
-	  themes/Crystal/48x48/emblems/newmail.png,
-	  themes/Crystal/48x48/emblems/nomail.png,
-	  themes/Crystal/48x48/emblems/oldmail.png,
-	  themes/Crystal/48x48/emblems/paint.png,
-	  themes/Crystal/48x48/emblems/print.png,
-	  themes/Crystal/48x48/emblems/schedule.png,
-	  themes/Crystal/48x48/emblems/sound.png,
-	  themes/Crystal/48x48/emblems/terminal.png,
-	  themes/Crystal/48x48/emblems/trash_empty.png,
-	  themes/Crystal/48x48/emblems/trash_full.png,
-	  themes/Crystal/48x48/emblems/unknown.png,
-	  themes/Curve/Makefile.am, themes/Curve/Makefile.in,
-	  themes/Curve/index.theme, themes/Curve/22x22/Makefile.am,
-	  themes/Curve/22x22/Makefile.in,
-	  themes/Curve/22x22/emblems/Makefile.am,
-	  themes/Curve/22x22/emblems/Makefile.in,
-	  themes/Curve/22x22/emblems/miniinfo.png,
-	  themes/Curve/22x22/emblems/minilock.png,
-	  themes/Curve/22x22/emblems/minipalet.png,
-	  themes/Curve/22x22/emblems/minipower.png,
-	  themes/Curve/48x48/Makefile.am, themes/Curve/48x48/Makefile.in,
-	  themes/Curve/48x48/emblems/Makefile.am,
-	  themes/Curve/48x48/emblems/Makefile.in,
-	  themes/Curve/48x48/emblems/edit.png,
-	  themes/Curve/48x48/emblems/file1.png,
-	  themes/Curve/48x48/emblems/file2.png,
-	  themes/Curve/48x48/emblems/games.png,
-	  themes/Curve/48x48/emblems/man.png,
-	  themes/Curve/48x48/emblems/multimedia.png,
-	  themes/Curve/48x48/emblems/network.png,
-	  themes/Curve/48x48/emblems/newmail.png,
-	  themes/Curve/48x48/emblems/nomail.png,
-	  themes/Curve/48x48/emblems/oldmail.png,
-	  themes/Curve/48x48/emblems/paint.png,
-	  themes/Curve/48x48/emblems/print.png,
-	  themes/Curve/48x48/emblems/schedule.png,
-	  themes/Curve/48x48/emblems/sound.png,
-	  themes/Curve/48x48/emblems/terminal.png,
-	  themes/Curve/48x48/emblems/trash_empty.png,
-	  themes/Curve/48x48/emblems/trash_full.png,
-	  themes/Curve/48x48/emblems/unknown.png,
-	  themes/FreeIcons/Makefile.am, themes/FreeIcons/Makefile.in,
-	  themes/FreeIcons/index.theme, themes/FreeIcons/22x22/Makefile.am,
-	  themes/FreeIcons/22x22/Makefile.in,
-	  themes/FreeIcons/22x22/emblems/Makefile.am,
-	  themes/FreeIcons/22x22/emblems/Makefile.in,
-	  themes/FreeIcons/22x22/emblems/minipower.png,
-	  themes/FreeIcons/24x24/Makefile.am,
-	  themes/FreeIcons/24x24/Makefile.in,
-	  themes/FreeIcons/24x24/emblems/Makefile.am,
-	  themes/FreeIcons/24x24/emblems/Makefile.in,
-	  themes/FreeIcons/24x24/emblems/miniinfo.png,
-	  themes/FreeIcons/24x24/emblems/minilock.png,
-	  themes/FreeIcons/24x24/emblems/minipalet.png,
-	  themes/FreeIcons/48x48/Makefile.am,
-	  themes/FreeIcons/48x48/Makefile.in,
-	  themes/FreeIcons/48x48/emblems/Makefile.am,
-	  themes/FreeIcons/48x48/emblems/Makefile.in,
-	  themes/FreeIcons/48x48/emblems/edit.png,
-	  themes/FreeIcons/48x48/emblems/file1.png,
-	  themes/FreeIcons/48x48/emblems/file2.png,
-	  themes/FreeIcons/48x48/emblems/games.png,
-	  themes/FreeIcons/48x48/emblems/man.png,
-	  themes/FreeIcons/48x48/emblems/multimedia.png,
-	  themes/FreeIcons/48x48/emblems/network.png,
-	  themes/FreeIcons/48x48/emblems/newmail.png,
-	  themes/FreeIcons/48x48/emblems/nomail.png,
-	  themes/FreeIcons/48x48/emblems/oldmail.png,
-	  themes/FreeIcons/48x48/emblems/paint.png,
-	  themes/FreeIcons/48x48/emblems/print.png,
-	  themes/FreeIcons/48x48/emblems/schedule.png,
-	  themes/FreeIcons/48x48/emblems/sound.png,
-	  themes/FreeIcons/48x48/emblems/terminal.png,
-	  themes/FreeIcons/48x48/emblems/unknown.png,
-	  themes/Gnome/Makefile.am, themes/Gnome/Makefile.in,
-	  themes/Gnome/index.theme, themes/Gnome/24x24/Makefile.am,
-	  themes/Gnome/24x24/Makefile.in,
-	  themes/Gnome/24x24/emblems/Makefile.am,
-	  themes/Gnome/24x24/emblems/Makefile.in,
-	  themes/Gnome/24x24/emblems/miniinfo.png,
-	  themes/Gnome/24x24/emblems/minilock.png,
-	  themes/Gnome/24x24/emblems/minipalet.png,
-	  themes/Gnome/24x24/emblems/minipower.png,
-	  themes/Gnome/48x48/Makefile.am, themes/Gnome/48x48/Makefile.in,
-	  themes/Gnome/48x48/emblems/Makefile.am,
-	  themes/Gnome/48x48/emblems/Makefile.in,
-	  themes/Gnome/48x48/emblems/edit.png,
-	  themes/Gnome/48x48/emblems/file1.png,
-	  themes/Gnome/48x48/emblems/file2.png,
-	  themes/Gnome/48x48/emblems/man.png,
-	  themes/Gnome/48x48/emblems/multimedia.png,
-	  themes/Gnome/48x48/emblems/network.png,
-	  themes/Gnome/48x48/emblems/paint.png,
-	  themes/Gnome/48x48/emblems/print.png,
-	  themes/Gnome/48x48/emblems/schedule.png,
-	  themes/Gnome/48x48/emblems/sound.png,
-	  themes/Gnome/48x48/emblems/terminal.png,
-	  themes/Gnome/48x48/emblems/trash_empty.png,
-	  themes/Gnome/48x48/emblems/trash_full.png,
-	  themes/Gnome/48x48/emblems/unknown.png,
-	  themes/Gnome/50x50/Makefile.am, themes/Gnome/50x50/Makefile.in,
-	  themes/Gnome/50x50/emblems/Makefile.am,
-	  themes/Gnome/50x50/emblems/Makefile.in,
-	  themes/Gnome/50x50/emblems/games.png, themes/Noia/Makefile.am,
-	  themes/Noia/Makefile.in, themes/Noia/index.theme,
-	  themes/Noia/22x22/Makefile.am, themes/Noia/22x22/Makefile.in,
-	  themes/Noia/22x22/emblems/Makefile.am,
-	  themes/Noia/22x22/emblems/Makefile.in,
-	  themes/Noia/22x22/emblems/miniinfo.png,
-	  themes/Noia/22x22/emblems/minilock.png,
-	  themes/Noia/22x22/emblems/minipalet.png,
-	  themes/Noia/22x22/emblems/minipower.png,
-	  themes/Noia/48x48/Makefile.am, themes/Noia/48x48/Makefile.in,
-	  themes/Noia/48x48/emblems/Makefile.am,
-	  themes/Noia/48x48/emblems/Makefile.in,
-	  themes/Noia/48x48/emblems/edit.png,
-	  themes/Noia/48x48/emblems/file1.png,
-	  themes/Noia/48x48/emblems/file2.png,
-	  themes/Noia/48x48/emblems/games.png,
-	  themes/Noia/48x48/emblems/man.png,
-	  themes/Noia/48x48/emblems/multimedia.png,
-	  themes/Noia/48x48/emblems/network.png,
-	  themes/Noia/48x48/emblems/newmail.png,
-	  themes/Noia/48x48/emblems/nomail.png,
-	  themes/Noia/48x48/emblems/oldmail.png,
-	  themes/Noia/48x48/emblems/paint.png,
-	  themes/Noia/48x48/emblems/print.png,
-	  themes/Noia/48x48/emblems/schedule.png,
-	  themes/Noia/48x48/emblems/sound.png,
-	  themes/Noia/48x48/emblems/terminal.png,
-	  themes/Noia/48x48/emblems/trash_empty.png,
-	  themes/Noia/48x48/emblems/trash_full.png,
-	  themes/Noia/48x48/emblems/unknown.png, themes/XFce/Makefile.am,
-	  themes/XFce/Makefile.in, themes/XFce/index.theme,
-	  themes/XFce/14x14/Makefile.am, themes/XFce/14x14/Makefile.in,
-	  themes/XFce/14x14/emblems/Makefile.am,
-	  themes/XFce/14x14/emblems/Makefile.in,
-	  themes/XFce/14x14/emblems/minipower.xpm,
-	  themes/XFce/16x16/Makefile.am, themes/XFce/16x16/Makefile.in,
-	  themes/XFce/16x16/emblems/Makefile.am,
-	  themes/XFce/16x16/emblems/Makefile.in,
-	  themes/XFce/16x16/emblems/minilock.xpm,
-	  themes/XFce/19x19/Makefile.am, themes/XFce/19x19/Makefile.in,
-	  themes/XFce/19x19/emblems/Makefile.am,
-	  themes/XFce/19x19/emblems/Makefile.in,
-	  themes/XFce/19x19/emblems/miniinfo.xpm,
-	  themes/XFce/24x24/Makefile.am, themes/XFce/24x24/Makefile.in,
-	  themes/XFce/24x24/emblems/Makefile.am,
-	  themes/XFce/24x24/emblems/Makefile.in,
-	  themes/XFce/24x24/emblems/minipalet.xpm,
-	  themes/XFce/48x48/Makefile.am, themes/XFce/48x48/Makefile.in,
-	  themes/XFce/48x48/emblems/Makefile.am,
-	  themes/XFce/48x48/emblems/Makefile.in,
-	  themes/XFce/48x48/emblems/edit.xpm,
-	  themes/XFce/48x48/emblems/file1.xpm,
-	  themes/XFce/48x48/emblems/file2.xpm,
-	  themes/XFce/48x48/emblems/games.xpm,
-	  themes/XFce/48x48/emblems/man.xpm,
-	  themes/XFce/48x48/emblems/multimedia.xpm,
-	  themes/XFce/48x48/emblems/network.xpm,
-	  themes/XFce/48x48/emblems/newmail.xpm,
-	  themes/XFce/48x48/emblems/nomail.xpm,
-	  themes/XFce/48x48/emblems/oldmail.xpm,
-	  themes/XFce/48x48/emblems/print.xpm,
-	  themes/XFce/48x48/emblems/schedule.xpm,
-	  themes/XFce/48x48/emblems/sound.xpm,
-	  themes/XFce/48x48/emblems/terminal.xpm,
-	  themes/XFce/48x48/emblems/unknown.xpm,
-	  themes/XFce/50x50/Makefile.am, themes/XFce/50x50/Makefile.in,
-	  themes/XFce/50x50/emblems/Makefile.am,
-	  themes/XFce/50x50/emblems/Makefile.in,
-	  themes/XFce/50x50/emblems/paint.xpm,
-	  themes/XFce/53x53/Makefile.am, themes/XFce/53x53/Makefile.in,
-	  themes/XFce/53x53/emblems/Makefile.am,
-	  themes/XFce/53x53/emblems/Makefile.in,
-	  themes/XFce/53x53/emblems/trash_empty.xpm,
-	  themes/XFce/53x53/emblems/trash_full.xpm, configure,
-	  configure.ac: more icon reorg...
+2004-02-25 20:10  kelnos
+
+	* configure, configure.ac: more icon reorg...
 
 2004-02-18 22:43  jasper
 
@@ -608,11 +683,8 @@
 	  plugins/mailcheck/Makefile.in, plugins/pager/Makefile.in,
 	  plugins/separator/Makefile.in, plugins/switcher/Makefile.in,
 	  plugins/systembuttons/Makefile.in, settings/Makefile.in,
-	  themes/Makefile.in, themes/Crystal/Makefile.in,
-	  themes/Curve/Makefile.in, themes/FreeIcons/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: Update libtool and other automake,
-	  autoconf and gettext packages
+	  themes/Makefile.in: Update libtool and other automake, autoconf
+	  and gettext packages
 
 2004-01-23 08:47  jasper
 
@@ -672,11 +744,8 @@
 	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
 	  plugins/pager/Makefile.in, plugins/separator/Makefile.in,
 	  plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in,
-	  settings/Makefile.in, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/FreeIcons/Makefile.in, themes/Gnome/Makefile.in,
-	  themes/Noia/Makefile.in, themes/XFce/Makefile.in: Completion
-	  combo support. I'll probably be changing this a bit later.
+	  settings/Makefile.in, themes/Makefile.in: Completion combo
+	  support. I'll probably be changing this a bit later.
 
 2004-01-08 22:18  jasper
 
@@ -1872,10 +1941,7 @@
 	  plugins/mailcheck/Makefile.in, plugins/pager/Makefile.in,
 	  plugins/separator/Makefile.in, plugins/switcher/Makefile.in,
 	  plugins/systembuttons/Makefile.in, settings/Makefile.in,
-	  themes/Makefile.in, themes/Crystal/Makefile.in,
-	  themes/Curve/Makefile.in, themes/FreeIcons/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: libttol update and all
+	  themes/Makefile.in: libttol update and all
 
 2003-07-04 18:55  bmeurer
 
@@ -1921,12 +1987,9 @@
 	  po/hi.po, po/ja.gmo, po/ja.po, po/ms.gmo, po/ms.po, po/nl.gmo,
 	  po/nl.po, po/pl.gmo, po/pl.po, po/ru.gmo, po/ru.po, po/ta.gmo,
 	  po/ta.po, po/tr.gmo, po/tr.po, po/xfce4-panel.pot, po/zh_CN.gmo,
-	  po/zh_CN.po, settings/Makefile.in, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/FreeIcons/Makefile.in, themes/Gnome/Makefile.in,
-	  themes/Noia/Makefile.in, themes/XFce/Makefile.in: Add separator.
-	  Remove separators from pager. Several smaller fixes to plugins.
-	  Update docs.
+	  po/zh_CN.po, settings/Makefile.in, themes/Makefile.in: Add
+	  separator. Remove separators from pager. Several smaller fixes to
+	  plugins. Update docs.
 
 2003-07-02 10:29  huysmans
 
@@ -1945,11 +2008,8 @@
 	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
 	  plugins/pager/Makefile.in, plugins/switcher/Makefile.in,
 	  plugins/systembuttons/Makefile.in, settings/Makefile.in,
-	  themes/Makefile.in, themes/Crystal/Makefile.in,
-	  themes/Curve/Makefile.in, themes/FreeIcons/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: Update to libtool-1.5 Use proper
-	  complete CURRENT:REVISION:AGE scheme for lib versionning
+	  themes/Makefile.in: Update to libtool-1.5 Use proper complete
+	  CURRENT:REVISION:AGE scheme for lib versionning
 
 2003-06-21 21:22  bmeurer
 
@@ -2019,10 +2079,7 @@
 	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
 	  plugins/pager/Makefile.in, plugins/switcher/Makefile.in,
 	  plugins/systembuttons/Makefile.in, settings/Makefile.in,
-	  themes/Makefile.in, themes/Crystal/Makefile.in,
-	  themes/Curve/Makefile.in, themes/FreeIcons/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: automake 1.7.5
+	  themes/Makefile.in: automake 1.7.5
 
 2003-06-10 23:34  xfce
 
@@ -2051,12 +2108,9 @@
 	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
 	  plugins/pager/Makefile.in, plugins/switcher/Makefile.in,
 	  plugins/systembuttons/Makefile.in, settings/Makefile.in,
-	  settings/xfce_settings_dialog.c, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/FreeIcons/Makefile.in, themes/Gnome/Makefile.in,
-	  themes/Noia/Makefile.in, themes/XFce/Makefile.in: Add new widget
-	  xfce_framebox to unify look across UI Migrate all plugins to this
-	  new widget
+	  settings/xfce_settings_dialog.c, themes/Makefile.in: Add new
+	  widget xfce_framebox to unify look across UI Migrate all plugins
+	  to this new widget
 
 2003-06-08 21:06  huysmans
 
@@ -2071,11 +2125,8 @@
 	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
 	  plugins/pager/Makefile.in, plugins/switcher/Makefile.in,
 	  plugins/systembuttons/Makefile.in, po/ru.gmo, po/ru.po,
-	  settings/Makefile.in, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/FreeIcons/Makefile.in, themes/Gnome/Makefile.in,
-	  themes/Noia/Makefile.in, themes/XFce/Makefile.in: Add russian
-	  translation and fix xfdesktop not reading a new local menu
+	  settings/Makefile.in, themes/Makefile.in: Add russian translation
+	  and fix xfdesktop not reading a new local menu
 
 2003-06-08 15:51  bmeurer
 
@@ -2094,10 +2145,7 @@
 	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
 	  plugins/pager/Makefile.in, plugins/switcher/Makefile.in,
 	  plugins/systembuttons/Makefile.in, settings/Makefile.in,
-	  themes/Makefile.in, themes/Crystal/Makefile.in,
-	  themes/Curve/Makefile.in, themes/FreeIcons/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: Versionning scheme
+	  themes/Makefile.in: Versionning scheme
 
 2003-06-06 17:46  huysmans
 
@@ -2206,11 +2254,8 @@
 	  plugins/Makefile.in, plugins/clock/Makefile.in,
 	  plugins/mailcheck/Makefile.in, plugins/pager/Makefile.in,
 	  plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in,
-	  po/ta.gmo, po/ta.po, settings/Makefile.in, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/FreeIcons/Makefile.in, themes/Gnome/Makefile.in,
-	  themes/Noia/Makefile.in, themes/XFce/Makefile.in: Add tamil
-	  translations
+	  po/ta.gmo, po/ta.po, settings/Makefile.in, themes/Makefile.in:
+	  Add tamil translations
 
 2003-05-15 15:25  huysmans
 
@@ -2283,13 +2328,7 @@
 	  po/fi.gmo, po/fi.po, po/fr.gmo, po/fr.po, po/ja.gmo, po/ja.po,
 	  po/nl.gmo, po/nl.po, po/pl.gmo, po/pl.po, po/xfce4-panel.pot,
 	  po/zh_CN.gmo, po/zh_CN.po, settings/Makefile.am,
-	  settings/Makefile.in, themes/Crystal/Makefile.am,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.am,
-	  themes/Curve/Makefile.in, themes/FreeIcons/Makefile.am,
-	  themes/FreeIcons/Makefile.in, themes/Gnome/Makefile.am,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.am,
-	  themes/Noia/Makefile.in, themes/XFce/Makefile.am,
-	  themes/XFce/Makefile.in: Fix distcheck target. Rename package to
+	  settings/Makefile.in: Fix distcheck target. Rename package to
 	  xfce4-panel. Set version to 3.90 (betas will be 3.90, 3.91, 3.92,
 	  etc.)
 
@@ -2361,10 +2400,7 @@
 	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
 	  plugins/pager/Makefile.in, plugins/switcher/Makefile.in,
 	  plugins/systembuttons/Makefile.in, po/zh_CN.gmo, po/zh_CN.po,
-	  settings/Makefile.in, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/FreeIcons/Makefile.in, themes/Gnome/Makefile.in,
-	  themes/Noia/Makefile.in, themes/XFce/Makefile.in: Add chinese
+	  settings/Makefile.in, themes/Makefile.in: Add chinese
 	  translations
 
 2003-05-03 11:12  huysmans
@@ -2383,11 +2419,7 @@
 	  plugins/pager/Makefile.in, plugins/switcher/Makefile.am,
 	  plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.am,
 	  plugins/systembuttons/Makefile.in, settings/Makefile.in,
-	  themes/Makefile.in, themes/Crystal/Makefile.in,
-	  themes/Curve/Makefile.in, themes/FreeIcons/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: Update to use the new panel-plugins
-	  location
+	  themes/Makefile.in: Update to use the new panel-plugins location
 
 2003-05-02 19:12  bmeurer
 
@@ -2398,11 +2430,7 @@
 	  plugins/mailcheck/Makefile.in, plugins/pager/Makefile.in,
 	  plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in,
 	  plugins/systembuttons/systembuttons.c, settings/Makefile.am,
-	  settings/Makefile.in, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/FreeIcons/Makefile.in, themes/Gnome/Makefile.in,
-	  themes/Noia/Makefile.in, themes/XFce/Makefile.in: Several
-	  changes. See
+	  settings/Makefile.in, themes/Makefile.in: Several changes. See
 	  http://www.home.unix-ag.org/bmeurer/xfce/index.html#20030502 for
 	  details.
 
@@ -2496,11 +2524,6 @@
 
 	* panel/main.c: Fix signal handling - gtk mainloop interaction
 
-2003-04-21 22:48  huysmans
-
-	* themes/FreeIcons/minipower.png: Use Curve exit icon instead of
-	  confusing gear
-
 2003-04-21 20:52  bmeurer
 
 	* AUTHORS, Makefile.am, Makefile.in, NOTES, aclocal.m4, configure,
@@ -2518,31 +2541,14 @@
 	  plugins/systembuttons/Makefile.am,
 	  plugins/systembuttons/Makefile.in,
 	  plugins/systembuttons/systembuttons.c, settings/Makefile.am,
-	  settings/Makefile.in, settings/xfce_settings_plugin.c,
-	  themes/FreeIcons/Makefile.am, themes/FreeIcons/Makefile.in: Its
-	  now possible to write panel plugins outside the panel. See the
-	  NOTES file for details and enjoy writing new panel plugins.
-
-2003-04-21 17:46  huysmans
-
-	* themes/FreeIcons/: Makefile.am, Makefile.in: Really rename the
-	  theme
+	  settings/Makefile.in, settings/xfce_settings_plugin.c: Its now
+	  possible to write panel plugins outside the panel. See the NOTES
+	  file for details and enjoy writing new panel plugins.
 
 2003-04-21 16:26  huysmans
 
-	* configure, configure.ac, themes/Makefile.am, themes/Makefile.in,
-	  themes/FreeIcons/Makefile.am, themes/FreeIcons/Makefile.in,
-	  themes/FreeIcons/README, themes/FreeIcons/edit.png,
-	  themes/FreeIcons/file1.png, themes/FreeIcons/file2.png,
-	  themes/FreeIcons/games.png, themes/FreeIcons/man.png,
-	  themes/FreeIcons/miniinfo.png, themes/FreeIcons/minilock.png,
-	  themes/FreeIcons/minipalet.png, themes/FreeIcons/minipower.png,
-	  themes/FreeIcons/multimedia.png, themes/FreeIcons/network.png,
-	  themes/FreeIcons/newmail.png, themes/FreeIcons/nomail.png,
-	  themes/FreeIcons/oldmail.png, themes/FreeIcons/paint.png,
-	  themes/FreeIcons/print.png, themes/FreeIcons/schedule.png,
-	  themes/FreeIcons/sound.png, themes/FreeIcons/terminal.png,
-	  themes/FreeIcons/unknown.png: Rename Carillon to FreeIcons
+	* configure, configure.ac, themes/Makefile.am, themes/Makefile.in:
+	  Rename Carillon to FreeIcons
 
 2003-04-21 09:42  huysmans
 
@@ -2563,10 +2569,8 @@
 	  plugins/switcher/Makefile.am, plugins/switcher/Makefile.in,
 	  plugins/systembuttons/Makefile.am,
 	  plugins/systembuttons/Makefile.in, settings/Makefile.am,
-	  settings/Makefile.in, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: Some autotools cleanups.
+	  settings/Makefile.in, themes/Makefile.in: Some autotools
+	  cleanups.
 
 2003-04-20 13:16  huysmans
 
@@ -2597,12 +2601,9 @@
 	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
 	  plugins/mailcheck/mailcheck.c, plugins/pager/Makefile.in,
 	  plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in,
-	  settings/Makefile.am, settings/Makefile.in, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: Added system tray support to libxfcegui4
-	  and frontend to xftaskbar4.  Lots of cleanups in the autotools
-	  stuff.
+	  settings/Makefile.am, settings/Makefile.in, themes/Makefile.in:
+	  Added system tray support to libxfcegui4 and frontend to
+	  xftaskbar4.  Lots of cleanups in the autotools stuff.
 
 2003-04-18 23:17  huysmans
 
@@ -2695,10 +2696,7 @@
 	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
 	  plugins/pager/Makefile.in, plugins/switcher/Makefile.in,
 	  plugins/systembuttons/Makefile.in, settings/Makefile.in,
-	  themes/Makefile.in, themes/Crystal/Makefile.in,
-	  themes/Curve/Makefile.in, themes/Gnome/Makefile.in,
-	  themes/Noia/Makefile.in, themes/XFce/Makefile.in: Improved
-	  debug.m4:
+	  themes/Makefile.in: Improved debug.m4:
 
 		  1) --disable-debug no longer disables assert()'s
 		  2) --enable-profiling now enables profiling code
@@ -2722,10 +2720,7 @@
 	  plugins/Makefile.in, plugins/clock/Makefile.in,
 	  plugins/mailcheck/Makefile.in, plugins/pager/Makefile.in,
 	  plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in,
-	  settings/Makefile.in, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: Fixed BM_DEPEND_CHECK
+	  settings/Makefile.in, themes/Makefile.in: Fixed BM_DEPEND_CHECK
 
 2003-04-02 23:18  xfce
 
@@ -2778,11 +2773,8 @@
 	  plugins/systembuttons/systembuttons.c, settings/Makefile.in,
 	  settings/xfce_settings.h, settings/xfce_settings_dialog.c,
 	  settings/xfce_settings_dialog.h, settings/xfce_settings_plugin.c,
-	  settings/xfce_settings_plugin.h, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: Re-indent files. Add HACKING and
-	  .indent.pro
+	  settings/xfce_settings_plugin.h, themes/Makefile.in: Re-indent
+	  files. Add HACKING and .indent.pro
 
 2003-04-02 19:33  bmeurer
 
@@ -2826,13 +2818,10 @@
 	  plugins/systembuttons/systembuttons.c, po/Makefile.in.in,
 	  settings/Makefile.am, settings/Makefile.in,
 	  settings/xfce_settings_dialog.c, settings/xfce_settings_plugin.c,
-	  themes/Makefile.am, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: Large autotools update. Should fix James
-	  problems with unsubstituted @PKG_LDFLAGS@ in .pc files. Should
-	  also make it easier to port XFce4 to a non-POSIX (or even
-	  non-UNIX) plattform, using autoconf.
+	  themes/Makefile.am, themes/Makefile.in: Large autotools update.
+	  Should fix James problems with unsubstituted @PKG_LDFLAGS@ in .pc
+	  files. Should also make it easier to port XFce4 to a non-POSIX
+	  (or even non-UNIX) plattform, using autoconf.
 
 2003-04-01 23:33  xfce
 
@@ -2929,10 +2918,7 @@
 	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
 	  plugins/pager/Makefile.in, plugins/switcher/Makefile.in,
 	  plugins/systembuttons/Makefile.in, settings/Makefile.in,
-	  themes/Makefile.in, themes/Crystal/Makefile.in,
-	  themes/Curve/Makefile.in, themes/Gnome/Makefile.in,
-	  themes/Noia/Makefile.in, themes/XFce/Makefile.in: [no log
-	  message]
+	  themes/Makefile.in: [no log message]
 
 2003-02-28 20:09  bmeurer
 
@@ -2945,11 +2931,8 @@
 	  plugins/Makefile.in, plugins/clock/Makefile.in,
 	  plugins/mailcheck/Makefile.in, plugins/pager/Makefile.in,
 	  plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in,
-	  settings/Makefile.in, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: Fix xfce-mcs-manager API/ABI versionning
-	  Update configure/libtool to use libtool 1.4.3
+	  settings/Makefile.in, themes/Makefile.in: Fix xfce-mcs-manager
+	  API/ABI versionning Update configure/libtool to use libtool 1.4.3
 
 2003-02-28 11:53  bmeurer
 
@@ -2959,10 +2942,7 @@
 	  plugins/Makefile.in, plugins/mailcheck/Makefile.in,
 	  plugins/pager/Makefile.in, plugins/switcher/Makefile.in,
 	  plugins/systembuttons/Makefile.in, settings/Makefile.in,
-	  themes/Makefile.in, themes/Crystal/Makefile.in,
-	  themes/Curve/Makefile.in, themes/Gnome/Makefile.in,
-	  themes/Noia/Makefile.in, themes/XFce/Makefile.in: Fixes
-	  xfce-mcs-manager issue.
+	  themes/Makefile.in: Fixes xfce-mcs-manager issue.
 
 2003-02-27 22:48  xfce
 
@@ -2986,10 +2966,8 @@
 	  plugins/pager/Makefile.in, plugins/switcher/Makefile.in,
 	  plugins/systembuttons/Makefile.in, settings/Makefile.in,
 	  settings/xfce_settings_dialog.c, settings/xfce_settings_plugin.c,
-	  themes/Makefile.in, themes/Crystal/Makefile.in,
-	  themes/Curve/Makefile.in, themes/Gnome/Makefile.in,
-	  themes/Noia/Makefile.in, themes/XFce/Makefile.in: Apply Benedikt
-	  Meurer <Benedikt.Meurer@unix-ag.uni-siegen.de> patch Replace all
+	  themes/Makefile.in: Apply Benedikt Meurer
+	  <Benedikt.Meurer@unix-ag.uni-siegen.de> patch Replace all
 	  occurences of g_getenv("HOME") with g_get_home_dir() Regenerate
 	  all Makefiles.on and configure scripts
 
@@ -3008,10 +2986,8 @@
 	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
 	  plugins/pager/Makefile.in, plugins/switcher/Makefile.in,
 	  plugins/systembuttons/Makefile.in,
-	  settings/xfce_settings_dialog.c, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: Update screenshots for new dialog style
+	  settings/xfce_settings_dialog.c, themes/Makefile.in: Update
+	  screenshots for new dialog style
 
 2003-02-24 23:10  huysmans
 
@@ -3159,11 +3135,8 @@
 	  plugins/mailcheck/Makefile.in, plugins/mailcheck/mailcheck.c,
 	  plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in,
 	  plugins/systembuttons/systembuttons.c, settings/Makefile.in,
-	  themes/Makefile.in, themes/Crystal/Makefile.in,
-	  themes/Curve/Makefile.in, themes/Gnome/Makefile.in,
-	  themes/Noia/Makefile.in, themes/XFce/Makefile.in: Add support for
-	  startup notification from freedesktop.org standard Fix a few
-	  memory leaks
+	  themes/Makefile.in: Add support for startup notification from
+	  freedesktop.org standard Fix a few memory leaks
 
 2003-02-04 12:01  huysmans
 
@@ -3369,10 +3342,8 @@
 	  icons/Makefile.in, panel/Makefile.in, plugins/Makefile.in,
 	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
 	  plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in,
-	  po/fr.gmo, po/fr.po, settings/Makefile.in, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: Add french xtion.
+	  po/fr.gmo, po/fr.po, settings/Makefile.in, themes/Makefile.in:
+	  Add french xtion.
 
 2003-01-24 14:33  edscott
 
@@ -3381,11 +3352,8 @@
 	  plugins/Makefile.in, plugins/clock/Makefile.in,
 	  plugins/mailcheck/Makefile.in, plugins/switcher/Makefile.in,
 	  plugins/systembuttons/Makefile.in, po/es.gmo, po/es.po,
-	  po/nl.gmo, po/nl.po, settings/Makefile.in, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: added spanish translation and fixed a
-	  typo in source code
+	  po/nl.gmo, po/nl.po, settings/Makefile.in, themes/Makefile.in:
+	  added spanish translation and fixed a typo in source code
 
 2003-01-24 12:53  huysmans
 
@@ -3407,10 +3375,7 @@
 	  po/POTFILES.in, po/nl.gmo, po/nl.po, po/xfce4-panel.pot,
 	  settings/Makefile.am, settings/Makefile.in,
 	  settings/xfce_settings_dialog.c, settings/xfce_settings_plugin.c,
-	  themes/Makefile.in, themes/Crystal/Makefile.in,
-	  themes/Curve/Makefile.in, themes/Gnome/Makefile.in,
-	  themes/Noia/Makefile.in, themes/XFce/Makefile.in: Add i18n
-	  framework and Dutch translation
+	  themes/Makefile.in: Add i18n framework and Dutch translation
 
 2003-01-21 20:12  huysmans
 
@@ -3477,12 +3442,9 @@
 	  panel/handle.c, plugins/Makefile.in, plugins/clock/Makefile.in,
 	  plugins/mailcheck/Makefile.in, plugins/switcher/Makefile.in,
 	  plugins/systembuttons/Makefile.in, settings/Makefile.in,
-	  settings/xfce_settings_dialog.c, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: Use same border width gtk uses in dialog
-	  action area. Some reordering in the panel dialog. Looks better
-	  IMO.
+	  settings/xfce_settings_dialog.c, themes/Makefile.in: Use same
+	  border width gtk uses in dialog action area. Some reordering in
+	  the panel dialog. Looks better IMO.
 
 2003-01-13 11:17  huysmans
 
@@ -3504,11 +3466,8 @@
 	  icons/Makefile.in, panel/Makefile.in, plugins/Makefile.in,
 	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
 	  plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in,
-	  settings/Makefile.am, settings/Makefile.in, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: Add a check for availability of
-	  xfce-mcs-manager
+	  settings/Makefile.am, settings/Makefile.in, themes/Makefile.in:
+	  Add a check for availability of xfce-mcs-manager
 
 2003-01-12 20:50  huysmans
 
@@ -3532,11 +3491,8 @@
 	  plugins/Makefile.in, plugins/clock/Makefile.in,
 	  plugins/mailcheck/Makefile.in, plugins/switcher/Makefile.in,
 	  plugins/systembuttons/Makefile.in, settings/Makefile.in,
-	  settings/xfce_settings_dialog.c, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: Use new check for running settings
-	  manager
+	  settings/xfce_settings_dialog.c, themes/Makefile.in: Use new
+	  check for running settings manager
 
 2003-01-10 00:02  xfce
 
@@ -3544,11 +3500,8 @@
 	  icons/Makefile.in, panel/Makefile.in, plugins/Makefile.in,
 	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
 	  plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in,
-	  settings/Makefile.in, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: Update dependencies on libxfcegui4
-	  version and libxfce4mcs
+	  settings/Makefile.in, themes/Makefile.in: Update dependencies on
+	  libxfcegui4 version and libxfce4mcs
 
 2003-01-09 23:53  xfce
 
@@ -3556,11 +3509,9 @@
 	  panel/Makefile.in, plugins/Makefile.in,
 	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
 	  plugins/switcher/Makefile.in, plugins/systembuttons/Makefile.in,
-	  settings/Makefile.am, settings/Makefile.in, themes/Makefile.in,
-	  themes/Crystal/Makefile.in, themes/Curve/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/Noia/Makefile.in,
-	  themes/XFce/Makefile.in: Add " -avoid-version " to
-	  libxfce4settings_la_LDFLAGS in settings/Makefile.am
+	  settings/Makefile.am, settings/Makefile.in, themes/Makefile.in:
+	  Add " -avoid-version " to  libxfce4settings_la_LDFLAGS in
+	  settings/Makefile.am
 
 2003-01-09 23:25  huysmans
 
@@ -3616,11 +3567,8 @@
 	  plugins/switcher/Makefile.in, plugins/switcher/switcher.c,
 	  plugins/systembuttons/Makefile.in, settings/Makefile.in,
 	  settings/xfce_settings_dialog.c, settings/xfce_settings_plugin.c,
-	  themes/Makefile.in, themes/Crystal/Makefile.in,
-	  themes/Curve/Makefile.in, themes/Gnome/Makefile.in,
-	  themes/Noia/Makefile.in, themes/XFce/Makefile.in: Several fixes:
-	  minibuttons position, settings plugin icon and non-modal dialog,
-	  netk_pager sizing
+	  themes/Makefile.in: Several fixes: minibuttons position, settings
+	  plugin icon and non-modal dialog, netk_pager sizing
 
 2002-12-30 21:52  huysmans
 
@@ -3680,11 +3628,8 @@
 	  settings/Makefile.in, settings/xfce_settings.h,
 	  settings/xfce_settings_dialog.c, settings/xfce_settings_dialog.h,
 	  settings/xfce_settings_plugin.c, settings/xfce_settings_plugin.h,
-	  themes/Makefile.in, themes/Crystal/Makefile.in,
-	  themes/Curve/Makefile.in, themes/Gnome/Makefile.in,
-	  themes/Noia/Makefile.in, themes/XFce/Makefile.in: Add settings
-	  manager plugin and make the panel a settings client. Cool stuff
-	  :)
+	  themes/Makefile.in: Add settings manager plugin and make the
+	  panel a settings client. Cool stuff :)
 
 2002-12-20 13:12  huysmans
 
@@ -3789,63 +3734,22 @@
 	  header file xfce.h that includes all exported headers. New fixes
 	  and probably new bugs
 
-2002-12-03 15:24  huysmans
-
-	* themes/: Crystal/Makefile.am, Crystal/Makefile.in,
-	  Crystal/newmail.png, Crystal/nomail.png, Crystal/oldmail.png,
-	  Noia/Makefile.am, Noia/Makefile.in, Noia/newmail.png,
-	  Noia/nomail.png, Noia/oldmail.png: Add mail icons to Crystal and
-	  Noia themes. Thanks (again) to Jeroen Vloothuis
-
 2002-11-27 22:30  huysmans
 
 	* ChangeLog, panel/icons.c, panel/xfce.c,
 	  plugins/mailcheck/mailcheck.c: Fix a bug in icon handling. Thanks
 	  to Korbinus
 
-2002-11-26 15:04  huysmans
-
-	* themes/XFce/: Makefile.am, Makefile.in: Also update makefiles
-
-2002-11-26 15:01  huysmans
-
-	* themes/XFce/: mail.xpm, newmail.xpm: Fix naming of new mail icon
-
 2002-11-26 14:06  huysmans
 
 	* configure, configure.ac, panel/icons.c, themes/Makefile.am,
-	  themes/Makefile.in, themes/Crystal/Makefile.am,
-	  themes/Crystal/Makefile.in, themes/Crystal/README,
-	  themes/Crystal/edit.png, themes/Crystal/file1.png,
-	  themes/Crystal/file2.png, themes/Crystal/games.png,
-	  themes/Crystal/man.png, themes/Crystal/miniinfo.png,
-	  themes/Crystal/minilock.png, themes/Crystal/minipalet.png,
-	  themes/Crystal/minipower.png, themes/Crystal/multimedia.png,
-	  themes/Crystal/network.png, themes/Crystal/paint.png,
-	  themes/Crystal/print.png, themes/Crystal/schedule.png,
-	  themes/Crystal/sound.png, themes/Crystal/terminal.png,
-	  themes/Crystal/trash_empty.png, themes/Crystal/trash_full.png,
-	  themes/Crystal/unknown.png, themes/Noia/Makefile.am,
-	  themes/Noia/Makefile.in, themes/Noia/README,
-	  themes/Noia/edit.png, themes/Noia/file1.png,
-	  themes/Noia/file2.png, themes/Noia/games.png,
-	  themes/Noia/man.png, themes/Noia/miniinfo.png,
-	  themes/Noia/minilock.png, themes/Noia/minipalet.png,
-	  themes/Noia/minipower.png, themes/Noia/multimedia.png,
-	  themes/Noia/network.png, themes/Noia/paint.png,
-	  themes/Noia/print.png, themes/Noia/schedule.png,
-	  themes/Noia/sound.png, themes/Noia/terminal.png,
-	  themes/Noia/trash_empty.png, themes/Noia/trash_full.png,
-	  themes/Noia/unknown.png: Add Crystal and Noia themes provided by
+	  themes/Makefile.in: Add Crystal and Noia themes provided by
 	  Jeroen Vloothuis (aka slm on IRC)
 
 2002-11-26 09:06  huysmans
 
-	* ChangeLog, aclocal.m4, configure, panel/wmhints.c,
-	  themes/Curve/Makefile.am, themes/Curve/Makefile.in,
-	  themes/Curve/newmail.png, themes/Curve/nomail.png,
-	  themes/Curve/oldmail.png: Fix bug in wmhints and add mail icons
-	  to Curve theme
+	* ChangeLog, aclocal.m4, configure, panel/wmhints.c: Fix bug in
+	  wmhints and add mail icons to Curve theme
 
 2002-11-25 12:39  xfce
 
@@ -3933,10 +3837,9 @@
 
 	* panel/Makefile.in, plugins/Makefile.in,
 	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
-	  themes/Makefile.in, themes/Curve/Makefile.in,
-	  themes/Gnome/Makefile.in, themes/XFce/Makefile.in: make sure
-	  required libs for build/rpm are listed, with versions and keep
-	  the minimum version required at only one place (configure.ac)
+	  themes/Makefile.in: make sure required libs for build/rpm are
+	  listed, with versions and keep the minimum version required at
+	  only one place (configure.ac)
 
 2002-11-08 23:14  xfce
 
@@ -3964,19 +3867,8 @@
 	  icons/up.xpm, panel/builtins.c, panel/central.c, panel/dialogs.c,
 	  panel/global.h, panel/icons.c, panel/icons.h,
 	  plugins/mailcheck/mailcheck.c, themes/Makefile.am,
-	  themes/Makefile.in, themes/XFce/Makefile.am,
-	  themes/XFce/Makefile.in, themes/XFce/edit.xpm,
-	  themes/XFce/file1.xpm, themes/XFce/file2.xpm,
-	  themes/XFce/games.xpm, themes/XFce/mail.xpm, themes/XFce/man.xpm,
-	  themes/XFce/miniinfo.xpm, themes/XFce/minilock.xpm,
-	  themes/XFce/minipalet.xpm, themes/XFce/minipower.xpm,
-	  themes/XFce/multimedia.xpm, themes/XFce/network.xpm,
-	  themes/XFce/nomail.xpm, themes/XFce/oldmail.xpm,
-	  themes/XFce/paint.xpm, themes/XFce/print.xpm,
-	  themes/XFce/schedule.xpm, themes/XFce/sound.xpm,
-	  themes/XFce/terminal.xpm, themes/XFce/trash_empty.xpm,
-	  themes/XFce/trash_full.xpm, themes/XFce/unknown.xpm: Make default
-	  theme a normal theme. Get rid of builtin icons
+	  themes/Makefile.in: Make default theme a normal theme. Get rid of
+	  builtin icons
 
 2002-11-06 16:44  huysmans
 
@@ -4041,10 +3933,9 @@
 	  icons/Makefile.in, panel/Makefile.in, panel/global.h,
 	  panel/xfce_support.c, plugins/Makefile.in,
 	  plugins/clock/Makefile.in, plugins/mailcheck/Makefile.in,
-	  themes/Makefile.in, themes/Curve/Makefile.in,
-	  themes/Gnome/Makefile.in: Change autogen.sh script to use env
-	  vars if available (instead of auto*-1.x as it was before) Make
-	  use of preview file selector instead of basic gtk file selector.
+	  themes/Makefile.in: Change autogen.sh script to use env vars if
+	  available (instead of auto*-1.x as it was before) Make use of
+	  preview file selector instead of basic gtk file selector.
 
 2002-10-25 23:57  xfce
 
@@ -4187,19 +4078,8 @@
 
 2002-09-29 23:22  huysmans
 
-	* configure, configure.ac, themes/Makefile.am, themes/Makefile.in,
-	  themes/Curve/Makefile.am, themes/Curve/Makefile.in,
-	  themes/Curve/README, themes/Curve/edit.png,
-	  themes/Curve/file1.png, themes/Curve/file2.png,
-	  themes/Curve/games.png, themes/Curve/man.png,
-	  themes/Curve/miniinfo.png, themes/Curve/minilock.png,
-	  themes/Curve/minipalet.png, themes/Curve/minipower.png,
-	  themes/Curve/multimedia.png, themes/Curve/network.png,
-	  themes/Curve/paint.png, themes/Curve/print.png,
-	  themes/Curve/schedule.png, themes/Curve/sound.png,
-	  themes/Curve/terminal.png, themes/Curve/trash_empty.png,
-	  themes/Curve/trash_full.png, themes/Curve/unknown.png: Change
-	  theme name
+	* configure, configure.ac, themes/Makefile.am, themes/Makefile.in:
+	  Change theme name
 
 2002-09-29 20:54  huysmans
 
@@ -4209,8 +4089,7 @@
 2002-09-29 20:39  huysmans
 
 	* ChangeLog, configure, configure.ac, themes/Makefile.am,
-	  themes/Makefile.in, themes/Gnome/Makefile.am,
-	  themes/Gnome/Makefile.in: Add Bluecurve theme
+	  themes/Makefile.in: Add Bluecurve theme
 
 2002-09-29 11:00  xfce
 
@@ -4637,12 +4516,9 @@
 	* Makefile.in, aclocal.m4, icons/Makefile.in, panel/Makefile.in,
 	  panel/central.c, panel/global.h, panel/icons.c, panel/wmhints.c,
 	  panel/wmhints.h, panel/xfce.c, plugins/Makefile.in,
-	  plugins/mailcheck/Makefile.in, themes/Makefile.in,
-	  themes/Gnome/Makefile.am, themes/Gnome/Makefile.in,
-	  themes/Gnome/miniinfo.png, themes/Gnome/minilock.png,
-	  themes/Gnome/minipalet.png, themes/Gnome/minipower.png: Add
-	  support for themeable minibuttons and increased the maximum
-	  number of groups to 16
+	  plugins/mailcheck/Makefile.in, themes/Makefile.in: Add support
+	  for themeable minibuttons and increased the maximum number of
+	  groups to 16
 
 2002-08-05 08:18  huysmans
 
@@ -4766,8 +4642,8 @@
 	  panel/module.c, panel/settings.c, panel/xfce_support.c,
 	  panel/xfce_support.h, plugins/Makefile.in,
 	  plugins/mailcheck/Makefile.in, plugins/mailcheck/mailcheck.c,
-	  themes/Makefile.in, themes/Gnome/Makefile.in: Add preferences to
-	  mailcheck plugin and probably some other things as well
+	  themes/Makefile.in: Add preferences to mailcheck plugin and
+	  probably some other things as well
 
 2002-07-03 23:53  huysmans
 
@@ -4808,8 +4684,7 @@
 
 2002-06-20 22:03  huysmans
 
-	* panel/dialogs.c, themes/Gnome/file1.png: make icon themes work
-	  from dialogs
+	* panel/dialogs.c: make icon themes work from dialogs
 
 2002-06-18 00:15  xfce
 
@@ -4819,9 +4694,8 @@
 
 	* AUTHORS, Makefile.in, aclocal.m4, configure, xfce4.spec.in,
 	  icons/Makefile.in, panel/Makefile.in, plugins/Makefile.in,
-	  plugins/mailcheck/Makefile.in, themes/Makefile.in,
-	  themes/Gnome/Makefile.in: Add (empty) AUTHORS required by
-	  automake, Fix spec file
+	  plugins/mailcheck/Makefile.in, themes/Makefile.in: Add (empty)
+	  AUTHORS required by automake, Fix spec file
 
 2002-06-17 23:32  huysmans
 
@@ -4850,16 +4724,7 @@
 	  plugins/Makefile.am, plugins/Makefile.in,
 	  plugins/mailcheck/Makefile.am, plugins/mailcheck/Makefile.in,
 	  plugins/mailcheck/mailcheck.c, themes/Makefile.am,
-	  themes/Makefile.in, themes/Gnome/Makefile.am,
-	  themes/Gnome/Makefile.in, themes/Gnome/edit.png,
-	  themes/Gnome/file1.png, themes/Gnome/file2.png,
-	  themes/Gnome/games.png, themes/Gnome/man.png,
-	  themes/Gnome/multimedia.png, themes/Gnome/network.png,
-	  themes/Gnome/paint.png, themes/Gnome/print.png,
-	  themes/Gnome/schedule.png, themes/Gnome/sound.png,
-	  themes/Gnome/terminal.png, themes/Gnome/trash_empty.png,
-	  themes/Gnome/trash_full.png, themes/Gnome/unknown.png: (Re)add
-	  all files and automake framework
+	  themes/Makefile.in: (Re)add all files and automake framework
 
 2002-06-17 22:18  huysmans
 
diff --git a/Makefile.in b/Makefile.in
index ed78ad63a..4396a1afd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -112,9 +112,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -122,8 +119,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/TODO b/TODO
index 39b7b838a..2b8319abe 100644
--- a/TODO
+++ b/TODO
@@ -6,7 +6,7 @@ TODO
 * smarter resize/move
   - [DONE] popup arrow direction
   - [DONE] keep panel on same x/y alignment
-  - save 'centered' state to better keep the panel aligned?
+  - [DONE] save 'centered' state to better keep the panel aligned?
 * [DONE] use icon theme spec
 * [DONE] Move the exec_cmd stuff to libxfce4util/libxfcegui4
 * [DONE] Move to glib xml parsing. More work, but more speed / 
@@ -27,7 +27,6 @@ Ideas
 -----
 * plugins:
   - dockapps support
-  - iconbox / task list
 * 2 plugins side by side 
    (like systembuttons)
 * change icon themes to use a mapping between categories and icon names that
diff --git a/configure b/configure
index 3c5b9314e..80abac8a8 100755
--- a/configure
+++ b/configure
@@ -463,7 +463,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS localedir X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBX11_CFLAGS LIBX11_LDFLAGS LIBX11_LIBS PKG_CONFIG GTHREAD_CFLAGS GTHREAD_LIBS GTHREAD_REQUIRED_VERSION LIBXFCE4MCS_CLIENT_CFLAGS LIBXFCE4MCS_CLIENT_LIBS LIBXFCE4MCS_CLIENT_REQUIRED_VERSION LIBXFCE4UTIL_CFLAGS LIBXFCE4UTIL_LIBS LIBXFCE4UTIL_REQUIRED_VERSION LIBXFCEGUI4_CFLAGS LIBXFCEGUI4_LIBS LIBXFCEGUI4_REQUIRED_VERSION LIBXML_CFLAGS LIBXML_LIBS LIBXML_REQUIRED_VERSION LIBDBH_CFLAGS LIBDBH_LIBS XFCE_MCS_MANAGER_CFLAGS XFCE_MCS_MANAGER_LIBS XFCE_MCS_MANAGER_REQUIRED_VERSION XFCE_MCS_MANAGER_PLUGINSDIR LIBSTARTUP_NOTIFICATION_CFLAGS LIBSTARTUP_NOTIFICATION_LIBS LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS localedir X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBX11_CFLAGS LIBX11_LDFLAGS LIBX11_LIBS PKG_CONFIG LIBXFCE4MCS_CLIENT_CFLAGS LIBXFCE4MCS_CLIENT_LIBS LIBXFCE4MCS_CLIENT_REQUIRED_VERSION LIBXFCE4UTIL_CFLAGS LIBXFCE4UTIL_LIBS LIBXFCE4UTIL_REQUIRED_VERSION LIBXFCEGUI4_CFLAGS LIBXFCEGUI4_LIBS LIBXFCEGUI4_REQUIRED_VERSION LIBXML_CFLAGS LIBXML_LIBS LIBXML_REQUIRED_VERSION XFCE_MCS_MANAGER_CFLAGS XFCE_MCS_MANAGER_LIBS XFCE_MCS_MANAGER_REQUIRED_VERSION XFCE_MCS_MANAGER_PLUGINSDIR LIBSTARTUP_NOTIFICATION_CFLAGS LIBSTARTUP_NOTIFICATION_LIBS LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1818,7 +1818,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=xfce4-panel
- VERSION=4.1.7
+ VERSION=4.1.8
 
 
 cat >>confdefs.h <<_ACEOF
@@ -23788,108 +23788,6 @@ echo "$as_me: error: X Window system libraries and header files are required" >&
 
 
 
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
-if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for gthread-2.0 >= 2.0.6" >&5
-echo $ECHO_N "checking for gthread-2.0 >= 2.0.6... $ECHO_C" >&6
-
-        if $PKG_CONFIG --exists "gthread-2.0 >= 2.0.6" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-            succeeded=yes
-
-            echo "$as_me:$LINENO: checking GTHREAD_CFLAGS" >&5
-echo $ECHO_N "checking GTHREAD_CFLAGS... $ECHO_C" >&6
-            GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 >= 2.0.6"`
-            echo "$as_me:$LINENO: result: $GTHREAD_CFLAGS" >&5
-echo "${ECHO_T}$GTHREAD_CFLAGS" >&6
-
-            echo "$as_me:$LINENO: checking GTHREAD_LIBS" >&5
-echo $ECHO_N "checking GTHREAD_LIBS... $ECHO_C" >&6
-            GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0 >= 2.0.6"`
-            echo "$as_me:$LINENO: result: $GTHREAD_LIBS" >&5
-echo "${ECHO_T}$GTHREAD_LIBS" >&6
-        else
-            GTHREAD_CFLAGS=""
-            GTHREAD_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0 >= 2.0.6"`
-            echo $GTHREAD_PKG_ERRORS
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     :
-  else
-     { { echo "$as_me:$LINENO: error: Library requirements (gthread-2.0 >= 2.0.6) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-echo "$as_me: error: Library requirements (gthread-2.0 >= 2.0.6) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-
-  GTHREAD_REQUIRED_VERSION=2.0.6
-
-
-
-
   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
@@ -24297,9 +24195,6 @@ echo "$as_me: error: Library requirements (libxml-2.0 >= 2.4.0) not met; conside
 
 
 
-LIBDBH_CFLAGS=
-LIBDBH_LIBS=
-
 
 
 
@@ -25412,9 +25307,6 @@ s,@LIBX11_CFLAGS@,$LIBX11_CFLAGS,;t t
 s,@LIBX11_LDFLAGS@,$LIBX11_LDFLAGS,;t t
 s,@LIBX11_LIBS@,$LIBX11_LIBS,;t t
 s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@GTHREAD_CFLAGS@,$GTHREAD_CFLAGS,;t t
-s,@GTHREAD_LIBS@,$GTHREAD_LIBS,;t t
-s,@GTHREAD_REQUIRED_VERSION@,$GTHREAD_REQUIRED_VERSION,;t t
 s,@LIBXFCE4MCS_CLIENT_CFLAGS@,$LIBXFCE4MCS_CLIENT_CFLAGS,;t t
 s,@LIBXFCE4MCS_CLIENT_LIBS@,$LIBXFCE4MCS_CLIENT_LIBS,;t t
 s,@LIBXFCE4MCS_CLIENT_REQUIRED_VERSION@,$LIBXFCE4MCS_CLIENT_REQUIRED_VERSION,;t t
@@ -25427,8 +25319,6 @@ s,@LIBXFCEGUI4_REQUIRED_VERSION@,$LIBXFCEGUI4_REQUIRED_VERSION,;t t
 s,@LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t
 s,@LIBXML_LIBS@,$LIBXML_LIBS,;t t
 s,@LIBXML_REQUIRED_VERSION@,$LIBXML_REQUIRED_VERSION,;t t
-s,@LIBDBH_CFLAGS@,$LIBDBH_CFLAGS,;t t
-s,@LIBDBH_LIBS@,$LIBDBH_LIBS,;t t
 s,@XFCE_MCS_MANAGER_CFLAGS@,$XFCE_MCS_MANAGER_CFLAGS,;t t
 s,@XFCE_MCS_MANAGER_LIBS@,$XFCE_MCS_MANAGER_LIBS,;t t
 s,@XFCE_MCS_MANAGER_REQUIRED_VERSION@,$XFCE_MCS_MANAGER_REQUIRED_VERSION,;t t
diff --git a/configure.ac b/configure.ac
index 75314881b..4e64d36f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ dnl
 
 AC_INIT([panel/main.c])
 
-AM_INIT_AUTOMAKE([xfce4-panel], [4.1.7])
+AM_INIT_AUTOMAKE([xfce4-panel], [4.1.8])
 
 AM_CONFIG_HEADER([config.h])
 
@@ -41,21 +41,19 @@ dnl Check for X11 installed
 BM_LIBX11_REQUIRE
 
 dnl Check for required packages
-BM_DEPEND([GTHREAD], [gthread-2.0], [2.0.6])
 BM_DEPEND([LIBXFCE4MCS_CLIENT], [libxfce4mcs-client-1.0], [4.0.0])
 BM_DEPEND([LIBXFCE4UTIL], [libxfce4util-1.0], [4.1.13])
 BM_DEPEND([LIBXFCEGUI4], [libxfcegui4-1.0], [4.1.19])
 BM_DEPEND([LIBXML], [libxml-2.0], [2.4.0])
 
+dnl disable threading, too much trouble for too little gain
+dnl BM_DEPEND([GTHREAD], [gthread-2.0], [2.0.6])
+
 dnl Check for dbh installed for completion combo
 dnl disable for now, doesn't work for new install, only after
 dnl  combo has been used in xffm or xfrun.
 dnl BM_DEPEND_CHECK([LIBDBH], [dbh-1.0], [1.0],
 dnl  [dbh], [DBH library], [yes])
-LIBDBH_CFLAGS=
-LIBDBH_LIBS=
-AC_SUBST([LIBDBH_CFLAGS])
-AC_SUBST([LIBDBH_LIBS])
 
 dnl Configure the mcs plugin
 XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [4.0.0])
diff --git a/doc/C/Makefile.in b/doc/C/Makefile.in
index eb271c1d7..309e60396 100644
--- a/doc/C/Makefile.in
+++ b/doc/C/Makefile.in
@@ -96,9 +96,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -106,8 +103,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/doc/C/images/Makefile.in b/doc/C/images/Makefile.in
index 56de2d1a3..a6c3b4d91 100644
--- a/doc/C/images/Makefile.in
+++ b/doc/C/images/Makefile.in
@@ -87,9 +87,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -97,8 +94,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 13c42b963..2d44f89e8 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -94,9 +94,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -104,8 +101,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/doc/fr/Makefile.in b/doc/fr/Makefile.in
index 4dd99993c..906fa7e5d 100644
--- a/doc/fr/Makefile.in
+++ b/doc/fr/Makefile.in
@@ -96,9 +96,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -106,8 +103,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/doc/fr/images/Makefile.in b/doc/fr/images/Makefile.in
index e41a55ed2..d4809af87 100644
--- a/doc/fr/images/Makefile.in
+++ b/doc/fr/images/Makefile.in
@@ -87,9 +87,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -97,8 +94,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/doc/it/Makefile.in b/doc/it/Makefile.in
index c5c17e099..696a055aa 100644
--- a/doc/it/Makefile.in
+++ b/doc/it/Makefile.in
@@ -96,9 +96,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -106,8 +103,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/doc/it/images/Makefile.in b/doc/it/images/Makefile.in
index 6e6481336..b707a0fa0 100644
--- a/doc/it/images/Makefile.in
+++ b/doc/it/images/Makefile.in
@@ -87,9 +87,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -97,8 +94,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/icons/Makefile.in b/icons/Makefile.in
index f19f8e39d..69e2ba1bd 100644
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@ -88,9 +88,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -98,8 +95,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/panel/Makefile.am b/panel/Makefile.am
index c711d5280..709a93dc5 100644
--- a/panel/Makefile.am
+++ b/panel/Makefile.am
@@ -53,11 +53,9 @@ xfce4_panel_CFLAGS = 							\
 	-I$(top_srcdir)							\
 	@LIBSTARTUP_NOTIFICATION_CFLAGS@				\
 	@LIBX11_CFLAGS@							\
-	@LIBDBH_CFLAGS@							\
 	@LIBXFCEGUI4_CFLAGS@						\
 	@LIBXFCE4MCS_CLIENT_CFLAGS@					\
 	@LIBXML_CFLAGS@							\
-	@GTHREAD_CFLAGS@						\
 	-DDATADIR=\"$(datadir)/xfce4\"					\
 	-DLIBDIR=\"$(libdir)/xfce4\"					\
 	-DSYSCONFDIR=\"$(sysconfdir)\"					\
@@ -69,11 +67,9 @@ xfce4_panel_LDFLAGS =							\
 xfce4_panel_LDADD =							\
 	@LIBSTARTUP_NOTIFICATION_LIBS@					\
 	@LIBX11_LIBS@							\
-	@GTHREAD_LIBS@							\
 	@LIBXFCEGUI4_LIBS@						\
 	@LIBXFCE4MCS_CLIENT_LIBS@					\
-	@LIBXML_LIBS@							\
-	@LIBDBH_LIBS@
+	@LIBXML_LIBS@
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xfce4-panel-1.0.pc
diff --git a/panel/Makefile.in b/panel/Makefile.in
index 3cf84bc6c..4203686b2 100644
--- a/panel/Makefile.in
+++ b/panel/Makefile.in
@@ -136,9 +136,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -146,8 +143,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
@@ -299,11 +294,9 @@ xfce4_panel_CFLAGS = \
 	-I$(top_srcdir)							\
 	@LIBSTARTUP_NOTIFICATION_CFLAGS@				\
 	@LIBX11_CFLAGS@							\
-	@LIBDBH_CFLAGS@							\
 	@LIBXFCEGUI4_CFLAGS@						\
 	@LIBXFCE4MCS_CLIENT_CFLAGS@					\
 	@LIBXML_CFLAGS@							\
-	@GTHREAD_CFLAGS@						\
 	-DDATADIR=\"$(datadir)/xfce4\"					\
 	-DLIBDIR=\"$(libdir)/xfce4\"					\
 	-DSYSCONFDIR=\"$(sysconfdir)\"					\
@@ -315,11 +308,9 @@ xfce4_panel_LDFLAGS = \
 xfce4_panel_LDADD = \
 	@LIBSTARTUP_NOTIFICATION_LIBS@					\
 	@LIBX11_LIBS@							\
-	@GTHREAD_LIBS@							\
 	@LIBXFCEGUI4_LIBS@						\
 	@LIBXFCE4MCS_CLIENT_LIBS@					\
-	@LIBXML_LIBS@							\
-	@LIBDBH_LIBS@
+	@LIBXML_LIBS@
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xfce4-panel-1.0.pc
diff --git a/panel/item.c b/panel/item.c
index 4172b7ac0..c592165f5 100644
--- a/panel/item.c
+++ b/panel/item.c
@@ -200,8 +200,6 @@ popup_menu_timeout (Item * item)
 
     popup_timeout_id = 0;
 
-    gdk_threads_enter ();
-
     /* FIXME: items should know about their parent */
 
     /* Explanantion of code below:
@@ -240,8 +238,6 @@ popup_menu_timeout (Item * item)
 	}
     }
 
-    gdk_threads_leave ();
-
     return FALSE;
 }
 
diff --git a/panel/main.c b/panel/main.c
index cad7d450e..0aaa655f3 100644
--- a/panel/main.c
+++ b/panel/main.c
@@ -147,9 +147,7 @@ restart (void)
     sigstate = RESTART;
 
     /* calls gtk_main_quit() */
-    gdk_threads_enter ();
     quit (TRUE);
-    gdk_threads_leave ();
 
     /* progname is saved on startup 
      * TODO: do we need to pass on arguments? */
@@ -168,10 +166,8 @@ check_signal_state (void)
     if (sigstate != NOSIGNAL)
     {
 	/* close open dialogs */
-	gdk_threads_enter ();
 	destroy_controls_dialog ();
 	destroy_menu_dialog ();
-	gdk_threads_leave ();
 
 	if (sigstate == RESTART && !restarting)
 	{
@@ -181,17 +177,12 @@ check_signal_state (void)
 	}
 	else if (sigstate == QUIT)
 	{
-	    gdk_threads_enter ();
 	    quit (TRUE);
-	    gdk_threads_leave ();
-
 	}
 	else if (sigstate == QUIT_CONFIRM)
 	{
 	    sigstate = NOSIGNAL;
-	    gdk_threads_enter ();
 	    quit (FALSE);
-	    gdk_threads_leave ();
 	}
     }
 
@@ -343,13 +334,8 @@ main (int argc, char **argv)
 	return 0;
     }
 
-    if (!g_thread_supported ())
-	g_thread_init (NULL);
-    gdk_threads_init ();
     gtk_init (&argc, &argv);
 
-    gdk_threads_enter ();
-
     progname = argv[0];
 
     if (xfce_panel_is_running ())
@@ -419,7 +405,5 @@ main (int argc, char **argv)
 
     gtk_main ();
 
-    gdk_threads_leave ();
-
     return 0;
 }
diff --git a/panel/panel.c b/panel/panel.c
index 6f40d1fbd..99e8ea927 100644
--- a/panel/panel.c
+++ b/panel/panel.c
@@ -519,10 +519,7 @@ lock_screen (void)
 static void
 restart_panel (void)
 {
-    /* signal handlers are under thread lock */
-    gdk_threads_leave ();
     restart ();
-    gdk_threads_enter ();
 }
 
 static void
@@ -798,9 +795,7 @@ panel_hide_timeout (Panel * p)
 
     if (!p->hidden)
     {
-	gdk_threads_enter ();
 	panel_set_hidden (p, TRUE);
-	gdk_threads_leave ();
     }
     else
 	DBG ("already hidden");
@@ -813,9 +808,7 @@ panel_unhide_timeout (Panel * p)
 {
     if (p->hidden)
     {
-	gdk_threads_enter ();
 	panel_set_hidden (p, FALSE);
-	gdk_threads_leave ();
     }
 
     return FALSE;
diff --git a/panel/xfce_support.c b/panel/xfce_support.c
index c85f5228f..20d45cd21 100644
--- a/panel/xfce_support.c
+++ b/panel/xfce_support.c
@@ -700,10 +700,8 @@ struct _ActionCommand
 static gboolean
 delayed_exec (ActionCommand * command)
 {
-    gdk_threads_enter ();
     real_exec_cmd (command->cmd, command->in_terminal, command->use_sn,
 		   command->silent);
-    gdk_threads_leave ();
 
     g_free (command->cmd);
     g_free (command);
diff --git a/plugins/Makefile.in b/plugins/Makefile.in
index 0f0eaf359..a3c3b0e7c 100644
--- a/plugins/Makefile.in
+++ b/plugins/Makefile.in
@@ -92,9 +92,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -102,8 +99,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/plugins/clock/Makefile.in b/plugins/clock/Makefile.in
index c0925007a..d12ae4868 100644
--- a/plugins/clock/Makefile.in
+++ b/plugins/clock/Makefile.in
@@ -106,9 +106,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -116,8 +113,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index 3674ca936..c124ea7ef 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -156,9 +156,7 @@ popup_xfcalendar (GtkWidget * widget, guint32 time)
 static gboolean
 retry_popup_xfcalendar (GtkWidget * widget)
 {
-    gdk_threads_enter ();
     popup_xfcalendar (widget, gtk_get_current_event_time ());
-    gdk_threads_leave ();
     return FALSE;
 }
 
@@ -217,14 +215,6 @@ clock_date_tooltip (GtkWidget * widget)
     return TRUE;
 }
 
-static gboolean
-clock_date_tooltip_timeout (GtkWidget * widget)
-{
-    gdk_threads_enter ();
-    clock_date_tooltip (widget);
-    gdk_threads_leave ();
-}
-
 static t_clock *
 clock_new (void)
 {
@@ -242,7 +232,7 @@ clock_new (void)
     clock_date_tooltip (clock->eventbox);
 
     clock->timeout_id =
-	g_timeout_add (60000, (GSourceFunc) clock_date_tooltip_timeout,
+	g_timeout_add (60000, (GSourceFunc) clock_date_tooltip,
 		       clock->eventbox);
 
     /* callback for calendar popup */
diff --git a/plugins/mailcheck/Makefile.in b/plugins/mailcheck/Makefile.in
index 01cd4ef72..0135f2edd 100644
--- a/plugins/mailcheck/Makefile.in
+++ b/plugins/mailcheck/Makefile.in
@@ -106,9 +106,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -116,8 +113,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/plugins/mailcheck/mailcheck.c b/plugins/mailcheck/mailcheck.c
index 8033c36de..f73d4db24 100644
--- a/plugins/mailcheck/mailcheck.c
+++ b/plugins/mailcheck/mailcheck.c
@@ -167,8 +167,6 @@ mailcheck_set_tip (t_mailcheck * mc)
 static gboolean
 set_mail_icon (t_mailcheck * mc)
 {
-    gdk_threads_enter ();
-
     if (mc->status == NO_MAIL)
     {
 	xfce_iconbutton_set_pixbuf (XFCE_ICONBUTTON (mc->button),
@@ -185,8 +183,6 @@ set_mail_icon (t_mailcheck * mc)
 				    mc->newmail_pb);
     }
 
-    gdk_threads_leave ();
-
     return FALSE;
 }
 
diff --git a/plugins/pager/Makefile.in b/plugins/pager/Makefile.in
index dcd6df1de..95cc3e970 100644
--- a/plugins/pager/Makefile.in
+++ b/plugins/pager/Makefile.in
@@ -106,9 +106,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -116,8 +113,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/plugins/sample-plugin/Makefile.in b/plugins/sample-plugin/Makefile.in
index 4ba326626..4529be4c4 100644
--- a/plugins/sample-plugin/Makefile.in
+++ b/plugins/sample-plugin/Makefile.in
@@ -104,9 +104,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -114,8 +111,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/plugins/separator/Makefile.in b/plugins/separator/Makefile.in
index 0e537f1b0..f205dbc57 100644
--- a/plugins/separator/Makefile.in
+++ b/plugins/separator/Makefile.in
@@ -106,9 +106,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -116,8 +113,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/plugins/switcher/Makefile.in b/plugins/switcher/Makefile.in
index adcddffca..51bf8f0b4 100644
--- a/plugins/switcher/Makefile.in
+++ b/plugins/switcher/Makefile.in
@@ -106,9 +106,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -116,8 +113,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/plugins/systembuttons/Makefile.in b/plugins/systembuttons/Makefile.in
index 3ecff57ed..89ab41ef7 100644
--- a/plugins/systembuttons/Makefile.in
+++ b/plugins/systembuttons/Makefile.in
@@ -107,9 +107,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -117,8 +114,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/settings/Makefile.in b/settings/Makefile.in
index 543451351..6499602bc 100644
--- a/settings/Makefile.in
+++ b/settings/Makefile.in
@@ -112,9 +112,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -122,8 +119,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
diff --git a/themes/Makefile.in b/themes/Makefile.in
index 2a84d7d91..fb79bfa64 100644
--- a/themes/Makefile.in
+++ b/themes/Makefile.in
@@ -92,9 +92,6 @@ FFLAGS = @FFLAGS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
-GTHREAD_LIBS = @GTHREAD_LIBS@
-GTHREAD_REQUIRED_VERSION = @GTHREAD_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -102,8 +99,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
-LIBDBH_CFLAGS = @LIBDBH_CFLAGS@
-LIBDBH_LIBS = @LIBDBH_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
-- 
GitLab