From 825a504a114edb6a3a7e5d8f4b1b4dec6cfbad75 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Fri, 8 Jun 2018 18:28:23 -0600
Subject: [PATCH] XPM: Replace calls to XmeXpm*() with regular Xpm*()

This is no longer needed on modern Motif's.
---
 cde/lib/DtSvc/DtXpm/xpm.c                            | 12 ++++++------
 .../dtinfo/dtinfo/src/Other/WindowSystemMotif.C      |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cde/lib/DtSvc/DtXpm/xpm.c b/cde/lib/DtSvc/DtXpm/xpm.c
index e91d6db0..30bf477d 100644
--- a/cde/lib/DtSvc/DtXpm/xpm.c
+++ b/cde/lib/DtSvc/DtXpm/xpm.c
@@ -49,7 +49,7 @@ int _DtXpmCreatePixmapFromData(Display *display,
 			       Pixmap *shapemask_return,
 			       XpmAttributes *attributes)
 {
-    return XmeXpmCreatePixmapFromData(display, d, data,
+    return XpmCreatePixmapFromData(display, d, data,
 				      pixmap_return, shapemask_return,
 				      attributes);
 }
@@ -61,7 +61,7 @@ int _DtXpmReadFileToPixmap(Display *display,
 			   Pixmap *shapemask_return,
 			   XpmAttributes *attributes)
 {
-    return XmeXpmReadFileToPixmap(display, d, filename,
+    return XpmReadFileToPixmap(display, d, filename,
 				  pixmap_return, shapemask_return,
 				  attributes);
 }
@@ -72,7 +72,7 @@ int _DtXpmWriteFileFromPixmap(Display *display,
 			      Pixmap shapemask,
 			      XpmAttributes *attributes)
 {
-    return XmeXpmWriteFileFromPixmap(display, filename,
+    return XpmWriteFileFromPixmap(display, filename,
 				     pixmap, shapemask,
 				     attributes);
 }
@@ -83,7 +83,7 @@ int _DtXpmReadFileToImage(Display *display,
 			  XImage **shapeimage_return,
 			  XpmAttributes *attributes)
 {
-    return XmeXpmReadFileToImage(display, filename,
+    return XpmReadFileToImage(display, filename,
 				 image_return, shapeimage_return,
 				 attributes);
 }
@@ -94,12 +94,12 @@ int _DtXpmWriteFileFromImage(Display *display,
 			     XImage *shapeimage,
 			     XpmAttributes *attributes)
 {
-    return XmeXpmWriteFileFromImage(display, filename,
+    return XpmWriteFileFromImage(display, filename,
 				    image, shapeimage,
 				    attributes);
 }
 
 void _DtXpmFreeAttributes(XpmAttributes *attributes)
 {
-    XmeXpmFreeAttributes(attributes);
+    XpmFreeAttributes(attributes);
 }
diff --git a/cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C b/cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C
index 7ebbc8d0..92fc8cff 100644
--- a/cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C
+++ b/cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C
@@ -1115,7 +1115,7 @@ WindowSystem::default_pixmap (Dimension *width, Dimension *height)
 	XpmAttributes xpm_attr ;
 	xpm_attr.valuemask = 0 ;
 	
-	XmeXpmCreatePixmapFromData(f_display,
+	XpmCreatePixmapFromData(f_display,
 					    XtWindow((Widget)toplevel()),
 					    (char**)graphic_unavailable_data,
 					    &temp_pixmap,
@@ -1175,7 +1175,7 @@ WindowSystem::detached_pixmap(Dimension *width, Dimension *height)
       XpmAttributes xpm_attr;
       xpm_attr.valuemask = 0 ;
 
-      int status = XmeXpmCreatePixmapFromData(f_display,
+      int status = XpmCreatePixmapFromData(f_display,
 					   XtWindow((Widget)toplevel()),
 					   (char**)detached_pixmap_data,
 					   &f_detached_pixmap,
@@ -1217,7 +1217,7 @@ WindowSystem::read_pixmap(const char *pname,
   status = xpm_lib().ReadFileToPixmap (f_display, XtWindow ((Widget)toplevel()),
 				fname, &pixmap, NULL, &xpm_attributes);
 #else
-  status = XmeXpmReadFileToPixmap (f_display, XtWindow ((Widget)toplevel()),
+  status = XpmReadFileToPixmap (f_display, XtWindow ((Widget)toplevel()),
 				fname, &pixmap, NULL, &xpm_attributes);
 #endif
 
-- 
2.25.1