From 076ea1e5cfd8f4c78638e71405a7dda8de7aa17f Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sat, 9 Jul 2011 15:48:49 +0100 Subject: Merge upstream GDL 0.7.9 changes (bzr r10431) --- src/libgdl/gdl-dock-item.c | 2 +- src/libgdl/gdl-tools.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/libgdl/gdl-dock-item.c b/src/libgdl/gdl-dock-item.c index db31ade30..c8151fe95 100644 --- a/src/libgdl/gdl-dock-item.c +++ b/src/libgdl/gdl-dock-item.c @@ -301,7 +301,7 @@ gdl_dock_item_class_init (GdlDockItemClass *klass) g_object_class, PROP_RESIZE, g_param_spec_boolean ("resize", _("Resizable"), _("If set, the dock item can be resized when " - "docked in a panel"), + "docked in a GtkPanel widget"), TRUE, G_PARAM_READWRITE)); diff --git a/src/libgdl/gdl-tools.h b/src/libgdl/gdl-tools.h index 2cc68c035..4e515b23b 100644 --- a/src/libgdl/gdl-tools.h +++ b/src/libgdl/gdl-tools.h @@ -79,9 +79,10 @@ G_BEGIN_DECLS #endif /* DO_GDL_TRACE */ -/** +/* * Class boilerplate and base class call macros copied from * bonobo/bonobo-macros.h. Original copyright follows. + * * * Author: * Darin Adler -- cgit v1.2.3