dia r4017 - in trunk: . plug-ins plug-ins/postscript

[hans svn gnome org]

Author: hans
Date: Sun May 11 12:51:39 2008
New Revision: 4017
URL: http://svn.gnome.org/viewvc/dia?rev=4017&view=rev

Log:
2008-05-11  Hans Breuer  <hans breuer org>

	* configure.in plug-ins/Makefile.am plug-ins/postscript/Makefile.am
	  plug-ins/postscript.c : build the plug-in and ...
	



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/plug-ins/Makefile.am
   trunk/plug-ins/postscript/Makefile.am
   trunk/plug-ins/postscript/paginate_psprint.c
   trunk/plug-ins/postscript/postscript.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun May 11 12:51:39 2008
@@ -544,6 +544,7 @@
 plug-ins/hpgl/Makefile
 plug-ins/metapost/Makefile
 plug-ins/pixbuf/Makefile
+plug-ins/postscript/Makefile
 plug-ins/pstricks/Makefile
 plug-ins/pgf/Makefile
 plug-ins/python/Makefile

Modified: trunk/plug-ins/Makefile.am
==============================================================================
--- trunk/plug-ins/Makefile.am	(original)
+++ trunk/plug-ins/Makefile.am	Sun May 11 12:51:39 2008
@@ -1,6 +1,6 @@
 # Remember to also add subdirs in configure.in
 SUBDIRS = cgm cairo pstricks hpgl wpg svg shape dxf python xfig \
-	  wmf metapost xslt pixbuf gprint pgf vdx
+	  wmf metapost xslt pixbuf gprint pgf vdx postscript
 
 EXTRA_DIST = \
 	makefile.msc objects.def

Modified: trunk/plug-ins/postscript/Makefile.am
==============================================================================
--- trunk/plug-ins/postscript/Makefile.am	(original)
+++ trunk/plug-ins/postscript/Makefile.am	Sun May 11 12:51:39 2008
@@ -4,17 +4,17 @@
 freetype_files = 
 endif
 
-plugin_sources = \
+plugin_sources = \
+	postscript.c \
 	diapsrenderer.h \
 	diapsrenderer.c \
 	$(freetype_files) \
-	$(freetype_files) \
 	paginate_psprint.c \
 	paginate_psprint.h \
 	render_eps.c \
 	render_eps.h
 
-pkglib_LTLIBRARIES = libcairo_filter.la
+pkglib_LTLIBRARIES = libpostscript_filter.la
 
 EXTRA_DIST = \
 	win32print.c \
@@ -26,7 +26,7 @@
 
 libpostscript_filter_la_LIBADD =
 if WITH_FREETYPE
-libpostscript_filter_la_LIBADD = $(FREETYPE_LIBS)
+libpostscript_filter_la_LIBADD += $(FREETYPE_LIBS)
 endif
 
 INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(CAIRO_CFLAGS)

Modified: trunk/plug-ins/postscript/paginate_psprint.c
==============================================================================
--- trunk/plug-ins/postscript/paginate_psprint.c	(original)
+++ trunk/plug-ins/postscript/paginate_psprint.c	Sun May 11 12:51:39 2008
@@ -232,7 +232,7 @@
 }
 
 void
-diagram_print_ps(DiagramData *dia)
+diagram_print_ps(DiagramData *dia, const gchar* original_filename)
 {
   GtkWidget *dialog;
   GtkWidget *vbox, *frame, *table, *box, *button;
@@ -349,11 +349,8 @@
   orig_command = printcmd;
 
   /* Work out diagram filename and use this as default .ps file */
-#if 0
-  filename = g_path_get_basename(dia->filename);
-#else
-  filename = "diapsprint.dia";
-#endif
+  filename = g_path_get_basename(original_filename);
+
   printer_filename = g_malloc(strlen(filename) + 4);
   printer_filename = strcpy(printer_filename, filename);
   dot = strrchr(printer_filename, '.');
@@ -439,7 +436,7 @@
 
 	  if (write_file) {
         if (!g_path_is_absolute(filename)) {
-          char *dirname;
+          const char *dirname;
           char *full_filename;
 #if 0
           dirname = g_path_get_dirname(dia->filename);

Modified: trunk/plug-ins/postscript/postscript.c
==============================================================================
--- trunk/plug-ins/postscript/postscript.c	(original)
+++ trunk/plug-ins/postscript/postscript.c	Sun May 11 12:51:39 2008
@@ -39,8 +39,8 @@
 }
 
 static DiaCallbackFilter cb_ps_print = {
-    "FilePrint",
-    N_("Print ..."),
+    "FilePrintPS",
+    N_("Print (PS)"),
     "/DisplayMenu/File/FilePrint",
     print_callback,
     NULL
@@ -79,4 +79,5 @@
   filter_register_callback (&cb_ps_print);
 
   return DIA_PLUGIN_INIT_OK;
-}
\ No newline at end of file
+}
+