Commit: 428fc8b549a7b751cf0482652ef0b83e17dcc793 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: 428fc8b549a7b751cf0482652ef0b83e17dcc793 (tree)
• Time: 2004-03-20 19:25:07
• Author: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Version 0.93-pre1

Change Summary

• modified: ChangeLog
• modified: config.h.win32
• modified: configure.in
• modified: dia.spec
• modified: doc/en/Makefile.am
• modified: doc/en/dia-manual.xml
• modified: doc/pl/Makefile.am
• modified: lib/dialinechooser.c
• modified: lib/dialinechooser.h
• modified: lib/pixmaps/Makefile.am
• modified: xmldocs.make

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* xmldocs.make: Fixed apparent uninstall error.
+
+	* config.h.win32: 
+	* doc/en/dia-manual.xml: 
+	* doc/pl/dia-manual.xml: 
+	* dia.spec: 
+	* configure.in: 
+	* NEWS: Version 0.93-pre1.
+
+	* lib/dialinechooser.[ch]: Patch from [e-mail] (paolo
+	borelli):  Remove some deprecated stuff.
+
 2004-03-18  Lars Clausen  <[e-mail]>
 
 	* Makefile.am: Try better uninstall thing for scrollkeeper.

--- a/config.h.win32
+++ b/config.h.win32
@@ -15,7 +15,7 @@
 #define GETTEXT_PACKAGE "dia"
 #define LOCALEDIR "../lib/locale"
 
-#define VERSION "0.92.2+cvs"
+#define VERSION "0.93-pre1"
 
 /*
  * We are linking libxml as DLL with either msvc or mingw, but this

--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this -*- autoconf -*- file with autoconf to produce a 
 dnl configure script.
-AC_INIT(dia, 0.92.2+cvs, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
+AC_INIT(dia, 0.93-pre1, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
 AC_CONFIG_SRCDIR(app/diagram.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 

--- a/dia.spec
+++ b/dia.spec
@@ -1,12 +1,12 @@
 %define name dia
 # This is the full Dia version
-%define ver 0.92.2
+%define ver 0.93
 
 Summary: A gtk+ based diagram creation program.
 Name: %name
 Version: %ver
 # This indicates changes to the spec file after last time %ver has changed.
-Release: 1
+Release: pre1
 Copyright: GPL
 Group: Applications/
 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{ver}.tar.gz

--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -7,6 +7,12 @@ entities=
 include $(top_srcdir)/xmldocs.make
 dist-hook: app-dist-hook
 
-EXTRA_DIST = dia.1 dia-manual.xml
+EXTRA_DIST += \
+	dia.1 \
+	dia-manual.xml \
+	graphics/line_props.png \
+	graphics/home_network.png \
+	graphics/line_icon.png \
+	graphics/greendots.png
 
 man_MANS = dia.1

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

--- a/doc/pl/Makefile.am
+++ b/doc/pl/Makefile.am
@@ -7,4 +7,8 @@ entities=
 include $(top_srcdir)/xmldocs.make
 dist-hook: app-dist-hook
 
-EXTRA_DIST = dia-manual.xml
+EXTRA_DIST += \
+	dia-manual.xml \
+	graphics/line_props.png \
+	graphics/home_network.png \
+	graphics/greendots.png

--- a/lib/dialinechooser.c
+++ b/lib/dialinechooser.c
@@ -23,8 +23,6 @@
 #include <config.h>
 #endif
 
-#undef GTK_DISABLE_DEPRECATED /* GtkTypeInfo, gtk_widget_queue_clear, ... */
-
 #include "intl.h"
 #include "widgets.h"
 #include "dialinechooser.h"
@@ -32,16 +30,9 @@
 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;
-}
-
 
 /* --------------- DiaLinePreview -------------------------------- */
 
-static GtkType dia_line_preview_get_type (void);
 static void dia_line_preview_set(DiaLinePreview *line, LineStyle lstyle);
 
 static void dia_line_preview_class_init (DiaLinePreviewClass  *klass);
@@ -49,25 +40,28 @@ static void dia_line_preview_init       (DiaLinePreview       *arrow);
 static gint dia_line_preview_expose     (GtkWidget      *widget,
 					 GdkEventExpose *event);
 
-static GtkType
+GType
 dia_line_preview_get_type (void)
 {
-  static GtkType line_type = 0;
-
-  if (!line_type) {
-      static const GtkTypeInfo line_info = {
-        "DiaLinePreview",
-        sizeof (DiaLinePreview),
-        sizeof (DiaLinePreviewClass),
-        (GtkClassInitFunc) dia_line_preview_class_init,
-        (GtkObjectInitFunc) dia_line_preview_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-      line_type = gtk_type_unique (GTK_TYPE_MISC, &line_info);
-    }
-  return line_type;
+  static GType type = 0;
+
+  if (!type) {
+    static const GTypeInfo info = {
+      sizeof (DiaLinePreviewClass),
+      (GBaseInitFunc) NULL,
+      (GBaseFinalizeFunc) NULL,
+      (GClassInitFunc) dia_line_preview_class_init,
+      (GClassFinalizeFunc) NULL,
+      NULL,
+      sizeof (DiaLinePreview),
+      0,
+      (GInstanceInitFunc) dia_line_preview_init
+    };
+
+    type = g_type_register_static (GTK_TYPE_MISC, "DiaLinePreview", &info, 0);
+  }
+
+  return type;
 }
 
 static void
@@ -75,7 +69,7 @@ dia_line_preview_class_init (DiaLinePreviewClass *class)
 {
   GtkWidgetClass *widget_class;
 
-  widget_class = (GtkWidgetClass *)class;
+  widget_class = GTK_WIDGET_CLASS(class);
   widget_class->expose_event = dia_line_preview_expose;
 }
 
@@ -87,14 +81,13 @@ dia_line_preview_init (DiaLinePreview *line)
   GTK_WIDGET (line)->requisition.width = 40 + GTK_MISC (line)->xpad * 2;
   GTK_WIDGET (line)->requisition.height = 15 + GTK_MISC (line)->ypad * 2;
 
-  
   line->lstyle = LINESTYLE_SOLID;
 }
 
 GtkWidget *
 dia_line_preview_new (LineStyle lstyle)
 {
-  DiaLinePreview *line = gtk_type_new (dia_line_preview_get_type());
+  DiaLinePreview *line = g_object_new(DIA_TYPE_LINE_PREVIEW, NULL);
 
   line->lstyle = lstyle;
   return GTK_WIDGET(line);
@@ -106,7 +99,7 @@ dia_line_preview_set(DiaLinePreview *line, LineStyle lstyle)
   if (line->lstyle != lstyle) {
     line->lstyle = lstyle;
     if (GTK_WIDGET_DRAWABLE(line))
-      gtk_widget_queue_clear(GTK_WIDGET(line));
+      gtk_widget_queue_draw(GTK_WIDGET(line));
   }
 }
 
@@ -187,32 +180,41 @@ dia_line_preview_expose(GtkWidget *widget, GdkEventExpose *event)
 
 static void dia_line_chooser_class_init (DiaLineChooserClass  *klass);
 static void dia_line_chooser_init       (DiaLineChooser       *arrow);
-static gint dia_line_chooser_event      (GtkWidget *widget,
-					  GdkEvent *event);
-static void dia_line_chooser_dialog_ok  (DiaLineChooser *lchooser);
-static void dia_line_chooser_dialog_cancel (DiaLineChooser *lchooser);
-static void dia_line_chooser_change_line_style (GtkMenuItem *mi,
-						DiaLineChooser *lchooser);
-
-GtkType
+
+GType
 dia_line_chooser_get_type (void)
 {
-  static GtkType arrow_type = 0;
-
-  if (!arrow_type) {
-      static const GtkTypeInfo arrow_info = {
-        "DiaLineChooser",
-        sizeof (DiaLineChooser),
-        sizeof (DiaLineChooserClass),
-        (GtkClassInitFunc) dia_line_chooser_class_init,
-        (GtkObjectInitFunc) dia_line_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 (DiaLineChooserClass),
+      (GBaseInitFunc) NULL,
+      (GBaseFinalizeFunc) NULL,
+      (GClassInitFunc) dia_line_chooser_class_init,
+      (GClassFinalizeFunc) NULL,
+      NULL,
+      sizeof (DiaLineChooser),
+      0,
+      (GInstanceInitFunc) dia_line_chooser_init
+    };
+
+    type = g_type_register_static (GTK_TYPE_BUTTON, "DiaLineChooser", &info, 0);
+  }
+
+  return type;
+}
+
+static gint
+dia_line_chooser_event(GtkWidget *widget, GdkEvent *event)
+{
+  if (event->type == GDK_BUTTON_PRESS && event->button.button == 1) {
+    GtkMenu *menu = g_object_get_data(G_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
@@ -220,11 +222,54 @@ dia_line_chooser_class_init (DiaLineChooserClass *class)
 {
   GtkWidgetClass *widget_class;
 
-  widget_class = (GtkWidgetClass *)class;
+  widget_class = GTK_WIDGET_CLASS(class);
   widget_class->event = dia_line_chooser_event;
 }
 
 static void
+dia_line_chooser_dialog_response (GtkWidget *dialog,
+                                  gint response_id,
+                                  DiaLineChooser *lchooser)
+{
+  LineStyle new_style;
+  real new_dash;
+
+  if (response_id == GTK_RESPONSE_OK) {
+    dia_line_style_selector_get_linestyle(lchooser->selector,
+					  &new_style, &new_dash);
+    if (new_style != lchooser->lstyle || new_dash != lchooser->dash_length) {
+      lchooser->lstyle = new_style;
+      lchooser->dash_length = new_dash;
+      dia_line_preview_set(lchooser->preview, new_style);
+      if (lchooser->callback)
+        (* lchooser->callback)(new_style, new_dash, lchooser->user_data);
+    }
+  } else {
+    dia_line_style_selector_set_linestyle(lchooser->selector,
+                                          lchooser->lstyle,
+                                          lchooser->dash_length);
+  }
+  gtk_widget_hide(lchooser->dialog);
+}
+
+static void
+dia_line_chooser_change_line_style(GtkMenuItem *mi, DiaLineChooser *lchooser)
+{
+  LineStyle lstyle = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(mi),
+						       menuitem_enum_key));
+
+  if (lchooser->lstyle != lstyle) {
+    dia_line_preview_set(lchooser->preview, lstyle);
+    lchooser->lstyle = lstyle;
+    dia_line_style_selector_set_linestyle(lchooser->selector, lchooser->lstyle,
+					  lchooser->dash_length);
+    if (lchooser->callback)
+      (* lchooser->callback)(lchooser->lstyle, lchooser->dash_length,
+			     lchooser->user_data);
+  }
+}
+
+static void
 dia_line_chooser_init (DiaLineChooser *lchooser)
 {
   GtkWidget *wid;
@@ -239,10 +284,18 @@ dia_line_chooser_init (DiaLineChooser *lchooser)
   gtk_widget_show(wid);
   lchooser->preview = DIA_LINE_PREVIEW(wid);
 
-  lchooser->dialog = wid = gtk_dialog_new();
-  gtk_window_set_title(GTK_WINDOW(wid), _("Line Style Properties"));
-  g_signal_connect(GTK_OBJECT(wid), "delete_event",
-		     G_CALLBACK(close_and_hide), NULL);
+  lchooser->dialog = gtk_dialog_new_with_buttons(_("Line Style 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(lchooser->dialog),
+                                  GTK_RESPONSE_OK);
+  g_signal_connect(G_OBJECT(lchooser->dialog), "response",
+                   G_CALLBACK(dia_line_chooser_dialog_response), lchooser);
 
   wid = dia_line_style_selector_new();
   gtk_container_set_border_width(GTK_CONTAINER(wid), 5);
@@ -251,54 +304,32 @@ dia_line_chooser_init (DiaLineChooser *lchooser)
   gtk_widget_show(wid);
   lchooser->selector = DIALINESTYLESELECTOR(wid);
 
-  wid = gtk_button_new_with_label(_("OK"));
-  GTK_WIDGET_SET_FLAGS(wid, GTK_CAN_DEFAULT);
-  gtk_container_add(GTK_CONTAINER(GTK_DIALOG(lchooser->dialog)->action_area),
-		    wid);
-  gtk_widget_grab_default(wid);
-  g_signal_connect_swapped(GTK_OBJECT(wid), "clicked",
-			    G_CALLBACK(dia_line_chooser_dialog_ok),
-			    GTK_OBJECT(lchooser));
-  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(lchooser->dialog)->action_area),
-		    wid);
-  g_signal_connect_swapped(GTK_OBJECT(wid), "clicked",
-			    G_CALLBACK(dia_line_chooser_dialog_cancel),
-			    GTK_OBJECT(lchooser));
-
   menu = gtk_menu_new();
-  gtk_object_set_data_full(GTK_OBJECT(lchooser), button_menu_key, menu,
-			   (GtkDestroyNotify)gtk_widget_unref);
+  g_object_set_data_full(G_OBJECT(lchooser), button_menu_key, menu,
+			 (GDestroyNotify)gtk_widget_unref);
   for (i = 0; i <= LINESTYLE_DOTTED; i++) {
     mi = gtk_menu_item_new();
-    gtk_object_set_data(GTK_OBJECT(mi), menuitem_enum_key, GINT_TO_POINTER(i));
+    g_object_set_data(G_OBJECT(mi), menuitem_enum_key, GINT_TO_POINTER(i));
     ln = dia_line_preview_new(i);
     gtk_container_add(GTK_CONTAINER(mi), ln);
     gtk_widget_show(ln);
-    g_signal_connect(GTK_OBJECT(mi), "activate",
-		       G_CALLBACK(dia_line_chooser_change_line_style),
-		       lchooser);
-    gtk_container_add(GTK_CONTAINER(menu), mi);
-    gtk_widget_show(mi);
+    g_signal_connect(G_OBJECT(mi), "activate",
+		     G_CALLBACK(dia_line_chooser_change_line_style), lchooser);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+    gtk_widget_show (mi);
   }
   mi = gtk_menu_item_new_with_label(_("Details..."));
-  g_signal_connect_swapped(GTK_OBJECT(mi), "activate",
-			    G_CALLBACK(gtk_widget_show),
-			    GTK_OBJECT(lchooser->dialog));
-  gtk_container_add(GTK_CONTAINER(menu), mi);
-  gtk_widget_show(mi);
-
-  gtk_widget_show(wid);
+  g_signal_connect_swapped(G_OBJECT(mi), "activate",
+			   G_CALLBACK(gtk_widget_show), lchooser->dialog);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+  gtk_widget_show (mi);
 }
 
 GtkWidget *
 dia_line_chooser_new(DiaChangeLineCallback callback,
 		     gpointer user_data)
 {
-  DiaLineChooser *chooser = gtk_type_new(dia_line_chooser_get_type());
+  DiaLineChooser *chooser = g_object_new(DIA_TYPE_LINE_CHOOSER, NULL);
 
   chooser->callback = callback;
   chooser->user_data = user_data;
@@ -306,57 +337,3 @@ dia_line_chooser_new(DiaChangeLineCallback callback,
   return GTK_WIDGET(chooser);
 }
 
-static gint
-dia_line_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_line_chooser_dialog_ok (DiaLineChooser *lchooser)
-{
-  LineStyle new_style;
-  real new_dash;
-
-  dia_line_style_selector_get_linestyle(lchooser->selector,
-					&new_style, &new_dash);
-  if (new_style != lchooser->lstyle || new_dash != lchooser->dash_length) {
-    lchooser->lstyle = new_style;
-    lchooser->dash_length = new_dash;
-    dia_line_preview_set(lchooser->preview, new_style);
-    if (lchooser->callback)
-      (* lchooser->callback)(new_style, new_dash, lchooser->user_data);
-  }
-  gtk_widget_hide(lchooser->dialog);
-}
-static void
-dia_line_chooser_dialog_cancel (DiaLineChooser *lchooser)
-{
-  dia_line_style_selector_set_linestyle(lchooser->selector, lchooser->lstyle,
-					lchooser->dash_length);
-  gtk_widget_hide(lchooser->dialog);
-}
-
-static void
-dia_line_chooser_change_line_style(GtkMenuItem *mi, DiaLineChooser *lchooser)
-{
-  LineStyle lstyle = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(mi),
-							 menuitem_enum_key));
-
-  if (lchooser->lstyle != lstyle) {
-    dia_line_preview_set(lchooser->preview, lstyle);
-    lchooser->lstyle = lstyle;
-    dia_line_style_selector_set_linestyle(lchooser->selector, lchooser->lstyle,
-					  lchooser->dash_length);
-    if (lchooser->callback)
-      (* lchooser->callback)(lchooser->lstyle, lchooser->dash_length,
-			     lchooser->user_data);
-  }
-}
-

--- a/lib/dialinechooser.h
+++ b/lib/dialinechooser.h
@@ -18,6 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+
 #ifndef DIALINECHOOSER_H
 #define DIALINECHOOSER_H
 
@@ -26,30 +27,41 @@
 #include <gtk/gtk.h>
 
 /* --------------- DiaLinePreview -------------------------------- */
-typedef struct _DiaLinePreview DiaLinePreview;
-typedef struct _DiaLinePreviewClass DiaLinePreviewClass;
-
+GType dia_line_preview_get_type (void);
 
-#define DIA_LINE_PREVIEW(obj) (GTK_CHECK_CAST((obj),dia_line_preview_get_type(), DiaLinePreview))
-#define DIA_LINE_PREVIEW_CLASS(obj) (GTK_CHECK_CLASS_CAST((obj), dia_line_preview_get_type(), DiaLinePreviewClass))
+#define DIA_TYPE_LINE_PREVIEW            (dia_line_preview_get_type ())
+#define DIA_LINE_PREVIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DIA_TYPE_LINE_PREVIEW, DiaLinePreview))
+#define DIA_LINE_PREVIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), DIA_TYPE_LINE_PREVIEW, DiaLinePreviewClass))
+#define DIA_IS_LINE_PREVIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DIA_TYPE_LINE_PREVIEW))
+#define DIA_IS_LINE_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DIA_TYPE_LINE_PREVIEW))
+#define DIA_LINE_PREVIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), DIA_TYPE_LINE_PREVIEW, DiaLinePreviewClass))
 
-GtkWidget *dia_line_preview_new (LineStyle lstyle);
+typedef struct _DiaLinePreview DiaLinePreview;
+typedef struct _DiaLinePreviewClass DiaLinePreviewClass;
 
 struct _DiaLinePreview
 {
   GtkMisc misc;
   LineStyle lstyle;
 };
+
 struct _DiaLinePreviewClass
 {
   GtkMiscClass parent_class;
 };
 
+GtkWidget *dia_line_preview_new (LineStyle lstyle);
+
+
 /* ------- Code for DiaLineChooser ---------------------- */
-GtkType dia_line_chooser_get_type (void);
+GType dia_line_chooser_get_type (void);
 
-#define DIA_LINE_CHOOSER(obj) (GTK_CHECK_CAST((obj),dia_line_chooser_get_type(), DiaLineChooser))
-#define DIA_LINE_CHOOSER_CLASS(obj) (GTK_CHECK_CLASS_CAST((obj), dia_line_chooser_get_type(), DiaLineChooserClass))
+#define DIA_TYPE_LINE_CHOOSER            (dia_line_chooser_get_type ())
+#define DIA_LINE_CHOOSER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DIA_TYPE_LINE_CHOOSER, DiaLineChooser))
+#define DIA_LINE_CHOOSER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), DIA_TYPE_LINE_CHOOSER, DiaLineChooserClass))
+#define DIA_IS_LINE_CHOOSER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DIA_TYPE_LINE_CHOOSER))
+#define DIA_IS_LINE_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DIA_TYPE_LINE_CHOOSER))
+#define DIA_LINE_CHOOSER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), DIA_TYPE_LINE_CHOOSER, DiaLineChooserClass))
 
 typedef struct _DiaLineChooser DiaLineChooser;
 typedef struct _DiaLineChooserClass DiaLineChooserClass;
@@ -70,6 +82,7 @@ struct _DiaLineChooser
   GtkWidget *dialog;
   DiaLineStyleSelector *selector;
 };
+
 struct _DiaLineChooserClass
 {
   GtkButtonClass parent_class;
@@ -79,4 +92,5 @@ struct _DiaLineChooserClass
 GtkWidget *dia_line_chooser_new  (DiaChangeLineCallback callback,
 				  gpointer user_data);
 
-#endif
+
+#endif /* DIALINECHOOSER_H */

--- a/lib/pixmaps/Makefile.am
+++ b/lib/pixmaps/Makefile.am
@@ -6,4 +6,3 @@ IMAGES = \
 
 EXTRA_DIST = $(IMAGES)
 image_DATA = $(IMAGES)
-

--- a/xmldocs.make
+++ b/xmldocs.make
@@ -83,7 +83,7 @@ uninstall-local-doc:
 	-if test "$(figdir)"; then \
 	  for file in $(srcdir)/$(figdir)/*.png; do \
 	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-	    rm -f $(docdir)/$(figdir)/$$basefile; \
+	    rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
 	  done; \
 	  rmdir $(DESTDIR)$(docdir)/$(figdir); \
 	fi