Sophie

Sophie

distrib > * > 2008.0 > x86_64 > by-pkgid > 53955843e81b1f369ad60b94ae20b253 > files > 5

xedit-1.0.2-7mdv2008.0.src.rpm

--- xedit-1.0.2.orig/commands.c	2005-01-02 23:06:35.000000000 -0200
+++ xedit-1.0.2/commands.c	2007-09-05 11:41:25.000000000 -0300
@@ -358,6 +358,9 @@
 			       (XtPointer)item);
 	      item->source = scratch =
 		  XtVaCreateWidget("textSource",
+#ifdef INCLUDE_XPRINT_SUPPORT
+				   !international ? asciiSrcObjectClass :
+#endif
 				   multiSrcObjectClass,
 				   topwindow,
 				   XtNtype, XawAsciiFile,
@@ -496,6 +499,9 @@
 	}
 
 	source = XtVaCreateWidget("textSource",
+#ifndef INCLUDE_XPRINT_SUPPORT
+				  !international ? asciiSrcObjectClass :
+#endif
 				  multiSrcObjectClass,
 				  topwindow,
 				  XtNtype, XawAsciiFile,
     block.firstPos = 0;
     block.format = FMT8BIT;
     block.ptr = einfo.command;
--- xedit-1.0.2.orig/xedit.c	2005-10-21 06:18:25.000000000 -0200
+++ xedit-1.0.2/xedit.c	2007-09-05 11:39:15.000000000 -0300
@@ -73,6 +73,9 @@
 Widget topwindow, textwindow, messwidget, labelwindow, filenamewindow;
 Widget scratch, hpane, vpanes[2], labels[3], texts[3], forms[3], positions[3];
 Widget options_popup, dirlabel, dirwindow;
+#ifndef INCLUDE_XPRINT_SUPPORT
+Boolean international;
+#endif
 Boolean line_edit;
 XawTextWrapMode wrapmodes[3];
 
@@ -113,7 +116,9 @@
 #undef Offset
 
 String fallback_resources[] = {
+#ifndef INCLUDE_XPRINT_SUPPORT
     "*international:     True", /* set this globally for ALL widgets to avoid wiered crashes */
+#endif
     NULL
 };
 
@@ -247,7 +252,11 @@
 		  XtSetArg(args[num_args], XtNstring, NULL);	num_args++;
 	      }
 	      source = XtVaCreateWidget("textSource",
-					multiSrcObjectClass, topwindow,
+#ifndef INCLUDE_XPRINT_SUPPORT
+					!international ? asciiSrcObjectClass :
+#endif
+					multiSrcObjectClass,
+					topwindow,
 					XtNtype, XawAsciiFile,
 					XtNeditType, XawtextEdit,
 					NULL, NULL);
@@ -354,11 +363,23 @@
     XtSetArg(arglist[num_args], XtNeditType, XawtextEdit);		++num_args;
     textwindow =  XtCreateManagedWidget(editWindow, asciiTextWidgetClass,
 					vpanes[0], arglist, num_args);
+     num_args = 0;
+
+#ifndef INCLUDE_XPRINT_SUPPORT
+    XtSetArg(arglist[num_args], XtNinternational, &international);  
+    ++num_args;
+    XtGetValues(textwindow, arglist, num_args);
     num_args = 0;
+#endif
+
     XtSetArg(arglist[num_args], XtNtype, XawAsciiFile);			++num_args;
     XtSetArg(arglist[num_args], XtNeditType, XawtextEdit);		++num_args;
     scratch = XtVaCreateWidget("textSource",
-			       multiSrcObjectClass, topwindow,
+#ifndef INCLUDE_XPRINT_SUPPORT
+			       !international ? asciiSrcObjectClass :
+#endif
+			       multiSrcObjectClass,
+			       topwindow,
 			       XtNtype, XawAsciiFile,
 			       XtNeditType, XawtextEdit,
 			       NULL, NULL);
--- xedit-1.0.2.orig/xedit.h	2005-10-20 16:24:27.000000000 -0200
+++ xedit-1.0.2/xedit.h	2007-09-05 11:23:00.000000000 -0300
@@ -100,6 +100,9 @@
 
 extern Widget topwindow, textwindow, labelwindow, filenamewindow, messwidget;
 extern Widget dirlabel, dirwindow;
+#ifndef INCLUDE_XPRINT_SUPPORT
+extern Boolean international;
+#endif
 extern Boolean line_edit;
 
 /*	externals in xedit.c 	*/
--- xedit-1.0.2.orig/Xedit-noxprint.ad	2004-09-02 05:40:32.000000000 -0300
+++ xedit-1.0.2/Xedit-noxprint.ad	2007-09-05 11:44:23.000000000 -0300
@@ -5,7 +5,7 @@
 *enableBackups:				True
 *backupNameSuffix:			~
 *changedBitmap:				xlogo11
-*international:                         True
+*international:                   False
 
 *hints:\
 Use Control-S and Control-R to Search.\n\
--- xedit-1.0.2.orig/hook.c	2004-12-03 22:43:13.000000000 -0200
+++ xedit-1.0.2/hook.c	2007-09-05 12:01:40.000000000 -0300
@@ -388,7 +388,13 @@
 {
     XawTextBlock block;
 
-    if (True) {
+    if (
+#ifdef INCLUDE_XPRINT_SUPPORT
+	True
+#else
+	international
+#endif
+	) {
 	/* XXX FIXME */
         fprintf(stderr, "LineEditAction: Not working in international mode.\n");
 	return;