summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2011-07-09 14:48:49 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2011-07-09 14:48:49 +0000
commit076ea1e5cfd8f4c78638e71405a7dda8de7aa17f (patch)
tree9a9e8b16a7852d9d636ff2a19b5f12f003145b4c /src
parentMerge upstream GDL 0.7.8 changes (diff)
downloadinkscape-076ea1e5cfd8f4c78638e71405a7dda8de7aa17f.tar.gz
inkscape-076ea1e5cfd8f4c78638e71405a7dda8de7aa17f.zip
Merge upstream GDL 0.7.9 changes
(bzr r10431)
Diffstat (limited to 'src')
-rw-r--r--src/libgdl/gdl-dock-item.c2
-rw-r--r--src/libgdl/gdl-tools.h3
2 files changed, 3 insertions, 2 deletions
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 <darin@bentspoon.com>