diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2006-05-07 01:10:26 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2006-05-07 01:10:26 +0000 |
| commit | 3ac2d5a51d3fa2bb688bdd385aafdd2636ad8847 (patch) | |
| tree | 9ca063cea73bf82979aa75dcc2c47361cd46f23e /src/verbs.h | |
| parent | clean up loudmouth link (diff) | |
| download | inkscape-3ac2d5a51d3fa2bb688bdd385aafdd2636ad8847.tar.gz inkscape-3ac2d5a51d3fa2bb688bdd385aafdd2636ad8847.zip | |
Fixed problem with std::map use making last verb inaccessible.
(bzr r756)
Diffstat (limited to 'src/verbs.h')
| -rw-r--r-- | src/verbs.h | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/verbs.h b/src/verbs.h index f77085d7a..15ea2f2e8 100644 --- a/src/verbs.h +++ b/src/verbs.h @@ -196,17 +196,18 @@ enum { SP_VERB_DIALOG_CLONETILER, SP_VERB_DIALOG_ITEM, #ifdef WITH_INKBOARD - SP_VERB_DIALOG_WHITEBOARD_CONNECT, - SP_VERB_DIALOG_WHITEBOARD_SHAREWITHUSER, - SP_VERB_DIALOG_WHITEBOARD_SHAREWITHCHAT, - SP_VERB_DIALOG_WHITEBOARD_DUMPXMLTRACKER, - SP_VERB_DIALOG_WHITEBOARD_OPENSESSIONFILE, - SP_VERB_DIALOG_WHITEBOARD_SESSIONPLAYBACK, - SP_VERB_DIALOG_WHITEBOARD_DISCONNECT_FROM_SESSION, - SP_VERB_DIALOG_WHITEBOARD_DISCONNECT_FROM_SERVER, + SP_VERB_DIALOG_WHITEBOARD_CONNECT, + SP_VERB_DIALOG_WHITEBOARD_SHAREWITHUSER, + SP_VERB_DIALOG_WHITEBOARD_SHAREWITHCHAT, + SP_VERB_DIALOG_WHITEBOARD_DUMPXMLTRACKER, + SP_VERB_DIALOG_WHITEBOARD_OPENSESSIONFILE, + SP_VERB_DIALOG_WHITEBOARD_SESSIONPLAYBACK, + SP_VERB_DIALOG_WHITEBOARD_DISCONNECT_FROM_SESSION, + SP_VERB_DIALOG_WHITEBOARD_DISCONNECT_FROM_SERVER, #endif SP_VERB_DIALOG_INPUT, SP_VERB_DIALOG_EXTENSIONEDITOR, + //SP_VERB_DIALOG_LAYERS, /* Help */ SP_VERB_HELP_KEYS, SP_VERB_HELP_ABOUT_EXTENSIONS, @@ -256,8 +257,13 @@ private: to find the different verbs in the hash map. */ struct ltstr { bool operator()(const char* s1, const char* s2) const { - if (s1 == NULL || s2 == NULL) return true; - return strcmp(s1, s2) < 0; + if ( (s1 == NULL) && (s2 != NULL) ) { + return true; + } else if (s1 == NULL || s2 == NULL) { + return false; + } else { + return strcmp(s1, s2) < 0; + } } }; /** \brief An easy to use definition of the table of verbs by ID. */ |