X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk_c%2Fdisplay.c;h=c0cae13cb07f5c37cbdd9bc5db25c7ad170aee11;hb=bc88d310fea71823fb2c61d071ff499579bffaba;hp=016aa9487fcd257dad2656a74908ea8583884cb5;hpb=cca7a6762d273815947bd5c7cc58ab6713693e8e;p=chaz%2Fopenbox diff --git a/otk_c/display.c b/otk_c/display.c index 016aa948..c0cae13c 100644 --- a/otk_c/display.c +++ b/otk_c/display.c @@ -1,4 +1,4 @@ -// -*- mode: C; indent-tabs-mode: nil; -*- +// -*- mode: C; indent-tabs-mode: nil; c-basic-offset: 2; -*- #include "../config.h" #include "display.h" @@ -123,9 +123,9 @@ line argument.\n\n")); OBDisplay = self; // Get information on all the screens which are available. - self->screenInfoList = PyList_New(ScreenCount(self->display)); + self->screenInfoList = (PyListObject*)PyList_New(ScreenCount(self->display)); for (i = 0; i < ScreenCount(self->display); ++i) - PyList_SetItem(self->screenInfoList, i, OtkScreenInfo_New(i)); + PyList_SetItem((PyObject*)self->screenInfoList, i, OtkScreenInfo_New(i)); Py_INCREF(OBDisplay); // make sure it stays around!! } @@ -148,8 +148,8 @@ void OtkDisplay_Ungrab(OtkDisplay *self) OtkScreenInfo *OtkDisplay_ScreenInfo(OtkDisplay *self, int num) { - PyObject *py = PyList_GetItem(self->screenInfoList, num); - return (OtkScreenInfo*) py; + assert(num >= 0); + return (OtkScreenInfo*)PyList_GetItem((PyObject*)self->screenInfoList, num); }