diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2010-09-10 08:34:09 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2010-09-10 08:34:09 +0000 |
| commit | d454d77da77d1ef2b5b0ccaed5698871bd5f9d3e (patch) | |
| tree | f43407a1dc9376006272bcb50d07b7b9c500a0dc /src/shortcuts.cpp | |
| parent | Extensions. Consistency fix and UI improvements (Text, Path and Web submenus). (diff) | |
| download | inkscape-d454d77da77d1ef2b5b0ccaed5698871bd5f9d3e.tar.gz inkscape-d454d77da77d1ef2b5b0ccaed5698871bd5f9d3e.zip | |
Fixed valgrind-detected issue with tooltip shortcuts and profile manager on delete.
(bzr r9753)
Diffstat (limited to 'src/shortcuts.cpp')
| -rw-r--r-- | src/shortcuts.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp index d02ef6e48..bf7fb8a43 100644 --- a/src/shortcuts.cpp +++ b/src/shortcuts.cpp @@ -199,16 +199,17 @@ sp_shortcut_get_verb(unsigned int shortcut) return (Inkscape::Verb *)(g_hash_table_lookup(verbs, GINT_TO_POINTER(shortcut))); } -unsigned int -sp_shortcut_get_primary(Inkscape::Verb *verb) +unsigned int sp_shortcut_get_primary(Inkscape::Verb *verb) { - if (!primary_shortcuts) sp_shortcut_init(); - gpointer value; - if (g_hash_table_lookup_extended(primary_shortcuts, (gpointer)(verb), NULL, &value)) { - return (unsigned int)GPOINTER_TO_INT(value); - } else { - return GDK_VoidSymbol; + unsigned int result = GDK_VoidSymbol; + if (!primary_shortcuts) { + sp_shortcut_init(); } + gpointer value = 0; + if (g_hash_table_lookup_extended(primary_shortcuts, static_cast<gpointer>(verb), NULL, &value)) { + result = static_cast<unsigned int>(GPOINTER_TO_INT(value)); + } + return result; } gchar* sp_shortcut_get_label (unsigned int shortcut) |