Merge branch 'master' of git@tux-atome.fr:wmfs

This commit is contained in:
Martin Duquesnoy 2009-01-11 22:06:36 +01:00
commit 26efad90ec

View File

@ -92,9 +92,9 @@ wmfs_init(PyObject *self, PyObject *args)
/* Else, exit. */
if(!ret)
{
fprintf(stderr, "WMFS is not running.\n");
XFree(ret);
exit(EXIT_FAILURE);
PyErr_SetString(WmfsInitError, "WMFS not running?");
return NULL;
}
XFree(ret);
@ -189,10 +189,10 @@ initwmfs(void)
if(m == NULL)
return;
WmfsInitError = PyErr_NewException("wmfs.error", NULL, NULL);
WmfsInitError = PyErr_NewException("wmfs.WmfsInitError", NULL, NULL);
Py_INCREF(WmfsInitError);
PyModule_AddObject(m, "error", WmfsInitError);
PyModule_AddObject(m, "WmfsInitError", WmfsInitError);
}
int