Commit: 8ce7087364e8145f6b418767e58e9385376ee350 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: 8ce7087364e8145f6b418767e58e9385376ee350 (tree)
• Time: 2007-02-27 06:58:02
• Author: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Prerelease 5

svn path=/trunk/; revision=3625

Change Summary

• modified: ChangeLog
• modified: NEWS
• modified: app/paginate_psprint.c
• modified: config.h.win32
• modified: configure.in
• modified: doc/en/dia.xml
• modified: doc/eu/dia.xml
• modified: doc/pl/dia.xml

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* NEWS: 
+	* RELEASE-PROCESS: 
+	* config.h.win32: 
+	* doc/en/dia.xml: 
+	* doc/pl/dia.xml: 
+	* doc/eu/dia.xml:
+	* configure.in: Pre5
+
 2007-02-25  Gabor Kelemen  <[e-mail]>
 
 	* installer/win32/locale/hungarian.nsh: 

--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+dia-0.96-pre5: 26-Feb-2007
+
+  * Fifth prerelease for 0.96.  A fix of a number of text-related crash
+    bugs has come in, and several Python fixes, including a Doxygen import
+    filter.  
+
 dia-0.96-pre4: 5-Feb-2007
 
   * Fourth prerelease for 0.96.  This one has yet another new version of

--- a/app/paginate_psprint.c
+++ b/app/paginate_psprint.c
@@ -23,6 +23,8 @@
 #include <config.h>
 #endif
 
+/* so we get popen and sigaction even when compiling with -ansi */
+#define _POSIX_C_SOURCE 2
 #include <stdio.h>
 #include <string.h> /* strlen */
 #include <signal.h>
@@ -252,7 +254,7 @@ diagram_print_ps(Diagram *dia)
    * needed anymore because the pipe handling - which never worked on win32
    * anyway - is replace by "native" postscript printing now ...
    */
-  void *old_action;
+  struct sigaction old_sigpipe_action, sigpipe_action;
 #endif
 
   /* create the dialog */
@@ -470,7 +472,9 @@ diagram_print_ps(Diagram *dia)
 #ifndef G_OS_WIN32
   /* set up a SIGPIPE handler to catch IO errors, rather than segfaulting */
   sigpipe_received = FALSE;
-  old_action = signal(SIGPIPE, pipe_handler);
+  memset(&sigpipe_action, 0, sizeof(struct sigaction));
+  sigpipe_action.sa_handler = pipe_handler;
+  sigaction(SIGPIPE, &sigpipe_action, &old_sigpipe_action);
 #endif
 
   paginate_psprint(dia, file);
@@ -486,7 +490,7 @@ diagram_print_ps(Diagram *dia)
 
 #ifndef G_OS_WIN32
   /* restore original behaviour */
-  signal(SIGPIPE, old_action);
+  sigaction(SIGPIPE, &old_sigpipe_action, NULL);
 #endif
   if (sigpipe_received)
     message_error(_("Printing error: command '%s' caused sigpipe."),

--- a/config.h.win32
+++ b/config.h.win32
@@ -18,7 +18,7 @@
 #undef LOCALEDIR /* needs to be calculated at runtime */
 /* NOT: #define LOCALEDIR "../lib/locale" */
 
-#define VERSION "0.96-pre4"
+#define VERSION "0.96-pre5"
 
 /*
  * We are linking libxml as DLL with either msvc or mingw, but this

--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this -*- autoconf -*- file with autoconf to produce a 
 dnl configure script.
-AC_INIT(dia, 0.96-pre4, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
+AC_INIT(dia, 0.96-pre5, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
 AC_CONFIG_SRCDIR(app/diagram.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 

--- a/doc/en/dia.xml
+++ b/doc/en/dia.xml
@@ -8,7 +8,7 @@
 
   [
 
-    <!ENTITY VERSION "0.96-pre4">
+    <!ENTITY VERSION "0.96-pre5">
 
     <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 

--- a/doc/eu/dia.xml
+++ b/doc/eu/dia.xml
@@ -4,7 +4,7 @@
 
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd" [
 
-    <!ENTITY VERSION "0.96-pre4">
+    <!ENTITY VERSION "0.96-pre5">
 
     <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 

--- a/doc/pl/dia.xml
+++ b/doc/pl/dia.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd"[
-<!ENTITY VERSION "0.96-pre4">
+<!ENTITY VERSION "0.96-pre5">
 <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 <!ENTITY QUICKSTART SYSTEM "usage-quickstart.xml">
 <!ENTITY CANVAS SYSTEM "usage-canvas.xml">