dia r4092 - in trunk: . doc/en doc/eu doc/fr doc/pl lib objects objects/AADL objects/Database objects/ER objects/FS objects/GRAFCET objects/Istar objects/Jackson objects/KAOS objects/Misc objects/SADT objects/SISSI objects/UML objects/bondgraph objects/chronogram objects/custom objects/custom_lines objects/flowchart objects/network objects/standard objects/sybase plug-ins/cgm plug-ins/dxf plug-ins/hpgl plug-ins/metapost plug-ins/pgf plug-ins/pstricks plug-ins/python plug-ins/shape plug-ins/svg plug-ins/wmf plug-ins/wpg po

From: hans svn gnome org
To: svn-commits-list gnome org
Subject: dia r4092 - in trunk: . doc/en doc/eu doc/fr doc/pl lib objects objects/AADL objects/Database objects/ER objects/FS objects/GRAFCET objects/Istar objects/Jackson objects/KAOS objects/Misc objects/SADT objects/SISSI objects/UML objects/bondgraph objects/chronogram objects/custom objects/custom_lines objects/flowchart objects/network objects/standard objects/sybase plug-ins/cgm plug-ins/dxf plug-ins/hpgl plug-ins/metapost plug-ins/pgf plug-ins/pstricks plug-ins/python plug-ins/shape plug-ins/svg plug-ins/wmf plug-ins/wpg po
Date: Sat, 19 Jul 2008 17:52:19 +0000 (UTC)
Author: hans
Date: Sat Jul 19 17:52:19 2008
New Revision: 4092
URL: http://svn.gnome.org/viewvc/dia?rev=4092&view=rev

Log:
2008-07-19  Hans Breuer  <hans breuer org>

	* configure.in : when building debug also define GTK_DISABLE_DEPRECATED

	* lib/prop_inttypes.c : removed #undef GTK_DISABLE_DEPRECATED

	* objects/UML/Makefile.am : use $(DEBUG_FLAGS)
	* objects/UML/class.[ch] objects/UML/class_dialog.c : moved some stuff
	to restrict the #undef GTK_DISABLE_DEPRECATED to class_dialog.c

	* objects/bondgraph/* : removed, it was empty from the beginning
	* objects/sybase/* : removed, unused since 2002
	* objects/Makefile.am configure.in po/POTFILES.in : adapted

	* objects/chronogram/Makefile.am objects/ER/Makefile.am
	  objects/flowchart/Makefile.am objects/GRAFCET/Makefile.am 
	  objects/Istar/Makefile.am  objects/Jackson/Makefile.am 
	  objects/KAOS/Makefile.am objects/network/Makefile.am 
	  objects/SADT/Makefile.am : add $(DEBUG_FLAGS)

	* objects/custom/Makefile.am : add $(DEBUG_FLAGS)
	* objects/custom/custom_object.c objects/custom/shape_info.c
	  objects/custom/shape_typeinfo.c : warningectomy 

	* objects/Database/Makefile.am : use $(DEBUG_FLAGS)
	* objects/Database/table.[ch] objects/Database/table_dialog.c : moved 
	some stuff to restrict the #undef GTK_DISABLE_DEPRECATED to 
	table_dialog.c

	* objects/FS/flow-ortho.c : warningectomy 

	* objects/SISSI/Makefile.am : add $(DEBUG_FLAGS)
	* objects/SISSI/sissi_dialog.c : #undef GTK_DISABLE_DEPRECATED

	* objects/standard/Makefile.am : add $(DEBUG_FLAGS)
	* objects/standard/outline.c : warningectomy

	* plug-ins/*/Makefile.am : propagate $(DEBUG_FLAGS)

	* doc/*/Makefile.am : add html.xsl to EXTRA_DIST




Removed:
   trunk/objects/bondgraph/
   trunk/objects/sybase/
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/doc/en/Makefile.am
   trunk/doc/eu/Makefile.am
   trunk/doc/fr/Makefile.am
   trunk/doc/pl/Makefile.am
   trunk/lib/prop_inttypes.c
   trunk/objects/AADL/Makefile.am
   trunk/objects/Database/Makefile.am
   trunk/objects/Database/database.h
   trunk/objects/Database/table.c
   trunk/objects/Database/table_dialog.c
   trunk/objects/ER/Makefile.am
   trunk/objects/FS/Makefile.am
   trunk/objects/FS/flow-ortho.c
   trunk/objects/GRAFCET/Makefile.am
   trunk/objects/Istar/Makefile.am
   trunk/objects/Jackson/Makefile.am
   trunk/objects/KAOS/Makefile.am
   trunk/objects/Makefile.am
   trunk/objects/Misc/Makefile.am
   trunk/objects/SADT/Makefile.am
   trunk/objects/SISSI/Makefile.am
   trunk/objects/SISSI/sissi_dialog.c
   trunk/objects/UML/Makefile.am
   trunk/objects/UML/class.c
   trunk/objects/UML/class.h
   trunk/objects/UML/class_dialog.c
   trunk/objects/chronogram/Makefile.am
   trunk/objects/custom/Makefile.am
   trunk/objects/custom/custom_object.c
   trunk/objects/custom/shape_info.c
   trunk/objects/custom/shape_typeinfo.c
   trunk/objects/custom_lines/Makefile.am
   trunk/objects/flowchart/Makefile.am
   trunk/objects/network/Makefile.am
   trunk/objects/standard/Makefile.am
   trunk/objects/standard/outline.c
   trunk/plug-ins/cgm/Makefile.am
   trunk/plug-ins/dxf/Makefile.am
   trunk/plug-ins/hpgl/Makefile.am
   trunk/plug-ins/metapost/Makefile.am
   trunk/plug-ins/pgf/Makefile.am
   trunk/plug-ins/pstricks/Makefile.am
   trunk/plug-ins/python/Makefile.am
   trunk/plug-ins/shape/Makefile.am
   trunk/plug-ins/svg/Makefile.am
   trunk/plug-ins/wmf/Makefile.am
   trunk/plug-ins/wpg/Makefile.am
   trunk/po/POTFILES.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Jul 19 17:52:19 2008
@@ -249,7 +249,7 @@
   enable_debug=minimum)
 
 if test "x$enable_debug" = "xyes"; then
-  DEBUG_FLAGS="-g -DENABLE_DEBUG"
+  DEBUG_FLAGS="-g -DENABLE_DEBUG -DGTK_DISABLE_DEPRECATED"
 else
   if test "x$enable_debug" = "xno"; then
     DEBUG_FLAGS=""
@@ -525,9 +525,7 @@
 lib/pixmaps/Makefile
 po/Makefile.in
 objects/Makefile
-dnl objects/sybase/Makefile
 objects/AADL/Makefile
-objects/bondgraph/Makefile
 objects/chronogram/Makefile
 objects/custom/Makefile
 objects/custom_lines/Makefile

Modified: trunk/doc/en/Makefile.am
==============================================================================
--- trunk/doc/en/Makefile.am	(original)
+++ trunk/doc/en/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -47,7 +47,8 @@
 
 EXTRA_DIST += \
 	dia.dbk \
-	dia-1.xml
+	dia-1.xml \
+	html.xsl
 
 ##	graphics/line_props.png \
 ##	graphics/home_network.png \

Modified: trunk/doc/eu/Makefile.am
==============================================================================
--- trunk/doc/eu/Makefile.am	(original)
+++ trunk/doc/eu/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -47,7 +47,8 @@
 
 EXTRA_DIST += \
 	dia.dbk \
-	dia-1.xml
+	dia-1.xml \
+	html.xsl
 
 ##	graphics/line_props.png \
 ##	graphics/home_network.png \

Modified: trunk/doc/fr/Makefile.am
==============================================================================
--- trunk/doc/fr/Makefile.am	(original)
+++ trunk/doc/fr/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -51,7 +51,8 @@
 	graphics/line_icon.png \
 	graphics/greendots.png \
 	graphics/preferences_fig.png \
-	graphics/color_selector.png
+	graphics/color_selector.png \
+	html.xsl
 
 
 pngfigures = \

Modified: trunk/doc/pl/Makefile.am
==============================================================================
--- trunk/doc/pl/Makefile.am	(original)
+++ trunk/doc/pl/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -45,7 +45,8 @@
 ##	dia-1.xml
 
 
-EXTRA_DIST +=
+EXTRA_DIST += \
+	html.xsl
 
 ##	dia.dbk \
 ##	dia-1.xml

Modified: trunk/lib/prop_inttypes.c
==============================================================================
--- trunk/lib/prop_inttypes.c	(original)
+++ trunk/lib/prop_inttypes.c	Sat Jul 19 17:52:19 2008
@@ -29,7 +29,6 @@
 
 #include <stdlib.h> /* strtol */
 
-#undef GTK_DISABLE_DEPRECATED /* gtk_option_menu_new */
 #include <gtk/gtk.h>
 #define WIDGET GtkWidget
 #include "properties.h"

Modified: trunk/objects/AADL/Makefile.am
==============================================================================
--- trunk/objects/AADL/Makefile.am	(original)
+++ trunk/objects/AADL/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -23,7 +23,8 @@
 
 libaadl_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+	$(DEBUG_FLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST =   pixmaps/aadlbus.xpm                \
                pixmaps/aadldata.xpm		  \

Modified: trunk/objects/Database/Makefile.am
==============================================================================
--- trunk/objects/Database/Makefile.am	(original)
+++ trunk/objects/Database/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -11,7 +11,8 @@
 
 libdb_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+	$(DEBUG_FLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
 	pixmaps/table.xpm \

Modified: trunk/objects/Database/database.h
==============================================================================
--- trunk/objects/Database/database.h	(original)
+++ trunk/objects/Database/database.h	Sat Jul 19 17:52:19 2008
@@ -88,6 +88,8 @@
   TablePropDialog * prop_dialog;
 };
 
+void table_dialog_free (TablePropDialog *dialog);
+
 struct _TableAttribute {
   gchar * name; /* column name */
   gchar * type; /* the type of the values in this column */
@@ -132,49 +134,6 @@
   TableState * saved_state;
 };
 
-struct _TablePropDialog {
-  GtkWidget * dialog;
-
-  /* general page */
-
-  GtkEntry * table_name;
-  GtkTextView * table_comment;
-  GtkToggleButton * comment_visible;
-  GtkToggleButton * comment_tagging;
-  GtkToggleButton * underline_primary_key;
-  GtkToggleButton * bold_primary_key;
-
-  DiaColorSelector * text_color;
-  DiaColorSelector * line_color;
-  DiaColorSelector * fill_color;
-
-  DiaFontSelector *normal_font;
-  GtkSpinButton *normal_font_height;
-
-  DiaFontSelector *name_font;
-  GtkSpinButton *name_font_height;
-
-  DiaFontSelector *comment_font;
-  GtkSpinButton *comment_font_height;
-
-  GtkSpinButton * border_width;
-
-  /* attributes page */
-
-  GtkList *     attributes_list;
-  GtkEntry *    attribute_name;
-  GtkEntry *    attribute_type;
-  GtkTextView * attribute_comment;
-  GtkToggleButton * attribute_primary_key;
-  GtkToggleButton * attribute_nullable;
-  GtkToggleButton * attribute_unique;
-
-  GtkListItem * cur_attr_list_item;
-  GList * added_connections;
-  GList * deleted_connections;
-  GList * disconnected_connections;
-};
-
 struct _TableReference {
   OrthConn orth; /* inheritance */
 

Modified: trunk/objects/Database/table.c
==============================================================================
--- trunk/objects/Database/table.c	(original)
+++ trunk/objects/Database/table.c	Sat Jul 19 17:52:19 2008
@@ -490,7 +490,7 @@
   dia_font_unref (table->comment_font);
 
   if (table->prop_dialog != NULL) {
-    gtk_widget_destroy (table->prop_dialog->dialog);
+    table_dialog_free (table->prop_dialog);
   }
 }
 

Modified: trunk/objects/Database/table_dialog.c
==============================================================================
--- trunk/objects/Database/table_dialog.c	(original)
+++ trunk/objects/Database/table_dialog.c	Sat Jul 19 17:52:19 2008
@@ -31,10 +31,61 @@
 # include <config.h>
 #endif
 
+#undef GTK_DISABLE_DEPRECATED /* GtkList, */
 #include <gtk/gtk.h>
 #include <string.h>
 #include "database.h"
 
+struct _TablePropDialog {
+  GtkWidget * dialog;
+
+  /* general page */
+
+  GtkEntry * table_name;
+  GtkTextView * table_comment;
+  GtkToggleButton * comment_visible;
+  GtkToggleButton * comment_tagging;
+  GtkToggleButton * underline_primary_key;
+  GtkToggleButton * bold_primary_key;
+
+  DiaColorSelector * text_color;
+  DiaColorSelector * line_color;
+  DiaColorSelector * fill_color;
+
+  DiaFontSelector *normal_font;
+  GtkSpinButton *normal_font_height;
+
+  DiaFontSelector *name_font;
+  GtkSpinButton *name_font_height;
+
+  DiaFontSelector *comment_font;
+  GtkSpinButton *comment_font_height;
+
+  GtkSpinButton * border_width;
+
+  /* attributes page */
+
+  GtkList *     attributes_list;
+  GtkEntry *    attribute_name;
+  GtkEntry *    attribute_type;
+  GtkTextView * attribute_comment;
+  GtkToggleButton * attribute_primary_key;
+  GtkToggleButton * attribute_nullable;
+  GtkToggleButton * attribute_unique;
+
+  GtkListItem * cur_attr_list_item;
+  GList * added_connections;
+  GList * deleted_connections;
+  GList * disconnected_connections;
+};
+
+void 
+table_dialog_free (TablePropDialog *dialog)
+{
+  gtk_widget_destroy (dialog->dialog);
+  g_free (dialog);
+}
+
 /* ----------------------------------------------------------------------- */
 
 static void destroy_prop_dialog (GtkWidget*, gpointer);

Modified: trunk/objects/ER/Makefile.am
==============================================================================
--- trunk/objects/ER/Makefile.am	(original)
+++ trunk/objects/ER/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -10,7 +10,8 @@
 
 liber_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+	$(DEBUG_FLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
 	pixmaps/attribute.xpm \

Modified: trunk/objects/FS/Makefile.am
==============================================================================
--- trunk/objects/FS/Makefile.am	(original)
+++ trunk/objects/FS/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -9,7 +9,8 @@
 
 libfs_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+	$(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
 	pixmaps/flow.xpm \

Modified: trunk/objects/FS/flow-ortho.c
==============================================================================
--- trunk/objects/FS/flow-ortho.c	(original)
+++ trunk/objects/FS/flow-ortho.c	Sat Jul 19 17:52:19 2008
@@ -604,7 +604,7 @@
   ObjectChange* change ;
   change = orthflow_create_change( FLOW_TYPE, ((Orthflow*)obj)->type, 0 ) ;
 
-  ((Orthflow*)obj)->type = (int) data ;
+  ((Orthflow*)obj)->type = GPOINTER_TO_INT (data);
   orthflow_update_data((Orthflow*)obj);
 
   return change;
@@ -613,7 +613,7 @@
 static ObjectChange *
 orthflow_segment_callback (DiaObject* obj, Point* clicked, gpointer data)
 {
-  if ( (int)data )
+  if ( GPOINTER_TO_INT (data) )
      return orthconn_add_segment( (OrthConn*)obj, clicked ) ;
 
   return orthconn_delete_segment( (OrthConn*)obj, clicked ) ;

Modified: trunk/objects/GRAFCET/Makefile.am
==============================================================================
--- trunk/objects/GRAFCET/Makefile.am	(original)
+++ trunk/objects/GRAFCET/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -17,7 +17,8 @@
 
 libgrafcet_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) $(XML_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+	$(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
 	pixmaps/etape.xpm \

Modified: trunk/objects/Istar/Makefile.am
==============================================================================
--- trunk/objects/Istar/Makefile.am	(original)
+++ trunk/objects/Istar/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -11,7 +11,8 @@
 
 libistar_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+	$(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
 	pixmaps/actor.xpm \

Modified: trunk/objects/Jackson/Makefile.am
==============================================================================
--- trunk/objects/Jackson/Makefile.am	(original)
+++ trunk/objects/Jackson/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -10,7 +10,8 @@
 
 libjackson_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+	$(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
 	pixmaps/given_domain.xpm \

Modified: trunk/objects/KAOS/Makefile.am
==============================================================================
--- trunk/objects/KAOS/Makefile.am	(original)
+++ trunk/objects/KAOS/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -11,7 +11,8 @@
 
 libkaos_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+	$(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
 	pixmaps/agent.xpm\

Modified: trunk/objects/Makefile.am
==============================================================================
--- trunk/objects/Makefile.am	(original)
+++ trunk/objects/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 SUBDIRS = standard network UML ER FS flowchart custom custom_lines GRAFCET \
-	chronogram SADT Misc bondgraph Istar Jackson KAOS AADL SISSI Database #EML
+	chronogram SADT Misc Istar Jackson KAOS AADL SISSI Database
 
 EXTRA_DIST = \
 	makefile.msc objects.def

Modified: trunk/objects/Misc/Makefile.am
==============================================================================
--- trunk/objects/Misc/Makefile.am	(original)
+++ trunk/objects/Misc/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -10,7 +10,8 @@
 
 libmisc_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+	$(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
 	pixmaps/analog_clock.xpm \

Modified: trunk/objects/SADT/Makefile.am
==============================================================================
--- trunk/objects/SADT/Makefile.am	(original)
+++ trunk/objects/SADT/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -10,7 +10,8 @@
 
 libsadt_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+	$(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
 	pixmaps/arrow.xpm \

Modified: trunk/objects/SISSI/Makefile.am
==============================================================================
--- trunk/objects/SISSI/Makefile.am	(original)
+++ trunk/objects/SISSI/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -21,7 +21,8 @@
 
 libsissi_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+	$(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
 	pixmaps/sissi_object.xpm \

Modified: trunk/objects/SISSI/sissi_dialog.c
==============================================================================
--- trunk/objects/SISSI/sissi_dialog.c	(original)
+++ trunk/objects/SISSI/sissi_dialog.c	Sat Jul 19 17:52:19 2008
@@ -24,6 +24,7 @@
 #endif
 
 #include <assert.h>
+#undef GTK_DISABLE_DEPRECATED /* GtkOptionMenu, gtk_object_get_user_data, ... */
 #include <gtk/gtk.h>
 #include <math.h>
 #include <string.h>

Modified: trunk/objects/UML/Makefile.am
==============================================================================
--- trunk/objects/UML/Makefile.am	(original)
+++ trunk/objects/UML/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -40,7 +40,8 @@
 
 libuml_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+	$(DEBUG_FLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
 	pixmaps/actor.xpm \

Modified: trunk/objects/UML/class.c
==============================================================================
--- trunk/objects/UML/class.c	(original)
+++ trunk/objects/UML/class.c	Sat Jul 19 17:52:19 2008
@@ -1877,9 +1877,7 @@
   }
 
   if (umlclass->properties_dialog != NULL) {
-    g_list_free(umlclass->properties_dialog->deleted_connections);
-    gtk_widget_destroy(umlclass->properties_dialog->dialog);
-    g_free(umlclass->properties_dialog);
+    umlclass_dialog_free (umlclass->properties_dialog);
   }
 }
 

Modified: trunk/objects/UML/class.h
==============================================================================
--- trunk/objects/UML/class.h	(original)
+++ trunk/objects/UML/class.h	Sat Jul 19 17:52:19 2008
@@ -143,95 +143,7 @@
   gboolean destroyed; 
 };
 
-/**
- * \brief Very special user interface for UMLClass parametrization
- *
- * There is a (too)  tight coupling between the UMLClass and it's user interface. 
- * And the dialog is too huge in code as well as on screen.
- */
-struct _UMLClassDialog {
-  GtkWidget *dialog;
-
-  GtkEntry *classname;
-  GtkEntry *stereotype;
-  GtkTextView *comment;
-
-  GtkToggleButton *abstract_class;
-  GtkToggleButton *attr_vis;
-  GtkToggleButton *attr_supp;
-  GtkToggleButton *op_vis;
-  GtkToggleButton *op_supp;
-  GtkToggleButton *comments_vis;
-  GtkToggleButton *op_wrap;
-  DiaFontSelector *normal_font;
-  DiaFontSelector *abstract_font;
-  DiaFontSelector *polymorphic_font;
-  DiaFontSelector *classname_font;
-  DiaFontSelector *abstract_classname_font;
-  DiaFontSelector *comment_font;
-  GtkSpinButton *normal_font_height;
-  GtkSpinButton *abstract_font_height;
-  GtkSpinButton *polymorphic_font_height;
-  GtkSpinButton *classname_font_height;
-  GtkSpinButton *abstract_classname_font_height;
-  GtkSpinButton *comment_font_height;
-  GtkSpinButton *wrap_after_char;  
-  GtkSpinButton *comment_line_length;
-  GtkToggleButton *comment_tagging;
-  DiaColorSelector *text_color;
-  DiaColorSelector *line_color;
-  DiaColorSelector *fill_color;
-  GtkLabel *max_length_label;
-  GtkLabel *Comment_length_label;
-
-  GList *disconnected_connections;
-  GList *added_connections; 
-  GList *deleted_connections; 
-
-  GtkList *attributes_list;
-  GtkListItem *current_attr;
-  GtkEntry *attr_name;
-  GtkEntry *attr_type;
-  GtkEntry *attr_value;
-  GtkTextView *attr_comment;
-  GtkMenu *attr_visible;
-  GtkOptionMenu *attr_visible_button;
-  GtkToggleButton *attr_class_scope;
-  
-  GtkList *operations_list;
-  GtkListItem *current_op;
-  GtkEntry *op_name;
-  GtkEntry *op_type;
-  GtkEntry *op_stereotype;
-  GtkTextView *op_comment;
-
-  GtkMenu *op_visible;
-  GtkOptionMenu *op_visible_button;
-  GtkToggleButton *op_class_scope;
-  GtkMenu *op_inheritance_type;
-  GtkOptionMenu *op_inheritance_type_button;
-  GtkToggleButton *op_query;  
-  
-  GtkList *parameters_list;
-  GtkListItem *current_param;
-  GtkEntry *param_name;
-  GtkEntry *param_type;
-  GtkEntry *param_value;
-  GtkTextView *param_comment;
-  GtkMenu *param_kind;
-  GtkOptionMenu *param_kind_button;
-  GtkWidget *param_new_button;
-  GtkWidget *param_delete_button;
-  GtkWidget *param_up_button;
-  GtkWidget *param_down_button;
-  
-  GtkList *templates_list;
-  GtkListItem *current_templ;
-  GtkToggleButton *templ_template;
-  GtkEntry *templ_name;
-  GtkEntry *templ_type;
-};
-
+void umlclass_dialog_free (UMLClassDialog *dialog);
 extern GtkWidget *umlclass_get_properties(UMLClass *umlclass, gboolean is_default);
 extern ObjectChange *umlclass_apply_props_from_dialog(UMLClass *umlclass, GtkWidget *widget);
 extern void umlclass_calculate_data(UMLClass *umlclass);

Modified: trunk/objects/UML/class_dialog.c
==============================================================================
--- trunk/objects/UML/class_dialog.c	(original)
+++ trunk/objects/UML/class_dialog.c	Sat Jul 19 17:52:19 2008
@@ -34,6 +34,7 @@
 #endif
 
 #include <assert.h>
+#undef GTK_DISABLE_DEPRECATED /* GtkList, GtkOprionMenu, ... */
 #include <gtk/gtk.h>
 #include <math.h>
 #include <string.h>
@@ -43,6 +44,103 @@
 #include "intl.h"
 #include "class.h"
 
+/**
+ * \brief Very special user interface for UMLClass parametrization
+ *
+ * There is a (too) tight coupling between the UMLClass and it's user interface. 
+ * And the dialog is too huge in code as well as on screen.
+ */
+struct _UMLClassDialog {
+  GtkWidget *dialog;
+
+  GtkEntry *classname;
+  GtkEntry *stereotype;
+  GtkTextView *comment;
+
+  GtkToggleButton *abstract_class;
+  GtkToggleButton *attr_vis;
+  GtkToggleButton *attr_supp;
+  GtkToggleButton *op_vis;
+  GtkToggleButton *op_supp;
+  GtkToggleButton *comments_vis;
+  GtkToggleButton *op_wrap;
+  DiaFontSelector *normal_font;
+  DiaFontSelector *abstract_font;
+  DiaFontSelector *polymorphic_font;
+  DiaFontSelector *classname_font;
+  DiaFontSelector *abstract_classname_font;
+  DiaFontSelector *comment_font;
+  GtkSpinButton *normal_font_height;
+  GtkSpinButton *abstract_font_height;
+  GtkSpinButton *polymorphic_font_height;
+  GtkSpinButton *classname_font_height;
+  GtkSpinButton *abstract_classname_font_height;
+  GtkSpinButton *comment_font_height;
+  GtkSpinButton *wrap_after_char;  
+  GtkSpinButton *comment_line_length;
+  GtkToggleButton *comment_tagging;
+  DiaColorSelector *text_color;
+  DiaColorSelector *line_color;
+  DiaColorSelector *fill_color;
+  GtkLabel *max_length_label;
+  GtkLabel *Comment_length_label;
+
+  GList *disconnected_connections;
+  GList *added_connections; 
+  GList *deleted_connections; 
+
+  GtkList *attributes_list;
+  GtkListItem *current_attr;
+  GtkEntry *attr_name;
+  GtkEntry *attr_type;
+  GtkEntry *attr_value;
+  GtkTextView *attr_comment;
+  GtkMenu *attr_visible;
+  GtkOptionMenu *attr_visible_button;
+  GtkToggleButton *attr_class_scope;
+  
+  GtkList *operations_list;
+  GtkListItem *current_op;
+  GtkEntry *op_name;
+  GtkEntry *op_type;
+  GtkEntry *op_stereotype;
+  GtkTextView *op_comment;
+
+  GtkMenu *op_visible;
+  GtkOptionMenu *op_visible_button;
+  GtkToggleButton *op_class_scope;
+  GtkMenu *op_inheritance_type;
+  GtkOptionMenu *op_inheritance_type_button;
+  GtkToggleButton *op_query;  
+  
+  GtkList *parameters_list;
+  GtkListItem *current_param;
+  GtkEntry *param_name;
+  GtkEntry *param_type;
+  GtkEntry *param_value;
+  GtkTextView *param_comment;
+  GtkMenu *param_kind;
+  GtkOptionMenu *param_kind_button;
+  GtkWidget *param_new_button;
+  GtkWidget *param_delete_button;
+  GtkWidget *param_up_button;
+  GtkWidget *param_down_button;
+  
+  GtkList *templates_list;
+  GtkListItem *current_templ;
+  GtkToggleButton *templ_template;
+  GtkEntry *templ_name;
+  GtkEntry *templ_type;
+};
+
+/* hide this functionality before rewrite;) */
+void 
+umlclass_dialog_free (UMLClassDialog *dialog)
+{
+  g_list_free(dialog->deleted_connections);
+  gtk_widget_destroy(dialog->dialog);
+  g_free(dialog);
+}
 
 typedef struct _Disconnect {
   ConnectionPoint *cp;

Modified: trunk/objects/chronogram/Makefile.am
==============================================================================
--- trunk/objects/chronogram/Makefile.am	(original)
+++ trunk/objects/chronogram/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -12,7 +12,8 @@
 
 libchronogram_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+	$(DEBUG_FLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
 	pixmaps/chronoref.xpm \

Modified: trunk/objects/custom/Makefile.am
==============================================================================
--- trunk/objects/custom/Makefile.am	(original)
+++ trunk/objects/custom/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -16,7 +16,7 @@
 shapedir = $(pkgdatadir)/shapes
 
 # add -DDEBUG_CUSTOM here to get extra debugging info.
-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib $(GTK_CFLAGS) \
+INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib $(DEBUG_FLAGS) $(GTK_CFLAGS) \
 	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) \
 	-DDIA_SHAPEDIR=\""$(shapedir)"\"
 

Modified: trunk/objects/custom/custom_object.c
==============================================================================
--- trunk/objects/custom/custom_object.c	(original)
+++ trunk/objects/custom/custom_object.c	Sat Jul 19 17:52:19 2008
@@ -422,8 +422,10 @@
     ShapeInfo *info = custom->info;
     real svg_width = info->shape_bounds.right - info->shape_bounds.left;
     real svg_height = info->shape_bounds.bottom - info->shape_bounds.top;
+    real h_scale = info->default_height / svg_height;
+    real v_scale = info->default_width / svg_width;
     
-    subshape->default_scale = info->default_width / svg_width /
+    subshape->default_scale = (v_scale > h_scale ? h_scale : v_scale) /
                                    units[prefs_get_length_unit()].factor;
   }
   
@@ -440,7 +442,6 @@
   
   /* step 1: calculate boundaries */
   orig_bounds = custom->info->shape_bounds;
-  new_bounds;
   
   /* step 2: undo unkown/funky number magic when flip_h or flip_v is set */
   if(custom->flip_h) custom->xscale = -custom->xscale;
@@ -656,6 +657,9 @@
       dist = distance_bez_shape_point((BezPoint *)barr->data, el->path.npoints,
 				      line_width, point);
       break;
+    case GE_SUBSHAPE:
+      /* subshapes are supposed to be always in bounds, no need to calculate distance */
+      break;
     }
     min_dist = MIN(min_dist, dist);
     if (min_dist == 0.0)
@@ -746,6 +750,9 @@
   switch (reason) {
   case HANDLE_MOVE_USER:
   case HANDLE_MOVE_USER_FINAL:
+  case HANDLE_MOVE_CONNECTED : /* silence gcc */
+  case HANDLE_MOVE_CREATE : /* silence gcc */
+  case HANDLE_MOVE_CREATE_FINAL : /* silence gcc */
     custom_adjust_scale(custom, handle, to, cp, reason, modifiers);
   }
   
@@ -1325,6 +1332,9 @@
     real lwfactor = custom->border_width / 2;
 
     switch(el->type) {
+    case GE_SUBSHAPE :
+      /* if the subshapes leave traces in the diagram here is the place to fix it --hb */
+      break;
     case GE_LINE: {
       LineBBExtras extra;
       Point p1,p2;

Modified: trunk/objects/custom/shape_info.c
==============================================================================
--- trunk/objects/custom/shape_info.c	(original)
+++ trunk/objects/custom/shape_info.c	Sat Jul 19 17:52:19 2008
@@ -195,10 +195,10 @@
 {
   gboolean res = FALSE;
 
-  if (xmlHasProp(node, "subshape")) {
-    gchar* value = xmlGetProp(node, "subshape");
+  if (xmlHasProp(node, (const xmlChar*)"subshape")) {
+    xmlChar* value = xmlGetProp(node, (const xmlChar*)"subshape");
     
-    if (!strcmp(value, "true"))
+    if (!strcmp((const char*)value, "true"))
       res = TRUE;
     
     xmlFree(value);
@@ -467,8 +467,8 @@
                 DIA_SVG_LINEJOIN_DEFAULT,
                 DIA_SVG_LINESTYLE_DEFAULT, 1.0
         };
-        xmlChar *v_anchor_attr = xmlGetProp(node,"v_anchor");
-        xmlChar *h_anchor_attr = xmlGetProp(node,"h_anchor");
+        xmlChar *v_anchor_attr = xmlGetProp(node, (const xmlChar*)"v_anchor");
+        xmlChar *h_anchor_attr = xmlGetProp(node, (const xmlChar*)"h_anchor");
       
         parse_svg_node(tmpinfo, node, svg_ns, &tmp_s, filename);
         
@@ -491,21 +491,21 @@
         subshape->h_anchor_method = OFFSET_METHOD_FIXED;
         subshape->default_scale = 0.0;
                 
-        if (!v_anchor_attr || !strcmp(v_anchor_attr,"fixed.top"))
+        if (!v_anchor_attr || !strcmp((const char*)v_anchor_attr,"fixed.top"))
           subshape->v_anchor_method = OFFSET_METHOD_FIXED;
-        else if (v_anchor_attr && !strcmp(v_anchor_attr,"fixed.bottom"))
+        else if (v_anchor_attr && !strcmp((const char*)v_anchor_attr,"fixed.bottom"))
           subshape->v_anchor_method = -OFFSET_METHOD_FIXED;
-        else if (v_anchor_attr && !strcmp(v_anchor_attr,"proportional"))
+        else if (v_anchor_attr && !strcmp((const char*)v_anchor_attr,"proportional"))
           subshape->v_anchor_method = OFFSET_METHOD_PROPORTIONAL;
         else
           fprintf( stderr, "illegal v_anchor `%s', defaulting to fixed.top\n",
                    v_anchor_attr );
           
-        if (!h_anchor_attr || !strcmp(h_anchor_attr,"fixed.left"))
+        if (!h_anchor_attr || !strcmp((const char*)h_anchor_attr,"fixed.left"))
           subshape->h_anchor_method = OFFSET_METHOD_FIXED;
-        else if (h_anchor_attr && !strcmp(h_anchor_attr,"fixed.right"))
+        else if (h_anchor_attr && !strcmp((const char*)h_anchor_attr,"fixed.right"))
           subshape->h_anchor_method = -OFFSET_METHOD_FIXED;
-        else if (h_anchor_attr && !strcmp(h_anchor_attr,"proportional"))
+        else if (h_anchor_attr && !strcmp((const char*)h_anchor_attr,"proportional"))
           subshape->h_anchor_method = OFFSET_METHOD_PROPORTIONAL;
         else
           fprintf( stderr, "illegal h_anchor `%s', defaulting to fixed.left\n",
@@ -517,7 +517,7 @@
         xmlFree(v_anchor_attr);
         xmlFree(h_anchor_attr);
         
-        el = (GraphicElementSubShape *)subshape;
+        el = (GraphicElement *)subshape;
       }    
     }
     if (el) {
@@ -554,6 +554,9 @@
     int i;
 
     switch (el->type) {
+    case GE_SUBSHAPE:
+      /* subshapes are not supposed to have an influence on bounds */
+      break;
     case GE_LINE:
       check_point(info, &(el->line.p1));
       check_point(info, &(el->line.p2));

Modified: trunk/objects/custom/shape_typeinfo.c
==============================================================================
--- trunk/objects/custom/shape_typeinfo.c	(original)
+++ trunk/objects/custom/shape_typeinfo.c	Sat Jul 19 17:52:19 2008
@@ -71,9 +71,9 @@
   
   if (READ_DONE == context->state)
     /* no more to do */;
-  else if (strncmp (localname, "name", 4) == 0)
+  else if (strncmp ((const char*)localname, "name", 4) == 0)
     context->state = READ_NAME;
-  else if (strncmp (localname, "icon", 4) == 0)
+  else if (strncmp ((const char*)localname, "icon", 4) == 0)
     context->state = READ_ICON;
   else if (context->si->name != NULL && context->si->icon != NULL)
     context->state = READ_DONE;
@@ -93,9 +93,9 @@
   if (READ_NAME == context->state) {
     gchar *prev = context->si->name;
     if (!prev)
-      context->si->name = g_strndup (ch, len);
+      context->si->name = g_strndup ((const gchar*)ch, len);
     else {
-      gchar *now = g_strndup (ch, len);
+      gchar *now = g_strndup ((const gchar*)ch, len);
       context->si->name = g_strconcat (prev, now, NULL);
       g_free (prev);
       g_free (now);
@@ -103,9 +103,9 @@
   } else if (READ_ICON == context->state) {
     gchar *prev = context->si->icon;
     if (!prev) 
-      context->si->icon = g_strndup (ch, len);
+      context->si->icon = g_strndup ((const char*)ch, len);
     else {
-      gchar *now = g_strndup (ch, len);
+      gchar *now = g_strndup ((const char*)ch, len);
       context->si->icon = g_strconcat (prev, now, NULL);
       g_free (prev);
       g_free (now);

Modified: trunk/objects/custom_lines/Makefile.am
==============================================================================
--- trunk/objects/custom_lines/Makefile.am	(original)
+++ trunk/objects/custom_lines/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -12,7 +12,7 @@
 
 INCLUDES = \
 	-I$(srcdir)/../../lib \
-	$(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+	$(DEBUG_FLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
 	pixmaps/default.xpm 

Modified: trunk/objects/flowchart/Makefile.am
==============================================================================
--- trunk/objects/flowchart/Makefile.am	(original)
+++ trunk/objects/flowchart/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -10,8 +10,8 @@
 
 libflowchart_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
-	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+	$(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
 	pixmaps/box.xpm \

Modified: trunk/objects/network/Makefile.am
==============================================================================
--- trunk/objects/network/Makefile.am	(original)
+++ trunk/objects/network/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -11,7 +11,8 @@
 
 libnetwork_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+	$(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
 	pixmaps/antenna.xpm \

Modified: trunk/objects/standard/Makefile.am
==============================================================================
--- trunk/objects/standard/Makefile.am	(original)
+++ trunk/objects/standard/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -51,7 +51,8 @@
 
 BUILT_SOURCES = tool-icons.h
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+	$(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
 	$(ICON_PNGS)

Modified: trunk/objects/standard/outline.c
==============================================================================
--- trunk/objects/standard/outline.c	(original)
+++ trunk/objects/standard/outline.c	Sat Jul 19 17:52:19 2008
@@ -321,7 +321,7 @@
   int i, n = 0, total;
   BezPoint *pts;
   real x, y;
-  Point ps;
+  Point ps = {0, 0}; /* silence gcc */
   
   if (!outline->path)
     return;
@@ -457,7 +457,6 @@
   DiaObject *obj = &outline->object;
   Point start = obj->position;
   Point end = outline->ink_rect[2];
-  real old_height = outline->font_height;
   real dist, old_dist = distance_point_point (&start, &end);
   Point norm = end;
   point_sub (&norm, &start);

Modified: trunk/plug-ins/cgm/Makefile.am
==============================================================================
--- trunk/plug-ins/cgm/Makefile.am	(original)
+++ trunk/plug-ins/cgm/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -6,5 +6,4 @@
 
 libcgm_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
-	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(DEBUG_CFLAGS) $(GTK_CFLAGS)

Modified: trunk/plug-ins/dxf/Makefile.am
==============================================================================
--- trunk/plug-ins/dxf/Makefile.am	(original)
+++ trunk/plug-ins/dxf/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -11,5 +11,4 @@
 
 libdxf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
-	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) 
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib  $(DEBUG_FLAGS) $(GTK_CFLAGS)

Modified: trunk/plug-ins/hpgl/Makefile.am
==============================================================================
--- trunk/plug-ins/hpgl/Makefile.am	(original)
+++ trunk/plug-ins/hpgl/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -3,5 +3,4 @@
 libhpgl_filter_la_SOURCES = hpgl.c
 libhpgl_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
-  $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib $(DEBUG_FLAGS) $(GTK_CFLAGS)

Modified: trunk/plug-ins/metapost/Makefile.am
==============================================================================
--- trunk/plug-ins/metapost/Makefile.am	(original)
+++ trunk/plug-ins/metapost/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -9,6 +9,4 @@
 
 libmetapost_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
- $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(DEBUG_CFLAGS) \
- $(XML_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib  $(DEBUG_FLAGS) $(GTK_CFLAGS)

Modified: trunk/plug-ins/pgf/Makefile.am
==============================================================================
--- trunk/plug-ins/pgf/Makefile.am	(original)
+++ trunk/plug-ins/pgf/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -9,5 +9,4 @@
 
 libpgf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
-	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(DEBUG_FLAGS) $(GTK_CFLAGS)

Modified: trunk/plug-ins/pstricks/Makefile.am
==============================================================================
--- trunk/plug-ins/pstricks/Makefile.am	(original)
+++ trunk/plug-ins/pstricks/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -9,5 +9,4 @@
 
 libpstricks_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
-	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(DEBUG_FLAGS) $(GTK_CFLAGS)

Modified: trunk/plug-ins/python/Makefile.am
==============================================================================
--- trunk/plug-ins/python/Makefile.am	(original)
+++ trunk/plug-ins/python/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -2,8 +2,8 @@
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/intl \
 	-I$(top_srcdir)/lib \
+	$(DEBUG_FLAGS) \
 	$(GTK_CFLAGS) \
-	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) \
 	$(LIBART_CFLAGS) \
 	$(PYTHON_INCLUDES) \
 	$(XML_CFLAGS) $(UNICODE_CFLAGS) 

Modified: trunk/plug-ins/shape/Makefile.am
==============================================================================
--- trunk/plug-ins/shape/Makefile.am	(original)
+++ trunk/plug-ins/shape/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -8,6 +8,6 @@
 
 libshape_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
-	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) $(XML_CFLAGS) \
-	$(DEBUG_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+	$(DEBUG_FLAGS) $(GTK_CFLAGS) $(XML_CFLAGS)
+

Modified: trunk/plug-ins/svg/Makefile.am
==============================================================================
--- trunk/plug-ins/svg/Makefile.am	(original)
+++ trunk/plug-ins/svg/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -6,4 +6,5 @@
 
 libsvg_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) $(XML_CFLAGS) $(DEBUG_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+	$(DEBUG_FLAGS) $(GTK_CFLAGS) $(XML_CFLAGS)

Modified: trunk/plug-ins/wmf/Makefile.am
==============================================================================
--- trunk/plug-ins/wmf/Makefile.am	(original)
+++ trunk/plug-ins/wmf/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -11,8 +11,7 @@
 libwmf_filter_la_LIBADD = -lstdc++ $(LIBEMF_LIBS)
 
 INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
-  $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) \
-  $(DEBUG_CFLAGS) $(LIBEMF_CFLAGS)
+  $(DEBUG_FLAGS) $(GTK_CFLAGS) $(LIBEMF_CFLAGS)
 
 EXTRA_DIST = \
 	paginate_gdiprint.cpp \

Modified: trunk/plug-ins/wpg/Makefile.am
==============================================================================
--- trunk/plug-ins/wpg/Makefile.am	(original)
+++ trunk/plug-ins/wpg/Makefile.am	Sat Jul 19 17:52:19 2008
@@ -4,5 +4,4 @@
 libwpg_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
 
 INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
-  $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) \
-  $(DEBUG_CFLAGS)
+  $(DEBUG_FLAGS) $(GTK_CFLAGS)

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Sat Jul 19 17:52:19 2008
@@ -143,7 +143,6 @@
 objects/UML/umloperation.c
 objects/UML/umlparameter.c
 objects/UML/usecase.c
-objects/bondgraph/bondgraph.c
 objects/chronogram/chronogram.c
 objects/chronogram/chronoline.c
 objects/chronogram/chronoref.c
@@ -254,4 +253,4 @@
 sheets/civil.sheet.in
 sheets/jigsaw.sheet.in
 sheets/network.sheet.in
-sheets/sybase.sheet.in
+
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]