summaryrefslogtreecommitdiffstats
path: root/src/ege-select-one-action.cpp
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2010-05-13 12:16:04 +0000
committertavmjong-free <tavmjong@free.fr>2010-05-13 12:16:04 +0000
commit4e30cc37538c7d0c68a8183f352fa4c96476cc17 (patch)
tree3a87902fac0169dcba44f7b8c8871de9cd5134a1 /src/ege-select-one-action.cpp
parenti18n, extensions. Fix untranslatable XML elements when the value contains ent... (diff)
downloadinkscape-4e30cc37538c7d0c68a8183f352fa4c96476cc17.tar.gz
inkscape-4e30cc37538c7d0c68a8183f352fa4c96476cc17.zip
Get rid of unneeded labels when the icons are self-explanatory.
(bzr r9410)
Diffstat (limited to 'src/ege-select-one-action.cpp')
-rw-r--r--src/ege-select-one-action.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/ege-select-one-action.cpp b/src/ege-select-one-action.cpp
index 32c1ef9b4..199b0cf68 100644
--- a/src/ege-select-one-action.cpp
+++ b/src/ege-select-one-action.cpp
@@ -665,7 +665,10 @@ GtkWidget* create_tool_item( GtkAction* action )
gchar* sss = 0;
g_object_get( G_OBJECT(action), "short_label", &sss, NULL );
- if (sss) {
+ // If short_label not defined, g_object_get will return label.
+ // This hack allows a label to be used with a drop-down menu when
+ // no label is used with a set of icons that are self-explanatory.
+ if (sss && strcmp( sss, "NotUsed" ) != 0 ) {
GtkWidget* lbl;
lbl = gtk_label_new(sss);
gtk_box_pack_start( GTK_BOX(holder), lbl, FALSE, FALSE, 4 );