X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk_c%2Fscreeninfo.c;h=2f11cfd9661e0f5f2114ad8868bd7ab1b3983b9b;hb=390d447d9ba92878fbd1a0f7955edb5f83256195;hp=3d253d1b81cbfcd22716b96ce415fa68ddcef3c6;hpb=187e7db9c039d7369766aeae7dfdf87f191ac446;p=chaz%2Fopenbox

diff --git a/otk_c/screeninfo.c b/otk_c/screeninfo.c
index 3d253d1b..2f11cfd9 100644
--- a/otk_c/screeninfo.c
+++ b/otk_c/screeninfo.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 "screeninfo.h"
@@ -25,11 +25,11 @@ PyObject *OtkScreenInfo_New(int num)
 
   self->screen = num;
   self->root_window = RootWindow(OBDisplay->display, self->screen);
-  self->rect = OtkRect_New(0, 0,
-			   WidthOfScreen(ScreenOfDisplay(OBDisplay->display,
-							 self->screen)),
-			   HeightOfScreen(ScreenOfDisplay(OBDisplay->display,
-							  self->screen)));
+  self->rect = (OtkRect*)
+    OtkRect_New(0, 0, WidthOfScreen(ScreenOfDisplay(OBDisplay->display,
+                                                    self->screen)),
+                HeightOfScreen(ScreenOfDisplay(OBDisplay->display,
+                                               self->screen)));
   
   /*
     If the default depth is at least 8 we will use that,
@@ -78,16 +78,16 @@ PyObject *OtkScreenInfo_New(int num)
   }
 
   // get the default display string and strip the screen number
-  self->display_string =
+  self->display_string = (PyStringObject*)
     PyString_FromFormat("DISPLAY=%s",DisplayString(OBDisplay->display));
-  dstr = PyString_AsString(self->display_string);
+  dstr = PyString_AsString((PyObject*)self->display_string);
   dstr2 = strrchr(dstr, '.');
   if (dstr2) {
     PyObject *str;
     
-    _PyString_Resize(&self->display_string, dstr2 - dstr);
+    _PyString_Resize((PyObject**)&self->display_string, dstr2 - dstr);
     str = PyString_FromFormat(".%d", self->screen);
-    PyString_Concat(&self->display_string, str);
+    PyString_Concat((PyObject**)&self->display_string, str);
   }
 
 #ifdef    XINERAMA
@@ -142,7 +142,7 @@ static PyObject *otkscreeninfo_getscreen(OtkScreenInfo* self, PyObject* args)
   return PyInt_FromLong(self->screen);
 }
 
-static PyObject *otkscreeninfo_getrect(OtkScreenInfo* self, PyObject* args)
+static OtkRect *otkscreeninfo_getrect(OtkScreenInfo* self, PyObject* args)
 {
   if (!PyArg_ParseTuple(args, ":getRect"))
     return NULL;
@@ -160,14 +160,14 @@ static PyMethodDef get_methods[] = {
 
 
 
-static void otkscreeninfo_dealloc(PyObject* self)
+static void otkscreeninfo_dealloc(OtkScreenInfo* self)
 {
-  Py_DECREF(((OtkScreenInfo*) self)->display_string);
-  Py_DECREF(((OtkScreenInfo*) self)->rect);
+  Py_DECREF(self->display_string);
+  Py_DECREF(self->rect);
 #ifdef XINERAMA
-  Py_DECREF(((OtkScreenInfo*) self)->xinerama_areas);
+  Py_DECREF(self->xinerama_areas);
 #endif
-  PyObject_Del(self);
+  PyObject_Del((PyObject*)self);
 }
 
 static PyObject *otkscreeninfo_getattr(PyObject *obj, char *name)
@@ -182,7 +182,7 @@ PyTypeObject OtkScreenInfo_Type = {
   "OtkScreenInfo",
   sizeof(OtkScreenInfo),
   0,
-  otkscreeninfo_dealloc, /*tp_dealloc*/
+  (destructor)otkscreeninfo_dealloc, /*tp_dealloc*/
   0,          /*tp_print*/
   otkscreeninfo_getattr, /*tp_getattr*/
   0,          /*tp_setattr*/