update

svn: r2624
2004-01-10 18:05:36 +00:00
parent f9a4cf1ee8
commit 50bd66c3d9
11 changed files with 20 additions and 12 deletions
--- a/6
+++ b/6
@@ -1,3 +1,9 @@
+2004-01-10  Don Allingham  <dallingham@users.sourceforge.net>
+	* src/docgen/OpenOfficeDoc.py: proper handling of center_text
+	* src/docgen/PdfDoc.py: proper handling of center_text
+	* src/plugins/TimeLine.py: switch to using center_text instead of draw_text
+	* src/plugins/AncestorChart2.py: switch to using center_text instead of draw_text
+	
 2004-01-09  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/docgen/OpenOfficeDoc.py: allow disabling of the box shadow

--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -97,7 +97,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SK_CONFIG = @SK_CONFIG@
 STRIP = @STRIP@
-SWIG = @SWIG@
 VERSION = @VERSION@
 VERSIONSTRING = @VERSIONSTRING@
 ZIP = @ZIP@
--- a/src/calendars/Makefile.in
+++ b/src/calendars/Makefile.in
@@ -100,7 +100,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SK_CONFIG = @SK_CONFIG@
 STRIP = @STRIP@
-SWIG = @SWIG@
 VERSION = @VERSION@
 VERSIONSTRING = @VERSIONSTRING@
 ZIP = @ZIP@
--- a/src/data/Makefile.in
+++ b/src/data/Makefile.in
@@ -95,7 +95,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SK_CONFIG = @SK_CONFIG@
 STRIP = @STRIP@
-SWIG = @SWIG@
 VERSION = @VERSION@
 VERSIONSTRING = @VERSIONSTRING@
 ZIP = @ZIP@
--- a/src/data/templates/Makefile.in
+++ b/src/data/templates/Makefile.in
@@ -96,7 +96,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SK_CONFIG = @SK_CONFIG@
 STRIP = @STRIP@
-SWIG = @SWIG@
 VERSION = @VERSION@
 VERSIONSTRING = @VERSIONSTRING@
 ZIP = @ZIP@
--- a/src/docgen/Makefile.in
+++ b/src/docgen/Makefile.in
@@ -99,7 +99,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SK_CONFIG = @SK_CONFIG@
 STRIP = @STRIP@
-SWIG = @SWIG@
 VERSION = @VERSION@
 VERSIONSTRING = @VERSIONSTRING@
 ZIP = @ZIP@
--- a/src/filters/Makefile.in
+++ b/src/filters/Makefile.in
@@ -95,7 +95,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SK_CONFIG = @SK_CONFIG@
 STRIP = @STRIP@
-SWIG = @SWIG@
 VERSION = @VERSION@
 VERSIONSTRING = @VERSIONSTRING@
 ZIP = @ZIP@
--- a/src/grampslib.i
+++ b/src/grampslib.i
@@ -11,12 +11,20 @@ extern const char* gnome_vfs_mime_get_value(const char*,const char*);
 %inline %{
 const char* default_application_name(const char* type) {
 	GnomeVFSMimeApplication *a = gnome_vfs_mime_get_default_application(type);
-	return a->name;
+	if (a) {
+		return a->name;
+	} else {
+		return (char*) NULL;
+	}
 }

 const char* default_application_command(const char* type) {
 	GnomeVFSMimeApplication *a = gnome_vfs_mime_get_default_application(type);
-	return a->command;
+	if (a) {
+		return a->command;
+	} else {
+		return (char*) NULL;
+	}	
 }

 %}
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -96,7 +96,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SK_CONFIG = @SK_CONFIG@
 STRIP = @STRIP@
-SWIG = @SWIG@
 VERSION = @VERSION@
 VERSIONSTRING = @VERSIONSTRING@
 ZIP = @ZIP@
@@ -180,7 +179,9 @@ pkgpython_PYTHON = \
 	SimpleBookTitle.py\
 	CustomBookText.py\
 	RelGraph.py\
-	rel_it.py
+	rel_it.py\
+	rel_hu.py\
+	rel_de.py


 GLADEFILES = \
--- a/src/po/Makefile.in
+++ b/src/po/Makefile.in
@@ -95,7 +95,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SK_CONFIG = @SK_CONFIG@
 STRIP = @STRIP@
-SWIG = @SWIG@
 VERSION = @VERSION@
 VERSIONSTRING = @VERSIONSTRING@
 ZIP = @ZIP@
--- a/src/revision.glade
+++ b/src/revision.glade
@@ -10,7 +10,7 @@
  <property name="title" translatable="yes"></property>
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
+  <property name="modal">True</property>
  <property name="resizable">True</property>
  <property name="destroy_with_parent">False</property>
  <property name="icon">gramps.png</property>