Python plugin: Folder: Return None for folders without an id

diff --git a/src/plugins/python/foldertype.c b/src/plugins/python/foldertype.c
index 3afd0cc5b2c354e23518645180d58dbe5efe9bf1..908078746fd8bdb7242c8f7dde1f09bb757eb3ad 100644 (file)
--- a/src/plugins/python/foldertype.c
+++ b/src/plugins/python/foldertype.c
@@ -265,11 +265,14 @@ PyObject* clawsmail_folder_new(FolderItem *folderitem)
     return NULL;
 
   id = folder_item_get_identifier(folderitem);
-  arglist = Py_BuildValue("(s)", id);
-  g_free(id);
-  ff = (clawsmail_FolderObject*) PyObject_CallObject((PyObject*) &clawsmail_FolderType, arglist);
-  Py_DECREF(arglist);
-  return (PyObject*)ff;
+  if(id) {
+    arglist = Py_BuildValue("(s)", id);
+    g_free(id);
+    ff = (clawsmail_FolderObject*) PyObject_CallObject((PyObject*) &clawsmail_FolderType, arglist);
+    Py_DECREF(arglist);
+    return (PyObject*)ff;
+  }
+  Py_RETURN_NONE;
 }
 
 FolderItem* clawsmail_folder_get_item(PyObject *self)