diff options
| author | MenTaLguY <mental@rydia.net> | 2006-04-15 22:04:04 +0000 |
|---|---|---|
| committer | mental <mental@users.sourceforge.net> | 2006-04-15 22:04:04 +0000 |
| commit | b44875ab2cfe22243e87cdcb98ac0582fb44786e (patch) | |
| tree | 8f36a58b69cfa4d0d020c4cef23c9fc8a8bc14b0 /src/shortcuts.cpp | |
| parent | fix node position when joining to close subpath; allow to lock the position o... (diff) | |
| download | inkscape-b44875ab2cfe22243e87cdcb98ac0582fb44786e.tar.gz inkscape-b44875ab2cfe22243e87cdcb98ac0582fb44786e.zip | |
minor cleanups
(bzr r530)
Diffstat (limited to 'src/shortcuts.cpp')
| -rw-r--r-- | src/shortcuts.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp index ffd5aa948..cf7f485c6 100644 --- a/src/shortcuts.cpp +++ b/src/shortcuts.cpp @@ -98,11 +98,7 @@ static void read_shortcuts_file(char const *filename) { bool is_primary; if (!strcmp(iter->name(), "bind")) { - if (iter->attribute("display") && strcmp(iter->attribute("display"), "false") && strcmp(iter->attribute("display"), "0")) { - is_primary = true; - } else { - is_primary = false; - } + is_primary = iter->attribute("display") && strcmp(iter->attribute("display"), "false") && strcmp(iter->attribute("display"), "0"); } else { // some unknown element, do not complain continue; @@ -114,7 +110,8 @@ static void read_shortcuts_file(char const *filename) { continue; } - if (Inkscape::Verb::getbyid(verb_name) == NULL) { + Inkscape::Verb *verb=Inkscape::Verb::getbyid(verb_name); + if (!verb) { g_warning("Unknown verb name: %s", verb_name); continue; } @@ -124,6 +121,7 @@ static void read_shortcuts_file(char const *filename) { // that's ok, it's just listed for reference without assignment, skip it continue; } + guint keyval=gdk_keyval_from_name(keyval_name); if (keyval == GDK_VoidSymbol) { g_warning("Unknown keyval %s for %s", keyval_name, verb_name); @@ -153,9 +151,7 @@ static void read_shortcuts_file(char const *filename) { } } - sp_shortcut_set(keyval | modifiers, - Inkscape::Verb::getbyid(verb_name), - is_primary); + sp_shortcut_set(keyval | modifiers, verb, is_primary); } GC::release(doc); |