Commit: b8a358e4e2fc98cdb61c43bb0f2e623fa1a5736a - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: b8a358e4e2fc98cdb61c43bb0f2e623fa1a5736a (tree)
• Zeit: 2004-07-23 06:56:10
• Autor: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

0.94-pre2 fixes taken from head and release branches.

Ändern Zusammenfassung

• modified: ChangeLog
• modified: NEWS
• modified: app/dia-props.c
• modified: app/filedlg.c
• modified: app/load_save.c
• modified: app/paginate_psprint.c
• modified: config.h.win32
• modified: configure.in
• modified: dia.spec
• modified: doc/en/dia.xml
• modified: doc/pl/dia.xml
• modified: lib/diaarrowchooser.c
• modified: lib/diaarrowchooser.h
• modified: lib/dialibartrenderer.c
• modified: lib/dialibartrenderer.h
• modified: lib/object.c
• modified: lib/object.h
• modified: objects/standard/line.c
• modified: plug-ins/wmf/wmf.cpp
• modified: shapes/Makefile.am
• modified: shapes/network/Makefile.am

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,35 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* NEWS: 
+	* config.h.win32: 
+	* doc/en/dia.xml: 
+	* doc/pl/dia.xml: 
+	* dia.spec (Release): 
+	* configure.in: Update to version 0.94-pre2.
+
+	* app/load_save.c (diagram_data_write_doc): Use new namespace
+	here, too.
+
+	* lib/object.h (OBJECT_COMMON_PROPERTIES): Remove 'Dia' from
+	hidden objects properties.
+
+	* objects/standard/line.c: Remove halffinished line gap box from
+	properties list.
+
+	* app/paginate_psprint.c: 
+	* app/filedlg.c: Patch from [e-mail] (Kiran Kumar
+	Immidi): Close export and print dialog with diagram as well.
+	(#129520)
+	
+	* lib/diaarrowchooser.[ch]: Patch from [e-mail] (paolo
+	borelli):  Remove deprecated stuff (#137693)
+
+	* app/dia-props.c (create_diagram_properties_dialog): Patch from
+	[e-mail] (Kiran Kumar Immidi):  Close properties dialog
+	on destroy.
+
 2004-07-21  Ray Strode  <[e-mail]>
+
 	* dia/dia.desktop.in: Add MimeType line to desktop file
 	new mime sytem.
 
@@ -16,23 +47,17 @@
 	
 	* app/app_procs.c : make the --size hack even uglier, but work again
 	
-	* lib/libartrenderer.c (draw_line, draw_rect) : disable broken code
-	using art_vpath_affine_transform()
-	
 	* lib/dia_dirs.c(dia_get_absolute_filename) : must not free()
 	but g_free() what is returned by g_build_filename()
 	
-	* objects/custom_object.c(custom_destroy) : handle all enum values
-	in switch to get rid of the warning
+	* objects/custom/custom_object.c(custom_destroy) : handle all enum
+	values in switch to get rid of the warning
 	
 	* objects/custom/shape_info.c : use g_ascii_strtod(), get rid 
 	of setlocale()/strtod()
 	* lib/dia_svg.c : dito
 	* lib/dia_xml.c : almost
 
-	* lib/object.h : set PROP_FLAG_OPTIONAL for "obj_rotate" to stop
-	complaining on missing attribute
-	
 	* plug-ins/python/group_props.py : use the string representation of 
 	value to ensure "unique values". If the strings would not be different
 	the user cann't see the difference either
@@ -46,28 +71,24 @@
 
 	* lib/persistence.c (persistence_save_type): Small fixes (#142663)
 
-	* doc/diagram.dtd: Add closing > to dia:diagram to make it parsable!
-
 	* objects/standard/image.c (image_load): Use path of diagram
 	rather than running directory as base for image file place.
 
+	* doc/{diagram,sheet}.dtd: Move DTD namespace to new site, and
+	syntactic fixes. 
+	
 	* app/disp_callbacks.c (ddisplay_canvas_events): Patch from
 	Ambrose Li <[e-mail]>:  Better IM context handling.
 
+	* Re-added new sample diagrams binarily.
+
 2004-07-17 Sagar Rastogi <[e-mail]>
 
 	* app/disp_callbacks.c: Fixed #144962 (also in KNOWN_BUGS),
 	Disabled keyboard accels when dragging an object.	
 
-2004-07-16  Steffen Macke <[e-mail]>
-
-	* shapes/RDP/Makefile.am: Synchronized with 0_94_RELEASE branch
-
 2004-07-14  Lars Clausen  <[e-mail]>
 
-	* doc/diagram.dtd: 
-	* doc/sheet.dtd: Move DTD namespace to new site, and syntactic fix.
-
 	* app/grid.c (snap_to_grid): Use diagrams grid setting to
 	determine hex grid snap.
 
@@ -75,30 +96,8 @@
 	
 	* app/interface.h: Avoid multiply defined symbols (#147396)
 
-2004-07-13  Lars Clausen  <[e-mail]>
-
-	* app/paginate_psprint.c (diagram_print_ps): Give usable type for
-	signal handler function -- Solaris uses a direct function type
-	that's different from what Linux has, but a void * will always
-	hold it.
-
-2004-07-13  Steffen Macke <[e-mail]>
-
-	* samples/Istar.dia:
-	* samples/KAOS.dia:
-	* samples/Jackson.dia: re-added to the CVS as binary files
-
-2004-07-11  Lars Clausen  <[e-mail]>
-
-	* lib/dialibartrenderer.c: 
-	* lib/dialibartrenderer.h (struct _DiaLibartRenderer): 
-	* lib/object.c: 
-	* lib/object.h (OBJECT_COMMON_PROPERTIES): First attempt at actual
-	rotation.  Very primitive interface, only rect can rotate, only in
-	libart, and there the box collapses:(  But it's progress.
-
 2004-07-10  Lars Clausen  <[e-mail]>
- 
+
 	* app/sheets_dialog_callbacks.c (write_user_sheet): 
 	* lib/sheet.c (load_register_sheet): Don't introduce double
 	slashes in namespace.
@@ -106,15 +105,19 @@
 	* lib/dia_xml.h (DIA_XML_NAME_SPACE_BASE): Keep consistent with
 	old diagrams, or XSLT will barf all over.
 	
-2004-07-10  Steffen Macke <[e-mail]>
+	* shapes/RDP/place.shape: 
+	* shapes/RDP/transition.shape: 
+	* shapes/RDP/Makefile.am: Added .png entries to SHAPES and changed
+	shapes to use those.
 
-	* makefile.msc: added doc target; updated for 0.94-pre1 release
-	* shapes/RDP/place.shape:
-	* shapes/RDP/transition.shape: use *.png instead of *.xpm
[phone]  Lars Clausen <[e-mail]>
 
-2004-07-08  Steffen Macke <[e-mail]>
-
-	* plug-ins/wmf/wmf.cpp (UsePen): linewidth is now working for PS_SOLID  
+	* config.h.win32: 
+	* doc/{en,pl}/dia.xml: 
+	* dia.spec: 
+	* configure.in: 
+	* NEWS: First prerelease of version 0.94.  Now with release
+	versions in a branch and main devel in the trunk.
 
 2004-07-05  Hans Breuer  <[e-mail]>
 

--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,55 @@
+dia-0.94-pre2: 17-Jul-2004
+
+Second prerelease of version 0.94.  Bunch of small fixes, but together
+important enough to make a new prerelease.
+
+dia-0.94-pre1: 04-Jul-2004
+
+First prerelease of version 0.94.  News in this version:
+
+* Highlighting of objects when connecting to them makes it easier to
+  connect.
+
+* New shape sets include:
+  - RDP (Petri Networks shapes)
+  - KAOS (Goal-Directed Requirements Acquisition)
+  - I* (Intentional STrategic Actor Relationships modelling)
+  - Jackson (Jackson Diagrams)
+  - ChemEng (chemical engineering)
+
+* Hexagonal grid, for all you chemists out there.
+
+* Allow selection between layers, selectable in layers dialog.
+
+* Disparate persistence systems replaced by one combined system using XML,
+  leaves unknown preferences alone.
+
+* New renderer plug-in for Cairo rendering API.
+
+* New renderer plug-in for WMF outside of Windows.
+
+* New arrow head: Backslash.
+
+* Rounded corners on zigzaglines and polylines.
+
+* Automaticall open new diagram if now chosen at start.
+
+* Diagram modified status now based on undo information.
+
+* Wrapping operations arguments in UML objects.
+
+* Better positioning of association texts.
+
+* More persistence of toolbox selections and dialog entries.
+
+* Better handling of dialogs when parent dialogs close.
+
+* Changed from SGML to XML for docs, still DocBook.
+
+* Fix shape background color compatibility problem.
+
+* Many smaller bug fixes, leaks closed and stuff.
+
 dia-0.93: 29-Apr-2004
 
 Ready for release.

--- a/app/dia-props.c
+++ b/app/dia-props.c
@@ -105,7 +105,7 @@ create_diagram_properties_dialog(Diagram *dia)
 		   NULL);
   g_signal_connect(G_OBJECT(dialog), "delete_event",
 		   G_CALLBACK(gtk_widget_hide), NULL);
-  g_signal_connect(G_OBJECT(dialog), "destroy_event",
+  g_signal_connect(G_OBJECT(dialog), "destroy",
 		   G_CALLBACK(diagram_properties_dialog_destroyed), NULL);
 
   notebook = gtk_notebook_new();

--- a/app/filedlg.c
+++ b/app/filedlg.c
@@ -332,6 +332,9 @@ file_save_as_callback(gpointer data, guint action, GtkWidget *widget)
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compressbutton),
 				 dia->data->is_compressed);
     g_signal_handlers_unblock_by_func(G_OBJECT(compressbutton), toggle_compress_callback, NULL);
+    diagram_remove_related_dialog(gtk_object_get_user_data(GTK_OBJECT(savedlg)), savedlg);
+    gtk_object_set_user_data(GTK_OBJECT(savedlg), dia);
+    diagram_add_related_dialog(dia, savedlg);
     if (GTK_WIDGET_VISIBLE(savedlg))
       return;
   }
@@ -524,6 +527,7 @@ file_export_callback(gpointer data, guint action, GtkWidget *widget)
  
   gtk_object_set_user_data(GTK_OBJECT(exportdlg), dia);
   g_object_ref(dia); 
+  diagram_add_related_dialog(dia, exportdlg);
   gtk_widget_set_sensitive(exportdlg, TRUE);
   if (GTK_WIDGET_VISIBLE(exportdlg))
     return;

--- a/app/load_save.c
+++ b/app/load_save.c
@@ -129,7 +129,7 @@ read_objects(xmlNodePtr objects,
   list = NULL;
 
   obj_node = objects->xmlChildrenNode;
-  
+
   while ( obj_node != NULL) {
     if (xmlIsBlankNode(obj_node)) {
       obj_node = obj_node->next;

--- a/app/paginate_psprint.c
+++ b/app/paginate_psprint.c
@@ -193,6 +193,18 @@ pipe_handler(int signum)
   sigpipe_received = TRUE;
 }
 
+static gboolean
+diagram_print_destroy(GtkWidget *widget)
+{
+  Diagram **dia;
+
+  if ((dia = gtk_object_get_user_data(GTK_OBJECT(widget))) != NULL) {
+    diagram_remove_related_dialog(*dia, widget);
+    *dia = NULL;
+  }
+
+  return FALSE;
+}
 
 void
 diagram_print_ps(Diagram *dia)
@@ -217,6 +229,10 @@ diagram_print_ps(Diagram *dia)
 
   /* create the dialog */
   dialog = gtk_dialog_new();
+  diagram_add_related_dialog(dia, dialog);
+  gtk_object_set_user_data(GTK_OBJECT(dialog), &dia);
+  g_signal_connect(GTK_OBJECT(dialog), "delete_event",
+		   G_CALLBACK(diagram_print_destroy), NULL);
   g_signal_connect(GTK_OBJECT(dialog), "delete_event",
 		   G_CALLBACK(gtk_main_quit), NULL);
   g_signal_connect(GTK_OBJECT(dialog), "delete_event",
@@ -312,6 +328,11 @@ diagram_print_ps(Diagram *dia)
   gtk_widget_show(dialog);
   gtk_main();
 
+  if(!dia) {
+    gtk_widget_destroy(dialog);
+    return;
+  }
+  
   if (!cont) {
     persistence_change_string_entry("printer-command", orig_command, cmd);
     persistence_change_string_entry("printer-file", orig_file, ofile);

--- a/config.h.win32
+++ b/config.h.win32
@@ -17,7 +17,7 @@
 #define GETTEXT_PACKAGE "dia"
 #define LOCALEDIR "../lib/locale"
 
-#define VERSION "0.93+cvs"
+#define VERSION "0.94-pre2"
 
 /*
  * 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.93+cvs, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
+AC_INIT(dia, 0.94-pre2, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
 AC_CONFIG_SRCDIR(app/diagram.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 
@@ -451,6 +451,7 @@ shapes/Misc/Makefile
 shapes/MSE/Makefile
 shapes/network/Makefile
 shapes/Pneumatic/Makefile
+shapes/RDP/Makefile
 shapes/SDL/Makefile
 shapes/sybase/Makefile
 app/Makefile

--- a/dia.spec
+++ b/dia.spec
@@ -1,12 +1,12 @@
 %define name dia
 # This is the full Dia version
-%define ver 0.93
+%define ver 0.94
 
 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: cvs
+Release: pre2
 Copyright: GPL
 Group: Applications/
 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{ver}.tar.gz

--- a/doc/en/dia.xml
+++ b/doc/en/dia.xml
@@ -8,7 +8,7 @@
 
   [
 
-    <!ENTITY VERSION "0.94-devel">
+    <!ENTITY VERSION "0.94-pre2">
 
     <!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.94-devel">
+<!ENTITY VERSION "0.94-pre2">
 <!ENTITY INTRODUCTION SYSTEM "intro.sgml">
 <!ENTITY QUICKSTART SYSTEM "usage-quickstart.sgml">
 <!ENTITY CANVAS SYSTEM "usage-canvas.sgml">

--- a/lib/diaarrowchooser.c
+++ b/lib/diaarrowchooser.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#undef GTK_DISABLE_DEPRECATED /* GtkTypeInfo, gtk_widget_queue_clear, ... */
-
 #include <gtk/gtk.h>
 
 #include "intl.h"
@@ -31,12 +29,6 @@
 static const char *button_menu_key = "dia-button-menu";
 static const char *menuitem_enum_key = "dia-menuitem-value";
 
-static gint close_and_hide(GtkWidget *wid, GdkEventAny *event) 
-{
-  gtk_widget_hide(wid);
-  return TRUE;
-}
-
 /* --------------- DiaArrowPreview -------------------------------- */
 static void dia_arrow_preview_set(DiaArrowPreview *arrow, 
                                   ArrowType atype, gboolean left);
@@ -46,25 +38,28 @@ static void dia_arrow_preview_init       (DiaArrowPreview       *arrow);
 static gint dia_arrow_preview_expose     (GtkWidget      *widget,
 					  GdkEventExpose *event);
 
-GtkType
+GType
 dia_arrow_preview_get_type (void)
 {
-  static GtkType arrow_type = 0;
-
-  if (!arrow_type) {
-      static const GtkTypeInfo arrow_info = {
-        "DiaArrowPreview",
-        sizeof (DiaArrowPreview),
-        sizeof (DiaArrowPreviewClass),
-        (GtkClassInitFunc) dia_arrow_preview_class_init,
-        (GtkObjectInitFunc) dia_arrow_preview_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-      arrow_type = gtk_type_unique (GTK_TYPE_MISC, &arrow_info);
-    }
-  return arrow_type;
+  static GType type = 0;
+
+  if (!type) {
+    static const GTypeInfo info = {
+      sizeof (DiaArrowPreviewClass),
+      (GBaseInitFunc) NULL,
+      (GBaseFinalizeFunc) NULL,
+      (GClassInitFunc) dia_arrow_preview_class_init,
+      (GClassFinalizeFunc) NULL,
+      NULL,
+      sizeof (DiaArrowPreview),
+      0,
+      (GInstanceInitFunc) dia_arrow_preview_init
+    };
+
+    type = g_type_register_static(GTK_TYPE_MISC, "DiaArrowPreview", &info, 0);
+  }
+
+  return type;
 }
 
 static void
@@ -72,7 +67,7 @@ dia_arrow_preview_class_init (DiaArrowPreviewClass *class)
 {
   GtkWidgetClass *widget_class;
 
-  widget_class = (GtkWidgetClass *)class;
+  widget_class = GTK_WIDGET_CLASS (class);
   widget_class->expose_event = dia_arrow_preview_expose;
 }
 
@@ -91,7 +86,7 @@ dia_arrow_preview_init (DiaArrowPreview *arrow)
 GtkWidget *
 dia_arrow_preview_new (ArrowType atype, gboolean left)
 {
-  DiaArrowPreview *arrow = gtk_type_new (dia_arrow_preview_get_type());
+  DiaArrowPreview *arrow = g_object_new(DIA_TYPE_ARROW_PREVIEW, NULL);
 
   arrow->atype = atype;
   arrow->left = left;
@@ -105,7 +100,7 @@ dia_arrow_preview_set(DiaArrowPreview *arrow, ArrowType atype, gboolean left)
     arrow->atype = atype;
     arrow->left = left;
     if (GTK_WIDGET_DRAWABLE(arrow))
-      gtk_widget_queue_clear(GTK_WIDGET(arrow));
+      gtk_widget_queue_draw(GTK_WIDGET(arrow));
   }
 }
 
@@ -159,56 +154,60 @@ dia_arrow_preview_expose(GtkWidget *widget, GdkEventExpose *event)
 
 /* ------- Code for DiaArrowChooser ----------------------- */
 
-
-
-
 static void dia_arrow_chooser_class_init (DiaArrowChooserClass  *klass);
 static void dia_arrow_chooser_init       (DiaArrowChooser       *arrow);
-static gint dia_arrow_chooser_event      (GtkWidget *widget,
-					  GdkEvent *event);
-static void dia_arrow_chooser_dialog_ok  (DiaArrowChooser *arrow);
-static void dia_arrow_chooser_dialog_cancel (DiaArrowChooser *arrow);
-static void dia_arrow_chooser_dialog_destroy (DiaArrowChooser *arrow);
-static void dia_arrow_chooser_change_arrow_type (GtkMenuItem *mi,
-						 DiaArrowChooser *arrow);
-static void dia_arrow_chooser_dialog_new(GtkWidget *widget, gpointer userdata);
-static void dia_arrow_chooser_dialog_show(GtkWidget *widget, gpointer userdata);
-
-GtkType
+
+GType
 dia_arrow_chooser_get_type (void)
 {
-  static GtkType arrow_type = 0;
-
-  if (!arrow_type) {
-      static const GtkTypeInfo arrow_info = {
-        "DiaArrowChooser",
-        sizeof (DiaArrowChooser),
-        sizeof (DiaArrowChooserClass),
-        (GtkClassInitFunc) dia_arrow_chooser_class_init,
-        (GtkObjectInitFunc) dia_arrow_chooser_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-      arrow_type = gtk_type_unique (GTK_TYPE_BUTTON, &arrow_info);
-    }
-  return arrow_type;
+  static GType type = 0;
+
+  if (!type) {
+    static const GTypeInfo info = {
+      sizeof (DiaArrowChooserClass),
+      (GBaseInitFunc) NULL,
+      (GBaseFinalizeFunc) NULL,
+      (GClassInitFunc) dia_arrow_chooser_class_init,
+      (GClassFinalizeFunc) NULL,
+      NULL,
+      sizeof (DiaArrowChooser),
+      0,
+      (GInstanceInitFunc) dia_arrow_chooser_init
+    };
+
+    type = g_type_register_static(GTK_TYPE_BUTTON, "DiaArrowChooser", &info, 0);
+  }
+
+  return type;
+}
+
+static gint
+dia_arrow_chooser_event(GtkWidget *widget, GdkEvent *event)
+{
+  if (event->type == GDK_BUTTON_PRESS && event->button.button == 1) {
+    GtkMenu *menu = gtk_object_get_data(GTK_OBJECT(widget), button_menu_key);
+    gtk_menu_popup(menu, NULL, NULL, NULL, NULL,
+		   event->button.button, event->button.time);
+    return TRUE;
+  }
+
+  return FALSE;
 }
 
 static void
-dia_arrow_chooser_class_init (DiaArrowChooserClass *class)
+dia_arrow_chooser_class_init(DiaArrowChooserClass *class)
 {
   GtkWidgetClass *widget_class;
 
-  widget_class = (GtkWidgetClass *)class;
+  widget_class = GTK_WIDGET_CLASS(class);
   widget_class->event = dia_arrow_chooser_event;
 }
 
 static void
-dia_arrow_chooser_init (DiaArrowChooser *arrow)
+dia_arrow_chooser_init(DiaArrowChooser *arrow)
 {
   GtkWidget *wid;
-  
+
   arrow->left = FALSE;
   arrow->arrow.type = ARROW_NONE;
   arrow->arrow.length = DEFAULT_ARROW_LENGTH;
@@ -222,62 +221,86 @@ dia_arrow_chooser_init (DiaArrowChooser *arrow)
   arrow->dialog = NULL;
 }
 
-/* Creating the dialog separately so we can handle destroy */
 static void
-dia_arrow_chooser_dialog_new(GtkWidget *widget, gpointer userdata)
+dia_arrow_chooser_dialog_response (GtkWidget *dialog,
+                                   gint response_id,
+                                   DiaArrowChooser *chooser)
 {
-  DiaArrowChooser *chooser = DIA_ARROW_CHOOSER(userdata);
-  if (chooser->dialog == NULL) {
-    GtkWidget *wid;
-    chooser->dialog = wid = gtk_dialog_new();
-    gtk_window_set_title(GTK_WINDOW(wid), _("Arrow Properties"));
-    g_signal_connect(GTK_OBJECT(wid), "delete_event",
-		       G_CALLBACK(close_and_hide), NULL);
-    g_signal_connect(GTK_OBJECT(wid), "destroy",
-		       G_CALLBACK(gtk_widget_destroyed),
-		       &chooser->dialog);
-
-    wid = dia_arrow_selector_new();
-    gtk_container_set_border_width(GTK_CONTAINER(wid), 5);
-    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(chooser->dialog)->vbox), wid,
-		       TRUE, TRUE, 0);
-    gtk_widget_show(wid);
-    chooser->selector = DIA_ARROW_SELECTOR(wid);
+  if (response_id == GTK_RESPONSE_OK) {
+    Arrow new_arrow = dia_arrow_selector_get_arrow(chooser->selector);
+
+    if (new_arrow.type   != chooser->arrow.type   ||
+        new_arrow.length != chooser->arrow.length ||
+        new_arrow.width  != chooser->arrow.width) {
+      chooser->arrow = new_arrow;
+      dia_arrow_preview_set(chooser->preview, new_arrow.type, chooser->left);
+      if (chooser->callback)
+        (* chooser->callback)(chooser->arrow, chooser->user_data);
+    }
+  } else {
     dia_arrow_selector_set_arrow(chooser->selector, chooser->arrow);
+  }
+  gtk_widget_hide(chooser->dialog);
+}
+
+static void
+dia_arrow_chooser_dialog_new(DiaArrowChooser *chooser)
+{
+  GtkWidget *wid;
+
+  chooser->dialog = gtk_dialog_new_with_buttons(_("Arrow Properties"),
+                                                NULL,
+                                                GTK_DIALOG_NO_SEPARATOR,
+                                                GTK_STOCK_CANCEL,
+                                                GTK_RESPONSE_CANCEL,
+                                                GTK_STOCK_OK,
+                                                GTK_RESPONSE_OK,
+                                                NULL);
+  gtk_dialog_set_default_response(GTK_DIALOG(chooser->dialog),
+                                  GTK_RESPONSE_OK);
+  g_signal_connect(G_OBJECT(chooser->dialog), "response",
+                   G_CALLBACK(dia_arrow_chooser_dialog_response), chooser);
+  g_signal_connect(G_OBJECT(chooser->dialog), "destroy",
+                   G_CALLBACK(gtk_widget_destroyed), &chooser->dialog);
+
+  wid = dia_arrow_selector_new();
+  gtk_container_set_border_width(GTK_CONTAINER(wid), 5);
+  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(chooser->dialog)->vbox), wid,
+                     TRUE, TRUE, 0);
+  gtk_widget_show(wid);
+  chooser->selector = DIA_ARROW_SELECTOR(wid);
+}
 
-    wid = gtk_button_new_with_label(_("OK"));
-    GTK_WIDGET_SET_FLAGS(wid, GTK_CAN_DEFAULT);
-    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(chooser->dialog)->action_area),wid);
-    gtk_widget_grab_default(wid);
-    g_signal_connect_swapped(GTK_OBJECT(wid), "clicked",
-			      G_CALLBACK(dia_arrow_chooser_dialog_ok),
-			      GTK_OBJECT(chooser));
-    gtk_widget_show(wid);
-
-    wid = gtk_button_new_with_label(_("Cancel"));
-    GTK_WIDGET_SET_FLAGS(wid, GTK_CAN_DEFAULT);
-    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(chooser->dialog)->action_area),wid);
-    g_signal_connect_swapped(GTK_OBJECT(wid), "clicked",
-			      G_CALLBACK(dia_arrow_chooser_dialog_cancel),
-			      GTK_OBJECT(chooser));
-    gtk_widget_show(wid);
+static void
+dia_arrow_chooser_dialog_show(GtkWidget *widget, DiaArrowChooser *chooser)
+{
+  if (chooser->dialog) {
+    gtk_window_present(GTK_WINDOW(chooser->dialog));
+    return;
   }
+
+  dia_arrow_chooser_dialog_new(chooser);
+  dia_arrow_selector_set_arrow(chooser->selector, chooser->arrow);
+  gtk_widget_show(chooser->dialog);
 }
 
 static void
-dia_arrow_chooser_dialog_show(GtkWidget *widget, gpointer userdata)
+dia_arrow_chooser_change_arrow_type(GtkMenuItem *mi, DiaArrowChooser *chooser)
 {
-     DiaArrowChooser *chooser = DIA_ARROW_CHOOSER(userdata);
-     dia_arrow_chooser_dialog_new(widget, chooser);
-     dia_arrow_selector_set_arrow(chooser->selector, chooser->arrow);
-     gtk_widget_show(chooser->dialog);
+  ArrowType atype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(mi),
+						      menuitem_enum_key));
+  Arrow arrow;
+  arrow.width = chooser->arrow.width;
+  arrow.length = chooser->arrow.length;
+  arrow.type = atype;
+  dia_arrow_chooser_set_arrow(chooser, &arrow);
 }
 
 GtkWidget *
 dia_arrow_chooser_new(gboolean left, DiaChangeArrowCallback callback,
 		      gpointer user_data, GtkTooltips *tool_tips)
 {
-  DiaArrowChooser *chooser = gtk_type_new(dia_arrow_chooser_get_type());
+  DiaArrowChooser *chooser = g_object_new(DIA_TYPE_ARROW_CHOOSER, NULL);
   GtkWidget *menu, *mi, *ar;
   gint i;
 
@@ -286,17 +309,15 @@ dia_arrow_chooser_new(gboolean left, DiaChangeArrowCallback callback,
   chooser->callback = callback;
   chooser->user_data = user_data;
 
-  dia_arrow_chooser_dialog_new(NULL, chooser);
-
   menu = gtk_menu_new();
   g_object_ref(G_OBJECT(menu));
   gtk_object_sink(GTK_OBJECT(menu));
-  gtk_object_set_data_full(GTK_OBJECT(chooser), button_menu_key, menu,
-			   (GtkDestroyNotify)gtk_widget_unref);
+  g_object_set_data_full(G_OBJECT(chooser), button_menu_key, menu,
+			 (GtkDestroyNotify)gtk_widget_unref);
   for (i = 0; arrow_types[i].name != NULL; i++) {
     mi = gtk_menu_item_new();
-    gtk_object_set_data(GTK_OBJECT(mi), menuitem_enum_key,
-			GINT_TO_POINTER(arrow_types[i].enum_value));
+    g_object_set_data(G_OBJECT(mi), menuitem_enum_key,
+		      GINT_TO_POINTER(arrow_types[i].enum_value));
     if (tool_tips) {
       gtk_tooltips_set_tip(tool_tips, mi, arrow_types[i].name, NULL);
     }
@@ -304,82 +325,25 @@ dia_arrow_chooser_new(gboolean left, DiaChangeArrowCallback callback,
 
     gtk_container_add(GTK_CONTAINER(mi), ar);
     gtk_widget_show(ar);
-    g_signal_connect(GTK_OBJECT(mi), "activate",
-		       G_CALLBACK(dia_arrow_chooser_change_arrow_type),
-		       chooser);
-    gtk_container_add(GTK_CONTAINER(menu), mi);
+    g_signal_connect(G_OBJECT(mi), "activate",
+		     G_CALLBACK(dia_arrow_chooser_change_arrow_type), chooser);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
     gtk_widget_show(mi);
   }
   mi = gtk_menu_item_new_with_label(_("Details..."));
-  g_signal_connect(GTK_OBJECT(mi), "activate",
-		     G_CALLBACK(dia_arrow_chooser_dialog_show),
-		     GTK_OBJECT(chooser));
-  gtk_container_add(GTK_CONTAINER(menu), mi);
+  g_signal_connect(G_OBJECT(mi), "activate",
+		   G_CALLBACK(dia_arrow_chooser_dialog_show), chooser);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
   gtk_widget_show(mi);
 
   return GTK_WIDGET(chooser);
 }
 
-static gint
-dia_arrow_chooser_event(GtkWidget *widget, GdkEvent *event)
-{
-  if (event->type == GDK_BUTTON_PRESS && event->button.button == 1) {
-    GtkMenu *menu = gtk_object_get_data(GTK_OBJECT(widget), button_menu_key);
-    gtk_menu_popup(menu, NULL, NULL, NULL, NULL,
-		   event->button.button, event->button.time);
-    return TRUE;
-  }
-  return FALSE;
-}
-
-static void
-dia_arrow_chooser_dialog_ok  (DiaArrowChooser *arrow)
-{
-  Arrow new_arrow = dia_arrow_selector_get_arrow(arrow->selector);
-
-  if (new_arrow.type   != arrow->arrow.type ||
-      new_arrow.length != arrow->arrow.length ||
-      new_arrow.width  != arrow->arrow.width) {
-    arrow->arrow = new_arrow;
-    dia_arrow_preview_set(arrow->preview, new_arrow.type, arrow->left);
-    if (arrow->callback)
-      (* arrow->callback)(arrow->arrow, arrow->user_data);
-  }
-  gtk_widget_hide(arrow->dialog);
-}
-
-static void
-dia_arrow_chooser_dialog_cancel (DiaArrowChooser *arrow)
-{
-  if (arrow->dialog != NULL)
-    dia_arrow_selector_set_arrow(arrow->selector, arrow->arrow);
-  gtk_widget_hide(arrow->dialog);
-}
-
-static void
-dia_arrow_chooser_dialog_destroy (DiaArrowChooser *chooser)
-{
-  /*  dia_arrow_selector_set_arrow(arrow->selector, arrow->arrow);*/
-  chooser->dialog = NULL;
-  chooser->selector = NULL;
-}
-
-static void
-dia_arrow_chooser_change_arrow_type(GtkMenuItem *mi, DiaArrowChooser *chooser)
-{
-  ArrowType atype = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(mi),
-							menuitem_enum_key));
-  Arrow arrow;
-  arrow.width = chooser->arrow.width;
-  arrow.length = chooser->arrow.length;
-  arrow.type = atype;
-  dia_arrow_chooser_set_arrow(chooser, &arrow);
-}
-
 /** Set the type of arrow shown by the arrow chooser.
  */
 void
-dia_arrow_chooser_set_arrow(DiaArrowChooser *chooser, Arrow *arrow) {
+dia_arrow_chooser_set_arrow(DiaArrowChooser *chooser, Arrow *arrow)
+{
   if (chooser->arrow.type != arrow->type) {
     dia_arrow_preview_set(chooser->preview, arrow->type, chooser->left);
     chooser->arrow.type = arrow->type;
@@ -392,6 +356,9 @@ dia_arrow_chooser_set_arrow(DiaArrowChooser *chooser, Arrow *arrow) {
   chooser->arrow.length = arrow->length;
 }
 
-ArrowType dia_arrow_chooser_get_arrow_type(DiaArrowChooser *arrow) {
+ArrowType
+dia_arrow_chooser_get_arrow_type(DiaArrowChooser *arrow)
+{
   return arrow->arrow.type;
 }
+

--- a/lib/diaarrowchooser.h
+++ b/lib/diaarrowchooser.h
@@ -19,8 +19,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-
-
 #ifndef _DIAARROWCHOOSER_H_
 #define _DIAARROWCHOOSER_H_
 
@@ -31,14 +29,17 @@
 
 
 /* --------------- DiaArrowPreview -------------------------------- */
-typedef struct _DiaArrowPreview DiaArrowPreview;
-typedef struct _DiaArrowPreviewClass DiaArrowPreviewClass;
+GType dia_arrow_preview_get_type (void);
 
-GtkType dia_arrow_preview_get_type (void);
-GtkWidget *dia_arrow_preview_new (ArrowType atype, gboolean left);
+#define DIA_TYPE_ARROW_PREVIEW            (dia_arrow_preview_get_type ())
+#define DIA_ARROW_PREVIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DIA_TYPE_ARROW_PREVIEW, DiaArrowPreview))
+#define DIA_ARROW_PREVIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), DIA_TYPE_ARROW_PREVIEW, DiaArrowPreviewClass))
+#define DIA_IS_ARROW_PREVIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DIA_TYPE_ARROW_PREVIEW))
+#define DIA_IS_ARROW_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DIA_TYPE_ARROW_PREVIEW))
+#define DIA_ARROW_PREVIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), DIA_TYPE_ARROW_PREVIEW, DiaArrowPreviewClass))
 
-#define DIA_ARROW_PREVIEW(obj) (GTK_CHECK_CAST((obj),dia_arrow_preview_get_type(), DiaArrowPreview))
-#define DIA_ARROW_PREVIEW_CLASS(obj) (GTK_CHECK_CLASS_CAST((obj), dia_arrow_preview_get_type(), DiaArrowPreviewClass))
+typedef struct _DiaArrowPreview DiaArrowPreview;
+typedef struct _DiaArrowPreviewClass DiaArrowPreviewClass;
 
 struct _DiaArrowPreview
 {
@@ -46,24 +47,30 @@ struct _DiaArrowPreview
   ArrowType atype;
   gboolean left;
 };
+
 struct _DiaArrowPreviewClass
 {
   GtkMiscClass parent_class;
 };
 
+GtkWidget *dia_arrow_preview_new (ArrowType atype, gboolean left);
+
 
 /* ------- Code for DiaArrowChooser ----------------------- */
+GType dia_arrow_chooser_get_type (void);
+
+#define DIA_TYPE_ARROW_CHOOSER            (dia_arrow_chooser_get_type ())
+#define DIA_ARROW_CHOOSER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DIA_TYPE_ARROW_CHOOSER, DiaArrowChooser))
+#define DIA_ARROW_CHOOSER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), DIA_TYPE_ARROW_CHOOSER, DiaArrowChooserClass))
+#define DIA_IS_ARROW_CHOOSER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DIA_TYPE_ARROW_CHOOSER))
+#define DIA_IS_ARROW_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DIA_TYPE_ARROW_CHOOSER))
+#define DIA_ARROW_CHOOSER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), DIA_TYPE_ARROW_CHOOSER, DiaArrowChooserClass))
 
 typedef struct _DiaArrowChooser DiaArrowChooser;
 typedef struct _DiaArrowChooserClass DiaArrowChooserClass;
 
 typedef void (*DiaChangeArrowCallback) (Arrow atype, gpointer user_data);
 
-GtkType dia_arrow_chooser_get_type (void);
-
-#define DIA_ARROW_CHOOSER(obj) (GTK_CHECK_CAST((obj),dia_arrow_chooser_get_type(), DiaArrowChooser))
-#define DIA_ARROW_CHOOSER_CLASS(obj) (GTK_CHECK_CLASS_CAST((obj), dia_arrow_chooser_get_type(), DiaArrowChooserClass))
-
 struct _DiaArrowChooser
 {
   GtkButton button;
@@ -77,6 +84,7 @@ struct _DiaArrowChooser
   GtkWidget *dialog;
   DiaArrowSelector *selector;
 };
+
 struct _DiaArrowChooserClass
 {
   GtkButtonClass parent_class;
@@ -88,4 +96,4 @@ GtkWidget *dia_arrow_chooser_new (gboolean left,
 void dia_arrow_chooser_set_arrow(DiaArrowChooser *chooser, Arrow *arrow);
 ArrowType dia_arrow_chooser_get_arrow_type(DiaArrowChooser *chooser);
 
-#endif
+#endif /* _DIAARROWCHOOSER_H_ */

--- a/lib/dialibartrenderer.c
+++ b/lib/dialibartrenderer.c
@@ -108,14 +108,6 @@ get_height_pixels (DiaRenderer *self)
 static void
 begin_render(DiaRenderer *self)
 {
-  DiaLibartRenderer *renderer = DIA_LIBART_RENDERER (self);
-  double* transmatrix;
-
-  transmatrix = g_new0(double, 6);
-  transmatrix[0] = 1.0;
-  transmatrix[4] = 1.0;
-
-  renderer->matrices = g_list_prepend(renderer->matrices, transmatrix);
 #ifdef HAVE_FREETYPE
   /* pango_ft2_get_context API docs :
    * ... Use of this function is discouraged, ...
@@ -137,10 +129,6 @@ begin_render(DiaRenderer *self)
 static void
 end_render(DiaRenderer *self)
 {
-  DiaLibartRenderer *renderer = DIA_LIBART_RENDERER (self);
-  double* transmatrix;
-  
-  g_free(renderer->matrices->data);
   dia_font_pop_context();
 }
 
@@ -317,7 +305,7 @@ draw_line(DiaRenderer *self,
 	  Color *line_color)
 {
   DiaLibartRenderer *renderer = DIA_LIBART_RENDERER (self);
-  ArtVpath *vpath, *vpath_dashed, *vpath_transformed;
+  ArtVpath *vpath, *vpath_dashed;
   ArtSVP *svp;
   guint32 rgba;
   double x,y;
@@ -346,24 +334,14 @@ draw_line(DiaRenderer *self,
     vpath = vpath_dashed;
   }
 
-#if 0 /* if only someone would initialized the matrices or is my liabrt broken ? --hb */  
-  vpath_transformed =
-    art_vpath_affine_transform(vpath, renderer->matrices->data);
-
-  art_free(vpath);
-#else
-  /* just to have minimal changes */
-  vpath_transformed = vpath;
-#endif
-
-  svp = art_svp_vpath_stroke (vpath_transformed,
+  svp = art_svp_vpath_stroke (vpath,
 			      renderer->join_style,
 			      renderer->cap_style,
 			      renderer->line_width,
 			      4,
 			      0.25);
   
-  art_free( vpath_transformed );
+  art_free( vpath );
   
   art_rgb_svp_alpha (svp,
 		     0, 0, 
@@ -545,11 +523,10 @@ draw_rect(DiaRenderer *self,
 	  Color *color)
 {
   DiaLibartRenderer *renderer = DIA_LIBART_RENDERER (self);
-  ArtVpath *vpath, *vpath_dashed, *vpath_transformed;
+  ArtVpath *vpath, *vpath_dashed;
   ArtSVP *svp;
   guint32 rgba;
   double top, bottom, left, right;
-  real translate[6];
     
   dia_transform_coords_double(renderer->transform,
                               ul_corner->x, ul_corner->y, &left, &top);
@@ -564,20 +541,20 @@ draw_rect(DiaRenderer *self,
   vpath = art_new (ArtVpath, 6);
 
   vpath[0].code = ART_MOVETO;
-  vpath[0].x = 0;
-  vpath[0].y = 0;
+  vpath[0].x = left;
+  vpath[0].y = top;
   vpath[1].code = ART_LINETO;
-  vpath[1].x = right-left;
-  vpath[1].y = 0;
+  vpath[1].x = right;
+  vpath[1].y = top;
   vpath[2].code = ART_LINETO;
-  vpath[2].x = right-left;
-  vpath[2].y = bottom-top;
+  vpath[2].x = right;
+  vpath[2].y = bottom;
   vpath[3].code = ART_LINETO;
-  vpath[3].x = 0;
-  vpath[3].y = bottom-top;
+  vpath[3].x = left;
+  vpath[3].y = bottom;
   vpath[4].code = ART_LINETO;
-  vpath[4].x = 0;
-  vpath[4].y = 0;
+  vpath[4].x = left;
+  vpath[4].y = top;
   vpath[5].code = ART_END;
   vpath[5].x = 0;
   vpath[5].y = 0;
@@ -588,22 +565,6 @@ draw_rect(DiaRenderer *self,
     vpath = vpath_dashed;
   }
 
-#if 0 /* if only someone would initialized the matrices or is my libart broken ? --hb */  
-  {
-    vpath_transformed =
-      art_vpath_affine_transform(vpath, renderer->matrices->data);
-    art_free(vpath);
-    vpath = vpath_transformed;
-  }
-#endif 
-  {
-    art_affine_translate(translate, left, top);
-    vpath_transformed =
-      art_vpath_affine_transform(vpath, translate);
-    art_free(vpath);
-    vpath = vpath_transformed;
-  }
-
   svp = art_svp_vpath_stroke (vpath,
 			      renderer->join_style,
 			      renderer->cap_style,
@@ -611,7 +572,7 @@ draw_rect(DiaRenderer *self,
 			      4,
 			      0.25);
   
-  art_free( vpath_transformed );
+  art_free( vpath );
   
   art_rgb_svp_alpha (svp,
 		     0, 0, 
@@ -634,8 +595,6 @@ fill_rect(DiaRenderer *self,
   ArtSVP *svp;
   guint32 rgba;
   double top, bottom, left, right;
-  ArtVpath *vpath_transformed;
-  double translate[6];
     
   dia_transform_coords_double(renderer->transform,
                               ul_corner->x, ul_corner->y, &left, &top);
@@ -650,38 +609,24 @@ fill_rect(DiaRenderer *self,
   vpath = art_new (ArtVpath, 6);
 
   vpath[0].code = ART_MOVETO;
-  vpath[0].x = 0;
-  vpath[0].y = 0;
+  vpath[0].x = left;
+  vpath[0].y = top;
   vpath[1].code = ART_LINETO;
-  vpath[1].x = right-left;
-  vpath[1].y = 0;
+  vpath[1].x = right;
+  vpath[1].y = top;
   vpath[2].code = ART_LINETO;
-  vpath[2].x = right-left;
-  vpath[2].y = bottom-top;
+  vpath[2].x = right;
+  vpath[2].y = bottom;
   vpath[3].code = ART_LINETO;
-  vpath[3].x = 0;
-  vpath[3].y = bottom-top;
+  vpath[3].x = left;
+  vpath[3].y = bottom;
   vpath[4].code = ART_LINETO;
-  vpath[4].x = 0;
-  vpath[4].y = 0;
+  vpath[4].x = left;
+  vpath[4].y = top;
   vpath[5].code = ART_END;
   vpath[5].x = 0;
   vpath[5].y = 0;
   
-  /*  {
-    vpath_transformed =
-      art_vpath_affine_transform(vpath, renderer->matrices->data);
-    art_free(vpath);
-    vpath = vpath_transformed;
-    }*/
-  {
-    art_affine_translate(translate, left, top);
-    vpath_transformed =
-      art_vpath_affine_transform(vpath, translate);
-    art_free(vpath);
-    vpath = vpath_transformed;
-  }
-
   svp = art_svp_from_vpath (vpath);
   
   art_free( vpath );
@@ -1412,27 +1357,13 @@ draw_image(DiaRenderer *self,
 static void
 draw_object (DiaRenderer *renderer, DiaObject *object)
 {
-  DiaLibartRenderer *libart_rend = DIA_LIBART_RENDERER(renderer);
-
   if (object->highlight_color != NULL) {
+    DiaLibartRenderer *libart_rend = DIA_LIBART_RENDERER(renderer);
     libart_rend->highlight_color = object->highlight_color;
     object->ops->draw(object, renderer);
     libart_rend->highlight_color = NULL;
   }
-  if (object->affine.rotation != 0.0) {
-    double rotmatrix[6];
-    double* transmatrix = g_new0(double, 6);
-
-    art_affine_rotate(rotmatrix, object->affine.rotation);
-    art_affine_multiply(transmatrix, (double*)libart_rend->matrices->data, rotmatrix);
-    libart_rend->matrices = g_list_prepend(libart_rend->matrices, transmatrix);
-  }
   object->ops->draw(object, renderer);
-  if (object->affine.rotation != 0.0) {
-    g_free(libart_rend->matrices->data);
-    libart_rend->matrices = g_list_delete_link(libart_rend->matrices,
-					       libart_rend->matrices);
-  }
 }
 
 static void

--- a/lib/dialibartrenderer.h
+++ b/lib/dialibartrenderer.h
@@ -46,10 +46,6 @@ struct _DiaLibartRenderer
   double dash_length;
   double dot_length;
   Color *highlight_color;
-  /** Stack of matrices of rotation/translation/scaling.
-   * Is a stack to allow groups to easily rotate.
-   */
-  GList *matrices;
 #endif
 };
 

--- a/lib/object.c
+++ b/lib/object.c
@@ -27,8 +27,6 @@
 
 #include "dummy_dep.h"
 
-PropNumData rotation_data = {0.0, 360.0, 1.0 };
-
 void object_init(DiaObject *obj, int num_handles, int num_connections);
 
 void

--- a/lib/object.h
+++ b/lib/object.h
@@ -438,21 +438,16 @@ struct _DiaObjectType {
 			      the .sheet file */
 };
 
-PropNumData rotation_data;
-
 /* base property stuff ... */
 #define OBJECT_COMMON_PROPERTIES \
   { "obj_pos", PROP_TYPE_POINT, 0, \
-    "DiaObject position", "Where the object is located"}, \
+    "Object position", "Where the object is located"}, \
   { "obj_bb", PROP_TYPE_RECT, 0, \
-    "DiaObject bounding box", "The bounding box of the object"}, \
-  { "obj_rotate", PROP_TYPE_REAL, PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL, \
-    N_("Rotation"), "Degrees of rotation", &rotation_data }
+    "Object bounding box", "The bounding box of the object"}
 
 #define OBJECT_COMMON_PROPERTIES_OFFSETS \
   { "obj_pos", PROP_TYPE_POINT, offsetof(DiaObject, position) }, \
-  { "obj_bb", PROP_TYPE_RECT, offsetof(DiaObject, bounding_box) }, \
-  { "obj_rotate", PROP_TYPE_REAL, offsetof(DiaObject, affine.rotation) }
+  { "obj_bb", PROP_TYPE_RECT, offsetof(DiaObject, bounding_box) }
 
 
 gboolean       dia_object_defaults_load (const gchar *filename,

--- a/objects/standard/line.c
+++ b/objects/standard/line.c
@@ -140,6 +140,7 @@ static PropDescription line_props[] = {
     N_("Start point"), NULL },
   { "end_point", PROP_TYPE_POINT, 0,
     N_("End point"), NULL },
+  /*
   PROP_FRAME_BEGIN("gaps",0,N_("Line gaps")),
   { "absolute_start_gap", PROP_TYPE_REAL, 0,
     N_("Absolute start gap"), NULL, &gap_range },
@@ -150,6 +151,7 @@ static PropDescription line_props[] = {
   { "fractional_end_gap", PROP_TYPE_REAL, 0,
     N_("Fractional end gap"), NULL, &gap_range },
   PROP_FRAME_END("gaps",0),
+  */
   PROP_DESC_END
 };
 
@@ -171,10 +173,12 @@ static PropOffset line_offsets[] = {
   { "end_arrow", PROP_TYPE_ARROW, offsetof(Line, end_arrow) },
   { "start_point", PROP_TYPE_POINT, offsetof(Connection, endpoints[0]) },
   { "end_point", PROP_TYPE_POINT, offsetof(Connection, endpoints[1]) },
+  /*
   { "absolute_start_gap", PROP_TYPE_REAL, offsetof(Line, absolute_start_gap) },
   { "absolute_end_gap", PROP_TYPE_REAL, offsetof(Line, absolute_end_gap) },
   { "fractional_start_gap", PROP_TYPE_REAL, offsetof(Line, fractional_start_gap) },
   { "fractional_end_gap", PROP_TYPE_REAL, offsetof(Line, fractional_end_gap) },
+  */
   { NULL, 0, 0 }
 };
 

--- a/plug-ins/wmf/wmf.cpp
+++ b/plug-ins/wmf/wmf.cpp
@@ -149,9 +149,6 @@ UsePen(WmfRenderer* renderer, Color* colour)
 
           switch (renderer->fnPenStyle & PS_STYLE_MASK) {
 	  case PS_SOLID :
-	    num_dashes = 2;
-	    dashes[0] = dashlen;
-	    dashes[1] = 0;
 	    break;
 	  case PS_DASH :
 	    num_dashes = 2;

--- a/shapes/Makefile.am
+++ b/shapes/Makefile.am
@@ -1,7 +1,7 @@
 
 SUBDIRS = Circuit flowchart Contact network Pneumatic Electric \
 	Civil jigsaw MSE SDL Logic sybase Misc Assorted Cisco \
-	Cybernetics Map ChemEng
+	Cybernetics Map ChemEng RDP
 
 
 

--- a/shapes/network/Makefile.am
+++ b/shapes/network/Makefile.am
@@ -66,7 +66,7 @@ SHAPES = \
 	digitizing_board.shape \
 	digitizing_board.png \
 	patch-panel.shape  \
-	patch-panel.png
+	patch-panel.xpm
 
 EXTRA_DIST = $(SHAPES)