Change "canvas" to "page" to be consistent with use in all other dialogs and

[inkscape.git] / src / extension / db.h

diff --git a/src/extension/db.h b/src/extension/db.h
index 264e7653925fc31a138fa6ef39512cf39f134384..9d4fc77d3da8c8582cc4e3bab3c5f803e672f8cd 100644 (file)
--- a/src/extension/db.h
+++ b/src/extension/db.h
@@ -17,6 +17,7 @@
 
 #include <map>
 #include <list>
+#include <cstring>
 
 #include "extension/extension.h"
 
@@ -29,7 +30,13 @@ private:
         to find the different extensions in the hash map. */
     struct ltstr {
         bool operator()(const char* s1, const char* s2) const {
-            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;
+            }
         }
     };
     /** This is the actual database.  It has all of the modules in it,
@@ -58,7 +65,7 @@ public:
     typedef std::list<Input *> InputList;
     typedef std::list<Effect *> EffectList;
 
-    InputList  &get_input_list (InputList &ou_list);
+    InputList  &get_input_list  (InputList &ou_list);
     OutputList &get_output_list (OutputList &ou_list);
     EffectList &get_effect_list (EffectList &ou_list);
 }; /* class DB */