[KBear-cvs] kbear/kbear/plugins/dirsynchplugin Makefile.am,1.2,1.3 dirsynchlocaldirlister.cpp,1.2,1.3 kbeardirsynchpluginui.rc,1.1,1.2

[<kb...@us...>]

Update of /cvsroot/kbear/kbear/kbear/plugins/dirsynchplugin
In directory sc8-pr-cvs1:/tmp/cvs-serv3212/kbear/plugins/dirsynchplugin

Modified Files:
	Makefile.am dirsynchlocaldirlister.cpp 
	kbeardirsynchpluginui.rc 
Log Message:


Index: Makefile.am
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/dirsynchplugin/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	28 Aug 2003 20:53:00 -0000	1.2
--- Makefile.am	17 Nov 2003 13:48:14 -0000	1.3
***************
*** 10,16 ****
  kbeardirsynchplugin_DATA = kbeardirsynchplugin.desktop
  kbeardirsynchpluginrc_DATA = kbeardirsynchpluginui.rc
! kbeardirsynchpluginrcdir = $(kde_datadir)/kbear
  AM_CFLAGS =
! AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -UQT_NO_COMPAT -DQT_NO_ASCII_CAST
  AM_FFLAGS = 
  SUBDIRS =  
--- 10,16 ----
  kbeardirsynchplugin_DATA = kbeardirsynchplugin.desktop
  kbeardirsynchpluginrc_DATA = kbeardirsynchpluginui.rc
! kbeardirsynchpluginrcdir = $(kde_datadir)/kbeardirsynchplugin
  AM_CFLAGS =
! AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -UQT_NO_COMPAT -DQT_NO_ASCII_CAST -D_LARGEFILE64_SOURCE
  AM_FFLAGS = 
  SUBDIRS =  

Index: dirsynchlocaldirlister.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/dirsynchplugin/dirsynchlocaldirlister.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dirsynchlocaldirlister.cpp	30 Aug 2003 21:41:01 -0000	1.2
--- dirsynchlocaldirlister.cpp	17 Nov 2003 13:48:14 -0000	1.3
***************
*** 22,25 ****
--- 22,28 ----
  //////////////////////////////////////////////////////////////////////
  // System specific include files
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
  //////////////////////////////////////////////////////////////////////
  // Application specific include files

Index: kbeardirsynchpluginui.rc
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/dirsynchplugin/kbeardirsynchpluginui.rc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kbeardirsynchpluginui.rc	27 Aug 2003 20:01:28 -0000	1.1
--- kbeardirsynchpluginui.rc	17 Nov 2003 13:48:14 -0000	1.2
***************
*** 2,7 ****
  <kpartgui library="libkbeardirsynchplugin" name="KBearDirSynchPlugin" version="3" >
  <MenuBar>
! 	<Menu noMerge="1" name="synch">
! 		<text>S&amp;ynchronize</text>
  		<Action name="synch_current" />
  		<Action name="synch_from_local"/>
--- 2,7 ----
  <kpartgui library="libkbeardirsynchplugin" name="KBearDirSynchPlugin" version="3" >
  <MenuBar>
! 	<Menu noMerge="1" name="tools">
! 		<text>&amp;Tools</text>
  		<Action name="synch_current" />
  		<Action name="synch_from_local"/>
***************
*** 9,12 ****
--- 9,14 ----
  		<Action name="synch_selected_from_local"/>
  		<Action name="synch_selected_from_remote"/>
+ 		<Separator/>
+ 		<Merge/>
  	</Menu>
  </MenuBar>