Commit: 2301e609a3ff3438778f1032bbe2d3f5f6d27e57 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Révision: 2301e609a3ff3438778f1032bbe2d3f5f6d27e57 (tree)
• l'heure: 2003-10-26 21:39:09
• Auteur: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Message de Log

Brown bag release 0.92.1

Change Summary

• modified: ChangeLog
• modified: NEWS
• modified: app/app_procs.c
• modified: config.h.win32
• modified: configure.in
• modified: dia.spec
• modified: doc/en/dia-manual.xml
• modified: doc/pl/dia-manual.sgml
• modified: lib/dynamic_obj.c

Modification

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* doc/en/dia-manual.xml: 
+	* doc/pl/dia-manual.sgml: 
+	* dia.spec: 
+	* config.h.win32: 
+	* configure.in: 
+	* NEWS: Brown Bag release 0.92.1
+
+	* lib/dynamic_obj.c: Fixed embarassing dynamic object removal bug.
+
[phone]  Lars Clausen  <[e-mail]>
+
+	* app/app_procs.c (app_init): Rearrangement for translators.
+
 2003-10-24  Steffen Macke <[e-mail]>
 
 	* lib/text.c(text_key_event): enforcing the inserted text length now,

--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+dia-0.92.1: 26-Oct-2003
+
+* Brown Bag release.  Fixes crashbug in the "Analog Clock" symbol, and bug
+  with pasting multiple lines of text.
+
 dia-0.92: 19-Oct-2003
 
 * Like pre7, but with some updated translations and documentation.  Now

--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -279,20 +279,24 @@ myXmlErrorReporting (void *ctx, const char* msg, ...)
 #endif
 
 #ifdef HAVE_FREETYPE
+/* Translators:  This is an option, not to be translated */
 #define EPS_PANGO "eps-pango, "
 #else
 #define EPS_PANGO ""
 #endif
 
 #ifdef G_OS_WIN32
+/* Translators:  This is an option, not to be translated */
 #define WMF "wmf, "
 #else
 #define WMF ""
 #endif
 
 #if defined(HAVE_LIBPNG) && defined(HAVE_LIBART)
+/* Translators:  This is an option, not to be translated */
 #define BITMAPS "png, "
 #else
+/* Translators:  This is an option, not to be translated */
 #define BITMAPS "bmp, gif, jpg, png, pnm, ras, tif, "
 #endif
 
@@ -314,16 +318,20 @@ app_init (int argc, char **argv)
   int rc = 0;
 #endif  
   poptContext poptCtx = NULL;
+  gchar *export_format_string = 
+     /* Translators:  The argument is a list of options, not to be translated */
+    g_strdup_printf(_("Export to file format and exit.  Supported formats are: %s"),
+		    "cgm, dia, dxf, eps, " EPS_PANGO
+		    "fig, mp, plt, hpgl, " BITMAPS
+		    "shape, svg, tex, " WMF
+		    "wpg");
+
   struct poptOption options[] =
   {
     {"export", 'e', POPT_ARG_STRING, NULL /* &export_file_name */, 0,
      N_("Export loaded file and exit"), N_("OUTPUT")},
     {"export-to-format",'t', POPT_ARG_STRING, NULL /* &export_file_format */,
-     0, N_("Export to file format and exit.  Supported formats are: "
-	   "cgm, dia, dxf, eps, " EPS_PANGO
-	   "fig, mp, plt, hpgl, " BITMAPS
-	   "shape, svg, tex, " WMF
-	   "wpg"), N_("FORMAT")
+     0, export_format_string, N_("FORMAT")
     },
     {"nosplash", 'n', POPT_ARG_NONE, &nosplash, 0,
      N_("Don't show the splash screen"), NULL },

--- a/config.h.win32
+++ b/config.h.win32
@@ -14,7 +14,7 @@
 #define GETTEXT_PACKAGE "dia"
 #define LOCALEDIR "../lib/locale"
 
-#define VERSION "0.92"
+#define VERSION "0.92.1"
 
 /*
  * 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.92, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
+AC_INIT(dia, 0.92.1, 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/dia.spec
+++ b/dia.spec
@@ -1,9 +1,11 @@
 %define name dia
-%define ver 0.92
+# This is the full Dia version
+%define ver 0.92.1
 
 Summary: A gtk+ based diagram creation program.
 Name: %name
 Version: %ver
+# This indicates changes to the spec file after last time %ver has changed.
 Release: 1
 Copyright: GPL
 Group: Applications/

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

--- a/doc/pl/dia-manual.sgml
+++ b/doc/pl/dia-manual.sgml
@@ -1,5 +1,5 @@
 <!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook V4.1//EN"[
-<!ENTITY VERSION "0.92">
+<!ENTITY VERSION "0.92.1">
 <!ENTITY INTRODUCTION SYSTEM "intro.sgml">
 <!ENTITY QUICKSTART SYSTEM "usage-quickstart.sgml">
 <!ENTITY CANVAS SYSTEM "usage-canvas.sgml">

--- a/lib/dynamic_obj.c
+++ b/lib/dynamic_obj.c
@@ -51,8 +51,12 @@ void dynobj_list_remove_object(Object* obj) {
 
     if (item) {
         DynobjRec* dor = item->data;
-        dyn_obj_list = g_list_remove(dyn_obj_list,item);
+	printf("Removing obj %p from list of len %d\n",
+	       obj, g_list_length(dyn_obj_list));
+        dyn_obj_list = g_list_remove(dyn_obj_list,dor);
         g_free(dor);
+    } else {
+      printf("Dying object %p not found\n", obj);
     }
 }