[XFCE4 CVS] minor updates

[Xavier MAILLARD]

Hi,

What the f*** hell is this ?

I had merge conflicts during my commit but I correct them then I commit
it again.

My fault. I'm about to fix it :)

zeDek

Jasper Huijsmans <jasper at moongroup.com> disait récemment que :


> zeDek, you probably know, but you forgot to remove the old
> clock_type_changed function and there are some strange version control
> tokens in the code. (like <<<<<<<<<<<<<<)
>
> Removing this makes it work nicely though. I'll let you update CVS.
>
> 	Jasper
>
> zeDek
> On 18 Sep 2002 15:39:04 +0200
> Olivier Fourdan <fourdan at xfce.org> wrote:
>
>> Xavier,
>> 
>> FYI, it does not build (at least here) :
>> 
>> gcc -DHAVE_CONFIG_H -I. -I. -I..    -g -O2  -I/usr/X11R6/include     
>> -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
>> -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include
>> -I/usr/include/atk-1.0-I/usr/include/pango-1.0 -I/usr/X11R6/include
>> -I/usr/include/freetype2-I/usr/include/libxml2  
>> -DG_DISABLE_DEPRECATED
>> -DGTK_DISABLE_DEPRECATED-DDATADIR=\"/usr/share/xfce4\"
>> -DSYSCONFDIR=\"/usr/etc\"-DVERSION=\"020918\" -g -O2 -c -o
>> xfce4-builtins.o `test -f 'builtins.c'
>> || echo './'`builtins.c
>> builtins.c: In function `clock_type_changed':
>> builtins.c:253: structure has no member named `type'
>> builtins.c:254: structure has no member named `type'
>> builtins.c: At top level:
>> builtins.c:273: redefinition of `clock_type_changed'
>> builtins.c:252: `clock_type_changed' previously defined here
>> builtins.c:416: parse error before '<<' token
>> make[2]: *** [xfce4-builtins.o] Error 1
>> make[2]: Leaving directory `/extra/src/xfce-devel/xfce4/panel'
>> make[1]: *** [all-recursive] Error 1
>> make[1]: Leaving directory `/extra/src/xfce-devel/xfce4'
>> make: *** [all] Error 2
>> 
>> Cheers,
>> Olivier.
>> 
>> On Wed, 2002-09-18 at 14:59, Xavier MAILLARD wrote:
>> > 
>> > Hi,
>> > 
>> > As promised, configuration is now handled for the clock module.
>> > 
>> > We can now store/read the xfce4rc file to get the clock module
>> > configuration and we can in the configuration dialog apply/revert
>> > changes. 
>> > 
>> > Note that the write_config/read_config are only done once a panel
>> > session. Actually the read process is done at init time and the
>> > write_config is done when exiting the panel. This may change in not
>> > so far future. Don't report any bugs due to a no-write/read process
>> > "on the fly" whenever you quit the clock configuration dialog. 
>> > 
>> > The bugs related to display problem have not been succesfully
>> > fixed/tested for me (yet) so I prefer not to commit the things. 
>> > A beginning of a solution may have been found thanks to jasper but I
>> > didn't get time to try/apply it.
>> > 
>> > Please report any problem related to clock configuration either in
>> > the ML (prefered way) or directly to me. Another way to contact me
>> > or any member of the xfce core team is IRC (irc.openprojects.net
>> > #xfce). 
>> > 
>> > Enjoy !
>> > 
>> > Cheers,
>> > 
>> > zeDek
>> -- 
>> Olivier               <fourdan at xfce.org>           
>> http://www.xfce.org
>> ---------------------------------------------------------------------
>> -- XFce is a lightweight  desktop  environment  for  various *NIX
>> systems. Designed for productivity,  it loads  and  executes 
>> applications fast, while conserving  system resources. XFce is all
>> free software, released under GNU General Public License.    Available
>> from http://www.xfce.org
>> 
>> _______________________________________________
>> Xfce4-dev mailing list
>> Xfce4-dev at moongroup.com
>> http://moongroup.com/mailman/listinfo/xfce4-dev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
URL: <http://mail.xfce.org/pipermail/xfce4-dev/attachments/20020918/4cb28914/attachment.pgp>