nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1113 commits 2 branches 0 tags 6.7 MiB
Commit graph

276 commits

Author SHA1 Message Date
o9000
ed24d0bd4c Fix command line argument processing (issue #516) 2015-08-03 18:34:12 +02:00
o9000
c874e76343 Merge branch 'moreclicks' into 'master' 
Moreclicks

The two commits in this merge request would allow the user to set up as many as eight extra custom actions via tint2rc.

I've been running these changes (minus the up/down wheel actions) for many months without any obvious issues, mainly to adjust laptop screen brightness via a couple of scripts.

I've just tested the wheel actions and they appeared to work fine. The clock commit should solve issue #505.

I have merely augmented the work of two other people, and appropriate credits/references are indicated in the individual commit messages.

See merge request !5
 2015-08-01 07:02:51 +00:00
o9000
e2023b7172 systray: Revert break embedding into 2 steps (breaks transparency for Qt icons) 2015-07-31 10:04:41 +02:00
o9000
d492f80468 systray: Redirect resize events 2015-07-31 09:31:03 +02:00
o9000
78bc330448 systray: Break embedding into 2 steps 2015-07-30 23:54:46 +02:00
o9000
9624b5d558 Revert "taskbar: Add logging for event_configure_notify()" 
This reverts commit b99c5c204b.
 2015-07-30 22:55:47 +02:00
o9000
b99c5c204b taskbar: Add logging for event_configure_notify() 2015-07-26 12:08:59 +02:00
o9000
50e21b4077 systray: Trying some variations 2015-07-19 18:06:45 +02:00
o9000
57b878d5e4 Remove debug line 2015-07-16 22:33:13 +02:00
o9000
46aab61bf6 Revert "systray: Process XEmbed events according to spec" 
This reverts commit 227dc8e48a.
 2015-07-16 22:25:18 +02:00
o9000
227dc8e48a systray: Process XEmbed events according to spec 2015-07-16 21:08:48 +02:00
o9000
68c3205b53 systray: Handle UnmapNotify correctly 2015-07-16 21:08:48 +02:00
o9000
61f0a4ec85 systray: remove icon when reparented away from us 2015-07-16 21:08:47 +02:00
o9000
c606a1a35a systray: Separate reparenting from embedding 2015-07-16 21:08:47 +02:00
o9000
8d5c2d8cbb tint: remove inner loop from the main event loop 2015-07-14 08:33:13 +02:00
berkley4
fd78e6d886 Allow clicking and mousewheeling on the battery panel 
This commit is the same as vimishor's original [*] except that I have
added middle-click and up/down mousewheel actions. In order to fix a
ftbs I also added guards to panel.c, panel.h & tint.c

The following configuration settings have been created :-

battery_lclick_command
battery_mclick_command
battery_rclick_command
battery_uwheel_command
battery_dwheel_command

[*] c78732c46a
 2015-07-13 04:57:16 +01:00
berkley4
e84d963ab6 Allow middle click & up/down mousewheel on the clock 
The bulk of this commit originally came from David B. Cortarello's
patch (see here - https://gitlab.com/o9000/tint2/issues/430), with me
adding the up/down mousewheel elements.

Under Openbox the middle-click is normally used to display the Openbox
menu and the mousewheel to switch desktop. So I needed to modify tint.c
in order to prevent openbox intercepting the new actions.

This commit creates the following new configuration settings :-

clock_mclick_command
clock_uwheel_command
clock_dwheel_command
 2015-07-13 04:10:45 +01:00
o9000
efe9aadb39 Prevent race at startup in detecting screen resolution changes 2015-07-12 14:36:11 +02:00
o9000
8242c969e3 Detect compositor at startup 2015-07-04 13:34:42 +02:00
o9000
47a7013029 Remove noisy debug messages 2015-06-28 11:34:53 +02:00
o9000
a4de005a54 Add missing include 2015-06-26 23:46:43 +02:00
o9000
5abbf168a9 Cosmetic changes 2015-06-25 15:56:36 +02:00
o9000
4d69a0bc33 tint2: Do not rely only on select() to detect new X events, since we sync the socket in the system tray which messes up select 2015-06-25 15:36:47 +02:00
o9000
ea75558ac2 systray: reduce icon flicker by painting on buffer instead of directly on window 2015-06-21 15:00:01 +02:00
o9000
876cae8239 systray: fix black icon background for 32-bit icons when disable_transparency = 1; fix empty icon detection when disable_transparency = 1; fix icon blinking by delaying rendering less aggressively; removed XClearArea on traywin->win (triggers unnecessary redraws); cache icon names; profiling messages updated 2015-06-21 14:50:08 +02:00
o9000
b13540123b systray: force a repaint on icon resize 2015-06-14 11:21:42 +02:00
o9000
481c409617 Fix bad interaction between freespace and systray 2015-06-12 02:09:43 +02:00
o9000
df1f2d4e4b Merge taskbar_alignment from branch 2015-06-12 00:52:10 +02:00
o9000
9040764cf1 systray: Cleaned up the code a bit 2015-06-07 12:58:29 +02:00
o9000
fbcfa54061 Disable systray composited rendering if disable_transparency = 1 2015-06-07 11:44:43 +02:00
o9000
5450dcca0b Attempt to fix new window title race in fvwm 2015-05-08 21:49:26 +02:00
o9000
b78c854700 Flush stdout/stderr after newline 
git-svn-id: http://tint2.googlecode.com/svn/trunk@760 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-04-17 20:31:28 +00:00
o9000
66cae4bb7c Fix dangling pointers causing erratic timer behaviour (affects taskbar with spacing); use calloc instead of malloc for safer initializations 
git-svn-id: http://tint2.googlecode.com/svn/trunk@758 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-04-17 20:17:25 +00:00
o9000
45d6463315 Revert r751 and add workaround for systray rendering artifacts 
git-svn-id: http://tint2.googlecode.com/svn/trunk@755 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-04-13 20:18:28 +00:00
o9000
eb1244a415 Simplify systray icon management (attempt to fix issue 480) 
git-svn-id: http://tint2.googlecode.com/svn/trunk@751 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-04-12 17:35:54 +00:00
o9000
af003d0e19 Memory management review: match char-malloc/strdup-free, gchar-g_str*/g_free; set pointers to null after free; initialize fonts/backgrounds correctly when missing from config 
git-svn-id: http://tint2.googlecode.com/svn/trunk@748 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-04-11 09:51:10 +00:00
o9000
e539c6536f Sort tasks on taskbar: config + sort by title or center (disabled, work in progress) - issue 478 
git-svn-id: http://tint2.googlecode.com/svn/trunk@743 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-03-28 22:38:57 +00:00
o9000
67d5bfcfce Sort tasks on taskbar: handle task drag and drop (disabled, work in progress) - issue 478 
git-svn-id: http://tint2.googlecode.com/svn/trunk@742 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-03-28 21:15:30 +00:00
o9000
5376e09963 Sort tasks on taskbar (disabled, work in progress) - issue 478 
git-svn-id: http://tint2.googlecode.com/svn/trunk@740 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-03-28 21:07:33 +00:00
o9000
e113080a0e Tentative to sort tasks on taskbar (disabled) - issue 478 
git-svn-id: http://tint2.googlecode.com/svn/trunk@738 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-03-22 16:07:04 +00:00
o9000
5faf063f96 Add config option startup_notifications = 0/1 
git-svn-id: http://tint2.googlecode.com/svn/trunk@737 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-03-21 13:39:43 +00:00
o9000
c900bc24b2 Add option to hide tasks from different monitors when panel_monitor = x (issue 196) 
git-svn-id: http://tint2.googlecode.com/svn/trunk@736 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-03-21 09:49:10 +00:00
o9000
a2de8d6e53 Modified startup notification logic to prevent deadlock in issue 471 
git-svn-id: http://tint2.googlecode.com/svn/trunk@735 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-03-20 22:49:13 +00:00
o9000
7b698e1fe1 Fix issue 463: Launcher icon accepts all mouse buttons 
git-svn-id: http://tint2.googlecode.com/svn/trunk@687 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-02-05 12:21:56 +00:00
google@craigoakes.com
0fa10d83b9 Added mouse_left configuration, defaults to original function (Issue 459, 397) 
git-svn-id: http://tint2.googlecode.com/svn/trunk@676 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-01-30 21:13:04 +00:00
o9000
28d726626d Xorg: Add option to disable transparency (workaround for broken graphics stacks; issues 432, 435, 439) 
git-svn-id: http://tint2.googlecode.com/svn/trunk@675 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-01-30 10:01:39 +00:00
o9000
45cc690167 Xorg: Rename function 
git-svn-id: http://tint2.googlecode.com/svn/trunk@674 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-01-30 09:54:16 +00:00
o9000
4e76c2bb5d Taskbar: add option to redistribute size in multi-desktop mode (useful especially when the taskbar is getting full on one desktop) 
git-svn-id: http://tint2.googlecode.com/svn/trunk@673 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-01-30 09:53:16 +00:00
o9000
d584d04691 Remove global variables from header files 
git-svn-id: http://tint2.googlecode.com/svn/trunk@671 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-01-28 15:13:56 +00:00
o9000
fc4b29631f Cleanup whitespace 
git-svn-id: http://tint2.googlecode.com/svn/trunk@654 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-01-20 02:20:35 +00:00
o9000
dc137ef1a6 Fix incorrect memset 
git-svn-id: http://tint2.googlecode.com/svn/trunk@653 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2015-01-20 01:27:15 +00:00
o9000
257cc45adc Fix for no task cycling if all windows are minimized 
git-svn-id: http://tint2.googlecode.com/svn/trunk@652 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2012-10-14 22:04:25 +00:00
o9000
0a1ceaeed0 Fix for incorrect task cycling when windows visible on all desktops are present 
git-svn-id: http://tint2.googlecode.com/svn/trunk@651 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2012-10-14 22:00:48 +00:00
xico.atelo@gmail.com
cfa4bc89e1 Adding startup-notification support. 
git-svn-id: http://tint2.googlecode.com/svn/trunk@650 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2012-07-02 16:50:30 +00:00
o9000
13b0d7612a Drag and drop support for launchers 
git-svn-id: http://tint2.googlecode.com/svn/trunk@648 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2012-03-14 05:15:23 +00:00
Andreas.Fink85
53c40d415d *fix* segfault when removing last virtual desktop while being on it 
git-svn-id: http://tint2.googlecode.com/svn/trunk@619 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-12-29 10:51:23 +00:00
Andreas.Fink85
8201742546 *add* remove of tooltip = En/Disabled. it's renamed to task_tooltip to enable/disable task/clock tooltip separatly (tooltip = N is equivalent to 
task_tooltip = N for backwards compatibility)


git-svn-id: http://tint2.googlecode.com/svn/trunk@615 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-12-12 08:57:51 +00:00
Andreas.Fink85
07f48183d7 *fix* issue 313 (pcmanfm sets _XROOTMAP_ID instead of _XROOTPMAP_ID) 
git-svn-id: http://tint2.googlecode.com/svn/trunk@614 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-12-11 09:15:14 +00:00
Andreas.Fink85
cf12f63198 *fix* warning 
*fix* tint2conf installation directories 


git-svn-id: http://tint2.googlecode.com/svn/trunk@604 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-11-18 20:29:30 +00:00
thilor77
2ab0d33ae5 desktop name : last step 
git-svn-id: http://tint2.googlecode.com/svn/trunk@601 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-11-16 20:00:22 +00:00
thilor77
d94e2a1790 desktop name: first step 
git-svn-id: http://tint2.googlecode.com/svn/trunk@596 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-11-13 10:27:26 +00:00
thilor77
fc5269d610 XSETTINGS manager : reload icons when theme changed (gnome, xfce, ...). 
git-svn-id: http://tint2.googlecode.com/svn/trunk@589 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-11-07 12:59:51 +00:00
thilor77
da27293d22 launcher : limit launcher_icon_theme to 1 theme. Add XSETTINGS client and read launcher_icon_theme if manager is running. 
git-svn-id: http://tint2.googlecode.com/svn/trunk@588 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-11-07 08:44:27 +00:00
thilor77
7c8a31db72 update my contribution to the company 
git-svn-id: http://tint2.googlecode.com/svn/trunk@585 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-11-02 11:40:50 +00:00
thilor77
86cfa07735 fixed multi_desktop switching 
git-svn-id: http://tint2.googlecode.com/svn/trunk@582 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-10-24 09:18:41 +00:00
thilor77
eb07f935fe cleanup : remove unneeded title change 
git-svn-id: http://tint2.googlecode.com/svn/trunk@579 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-10-23 13:39:09 +00:00
thilor77
c01b7f480e memorized taskbar pixmap. So we don t redraw taskbar/task when switching desktop. 
git-svn-id: http://tint2.googlecode.com/svn/trunk@577 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-10-23 11:16:29 +00:00
Andreas.Fink85
eae7223ddf *fix* valgrind invalid read/write and memleaks 
git-svn-id: http://tint2.googlecode.com/svn/trunk@572 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-10-08 21:45:14 +00:00
thilor77
c19819843e panel_items : fixed _NET_WM_ICON_GEOMETRY. panel_items is done for me. 
git-svn-id: http://tint2.googlecode.com/svn/trunk@563 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-09-23 20:28:30 +00:00
thilor77
98c3cbe874 cleanup code 
git-svn-id: http://tint2.googlecode.com/svn/trunk@562 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-09-23 18:09:30 +00:00
thilor77
d44628b16c panel_items : fixed change number of desktop 
git-svn-id: http://tint2.googlecode.com/svn/trunk@554 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-09-19 08:34:24 +00:00
thilor77
b98d2001cb panel_items : fixed segfault (panel without clock, change number desktop) 
git-svn-id: http://tint2.googlecode.com/svn/trunk@550 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-09-18 18:06:29 +00:00
thilor77
52eb843047 order of panel items : position of each object is update by layering engine (area) 
git-svn-id: http://tint2.googlecode.com/svn/trunk@547 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-09-18 10:41:34 +00:00
Andreas.Fink85
906ee82dbf *fix* issue 282 
*fix* correct x/y coordinates for tooltip on multi-head setup
*fix* delete multitimer hashmap
*fix* cleanup_panel() needs to be called after cleanup_launcher()


git-svn-id: http://tint2.googlecode.com/svn/trunk@544 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-09-12 22:00:00 +00:00
thilor77
ba24db4c6c code documentation 
git-svn-id: http://tint2.googlecode.com/svn/trunk@532 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-08-10 13:18:17 +00:00
thilor77
c9ca6a4006 adjust tooltip position (mrovi) 
git-svn-id: http://tint2.googlecode.com/svn/trunk@524 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-08-07 12:17:56 +00:00
thilor77
7e17a3c7f0 added basic launcher by mrovi 
git-svn-id: http://tint2.googlecode.com/svn/trunk@521 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-08-02 17:12:07 +00:00
Andreas.Fink85
a3f33be8ae *fix* ignore SIGCHLD in way that BSD and linux support 
*fix* default background id 0 for panel if not specified in the config file



git-svn-id: http://tint2.googlecode.com/svn/trunk@517 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-07-03 07:37:17 +00:00
Andreas.Fink85
357e37282a *fix* finish dnd problems and autohide 
git-svn-id: http://tint2.googlecode.com/svn/trunk@514 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-06-26 12:35:35 +00:00
Andreas.Fink85
72cdc49512 *fix* start work on autohide+drag'n'drop 
*fix* fallback version is 0.11-svn



git-svn-id: http://tint2.googlecode.com/svn/trunk@510 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-06-20 15:56:04 +00:00
Andreas.Fink85
7fdcd2fbc9 *fix* set _NET_WM_ICON_GEOMETRY (fixes issue 36) 
*fix* updated ChangeLog



git-svn-id: http://tint2.googlecode.com/svn/trunk@508 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-06-16 15:00:48 +00:00
Andreas.Fink85
5521275bef *fix* execute an external command by calling fork/execl and do not ignore SIGCHLD (maybe fixes issue 263) 
git-svn-id: http://tint2.googlecode.com/svn/trunk@480 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-06-11 18:47:26 +00:00
Andreas.Fink85
abeb6d384d *add* include svn revision in the VERSION_STRING if building with cmake 
git-svn-id: http://tint2.googlecode.com/svn/trunk@475 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-06-09 15:31:18 +00:00
thilor77
f13a7a13cb fixed for issue 32 
git-svn-id: http://tint2.googlecode.com/svn/trunk@461 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-05-18 08:50:17 +00:00
thilor77
1eed78c206 fixed : config file use . as decimal separator even when LOCALE is different 
git-svn-id: http://tint2.googlecode.com/svn/trunk@445 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-05-04 20:15:46 +00:00
Spooky85@gmail.com
1a9ce9decd Add preprocessor statements to check if battery support has been enabled before using "default_battery()". 
git-svn-id: http://tint2.googlecode.com/svn/trunk@442 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-04-23 17:30:49 +00:00
thilor77
885377a234 cleanup code 
git-svn-id: http://tint2.googlecode.com/svn/trunk@439 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-04-22 15:08:21 +00:00
thilor77
64530181d9 qutodetect composite manager and automaticaly switch real/fake transparency 
git-svn-id: http://tint2.googlecode.com/svn/trunk@425 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-04-18 14:49:50 +00:00
thilor77
7ee42e8ca1 SIGUSR1 does now a full restat of tint2 
git-svn-id: http://tint2.googlecode.com/svn/trunk@424 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-04-18 14:28:45 +00:00
thilor77
c298a39d00 moved initial values in function default_xxx 
git-svn-id: http://tint2.googlecode.com/svn/trunk@423 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-04-18 12:07:36 +00:00
thilor77
24f47c9c24 tint2conf : cleanup and rotate vertical panel snapshot 
git-svn-id: http://tint2.googlecode.com/svn/trunk@408 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-03-31 22:13:24 +00:00
thilor77
5309f43eef some changed in tint2conf theme switcher. not yet ready. 
git-svn-id: http://tint2.googlecode.com/svn/trunk@406 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-03-28 22:50:26 +00:00
thilor77
a26a3e4635 fixed snapshot command (-s). more needed. 
git-svn-id: http://tint2.googlecode.com/svn/trunk@404 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-03-26 23:16:25 +00:00
Andreas.Fink85
788cfce122 *add* allow xrandr names (hopefully works) 
git-svn-id: http://tint2.googlecode.com/svn/trunk@403 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-03-20 08:30:41 +00:00
thilor77
2126b2e47d consistency : drag n drop task between desktop will not change active desktop (as before) 
git-svn-id: http://tint2.googlecode.com/svn/trunk@394 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-02-09 20:19:49 +00:00
Andreas.Fink85
bf1dc33ca7 *add* drag'n'drop task reordering 
*fix* autohide and tooltip after SIGUSR1
*fix* send low_battery_cmd only once
*fix* update clock if time difference > 60 sec (after hibernation or supsension)
*fix* changed transient window behaviour


git-svn-id: http://tint2.googlecode.com/svn/trunk@393 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-02-08 22:44:56 +00:00
Andreas.Fink85
cb5eea1bd3 *fix* issue 217 
git-svn-id: http://tint2.googlecode.com/svn/trunk@391 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-01-31 16:56:54 +00:00
Andreas.Fink85
d70f267780 *fix* maybe issue 212 
git-svn-id: http://tint2.googlecode.com/svn/trunk@385 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-01-30 23:06:07 +00:00
Andreas.Fink85
a22041ce09 *fix* removed warnings 
*fix* removed unneeded code (backwards compatibility to tint2-0.6 and unneccesary XSetWindowsBackground)
*fix* better heuristicMask algorithm



git-svn-id: http://tint2.googlecode.com/svn/trunk@363 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-01-18 21:11:05 +00:00
thilor77
9b036efc5c cleanup 
git-svn-id: http://tint2.googlecode.com/svn/trunk@361 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
 2010-01-18 10:05:05 +00:00