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

Disable all code related to libXp

Browse Source 
deprecated and mostly no longer included on current OSes
This commit is contained in:
Peter Howkins
2016-04-20 20:17:22 +01:00
parent b251a15844
commit 2ea057d511
54 changed files with 302 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cde/programs/dtpdmd/Imakefile
View File

@@ -24,8 +24,8 @@ XCOMM
DEFINES = -DCDE_INSTALLATION_TOP='"'$(CDE_INSTALLATION_TOP)'"'
INCLUDES = -I.
DEPLIBS = $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXAUTHLIB) $(DEPXLIB)
LOCAL_LIBRARIES = $(XTOOLLIB) $(XPLIB) $(XAUTHLIB) $(XLIB)
DEPLIBS = $(DEPXTOOLLIB) $(DEPXAUTHLIB) $(DEPXLIB)
LOCAL_LIBRARIES = $(XTOOLLIB) $(XAUTHLIB) $(XLIB)
SYS_LIBRARIES = DtClientSysLibs
SRCS = dispatch.c dtpdmd.c mailbox.c \

4
cde/programs/dtpdmd/dtpdmdP.h
View File

@@ -44,7 +44,9 @@
#include "X11/Xlibint.h"
#include "X11/Intrinsic.h"
#include "X11/Xatom.h"
#if 0 && defined(PRINTING_SUPPORTED)
#include <X11/extensions/Print.h>
#endif /* PRINTING_SUPPORTED */
#include <X11/Xauth.h>
@@ -72,7 +74,9 @@ typedef struct
char *print_display_str; /* Print Server Connection Info */
Window print_window;
#if 0 && defined(PRINTING_SUPPORTED)
XPContext print_context;
#endif /* PRINTING_SUPPORTED */
char *locale_hint;
Display *selection_display; /* Selection & Property Connection */

6
cde/programs/dtpdmd/manager.c
View File

@@ -246,7 +246,9 @@ void mgr_initialize( XEvent *report, XpPdmServiceRec *rec )
rec->video_window = strtol(list[1], (char **)NULL, 16);
rec->print_display_str = xpstrdup( list[2] );
rec->print_window = strtol(list[3], (char **)NULL, 16);
#if 0 && defined(PRINTING_SUPPORTED)
rec->print_context = strtol(list[4], (char **)NULL, 16);
#endif /* PRINTING_SUPPORTED */
rec->locale_hint = xpstrdup( list[5] );
XFreeStringList( list );
@@ -533,6 +535,7 @@ void mgr_fetch_pdm( XpPdmServiceRec *rec )
if ( setjmp( xio_quickie_jmp_buf ) == 0 ) {
XSetIOErrorHandler( xio_quickie_handler );
#if 0 && defined(PRINTING_SUPPORTED)
if ( rec->seldpy_as_printdpy ) {
tptr1 = XpGetOneAttribute( rec->selection_display,
rec->print_context,
@@ -547,6 +550,7 @@ void mgr_fetch_pdm( XpPdmServiceRec *rec )
XCloseDisplay( tdpy );
}
}
#endif /* PRINTING_SUPPORTED */
XSetIOErrorHandler( NULL );
}
@@ -627,9 +631,11 @@ void mgr_fetch_pdm( XpPdmServiceRec *rec )
sprintf( tstr, "0x%lx", rec->print_window );
xp_add_argv( &(rec->pdm_exec_argvs), xpstrdup(tstr) );
#if 0 && defined(PRINTING_SUPPORTED)
xp_add_argv( &(rec->pdm_exec_argvs), xpstrdup("-pcontext") );
sprintf( tstr, "0x%lx", rec->print_context );
xp_add_argv( &(rec->pdm_exec_argvs), xpstrdup(tstr) );
#endif /* PRINTING_SUPPORTED */
}
/********************************************************************