debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtfile: Add missing prototypes

Browse Source 
Add missing prototypes and header files to the dtfile
code in order to move closer towards 64-bit compatibility.

Extract the following functions from Motif internal headers:

_XmGetWidgetExtData
_XmRecordEvent
_XmStringUngenerate
_XmTextFieldSetDestination
_XmGetActiveTopLevelMenu

Extract manually prototypes of the obsolete Motif interface:
_XmHighlightBorder
_XmUnhighlightBorder

Remove XmPrivate.h if extractprototype.awk fails

Make the following header files available via -I:
	codelibs/boolean.h
	codelibs/pathutils.h
	codelibs/shellutils.h
and remove shellutils.h from dtwm directory.
This commit is contained in:
Marcin Cieslak
2012-09-18 04:02:28 +02:00
committed by Jon Trulson
parent f55dfc34c0
commit 1079b56422
43 changed files with 240 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cde/programs/dtfile/Trash.c
View File

@@ -131,6 +131,8 @@
#include <Dt/EnvControlP.h>
#include <Dt/Wsm.h>
#include <Dt/Dnd.h>
#include <Dt/SharedProcs.h>
#include "DtSvcInternal.h" /* _DtGetMask */
#include <Tt/tttk.h>
@@ -142,6 +144,7 @@
#include "Desktop.h"
#include "Main.h"
#include "SharedMsgs.h"
#include "dtcopy/fsrtns.h"
#define AdditionalHeader (GETMESSAGE(27,98, "(Plus %d additional object(s))"))
@@ -244,6 +247,12 @@ Widget trashShell;
DialogData * primaryTrashHelpDialog = NULL;
DialogData ** secondaryTrashHelpDialogList = NULL;
int secondaryTrashHelpDialogCount = 0;
/* Forward prototype */
int EraseDir(char *dir_name);
/* From dtcopy/fsrtns.c */
extern int EmptyDir(char *sourceP, int rm, int force);
/* 'defines' for trash files */
static char * TRASH_DIR = ".dt/Trash";
static char * TRASH_INFO_FILE = ".dt/Trash/.trashinfo";
@@ -1212,7 +1221,7 @@ TrashEmpty(void)
Select_All(*selectAllBtn, NULL, NULL);
Remove(*removeBtn, NULL, NULL);
*/
EmptyDir(trashFileMgrData->current_directory,0);
EmptyDir(trashFileMgrData->current_directory,0,0);
}
}
@@ -4330,7 +4339,7 @@ RestoreVerifyOk(
if(lstat(dirs[1],&s1) < 0)
goto goback;
fsErase(dirs[1],&status);
fsErase(dirs[1],&status,0);
FileList = (char **) XtMalloc(sizeof(char *));
FileList[0] = XtNewString(dirs[0]);
RestoreFromTrash(FileList, (int) 1, NULL, NULL, NULL,True);