diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-03-05 21:59:02 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Zenotz <jtx@jtx.marker.es> | 2013-03-05 21:59:02 +0000 |
| commit | 58d7a0e0ef39488839985440c6f87a78d112e15f (patch) | |
| tree | bb4b02b5a787701ee489b2748450ed594548c584 /src/interface.cpp | |
| parent | BPower for testing. (diff) | |
| parent | Added null check (should fix Bug #1051017 ) (diff) | |
| download | inkscape-58d7a0e0ef39488839985440c6f87a78d112e15f.tar.gz inkscape-58d7a0e0ef39488839985440c6f87a78d112e15f.zip | |
merge from trunk
(bzr r11950.1.46)
Diffstat (limited to 'src/interface.cpp')
| -rw-r--r-- | src/interface.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/interface.cpp b/src/interface.cpp index 284368bff..bf497b407 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -1539,14 +1539,16 @@ sp_ui_menu_item_set_name(GtkWidget *data, Glib::ustring const &name) //- a GtkHBox, whose first child is a label displaying name if the menu //item has an accel key //- a GtkLabel if the menu has no accel key - if (GTK_IS_LABEL(child)) { - gtk_label_set_markup_with_mnemonic(GTK_LABEL (child), name.c_str()); - } else if (GTK_IS_HBOX(child)) { - gtk_label_set_markup_with_mnemonic( - GTK_LABEL (gtk_container_get_children(GTK_CONTAINER (child))->data), - name.c_str()); - }//else sp_ui_menu_append_item_from_verb has been modified and can set - //a menu item in yet another way... + if (child != NULL){ + if (GTK_IS_LABEL(child)) { + gtk_label_set_markup_with_mnemonic(GTK_LABEL (child), name.c_str()); + } else if (GTK_IS_HBOX(child)) { + gtk_label_set_markup_with_mnemonic( + GTK_LABEL (gtk_container_get_children(GTK_CONTAINER (child))->data), + name.c_str()); + }//else sp_ui_menu_append_item_from_verb has been modified and can set + //a menu item in yet another way... + } } } |