* Implemented OpProgress support

1 files changed, 18 insertions, 20 deletions

diff --git a/python/progress.h b/python/progress.h
index 5859eea0..b18778b1 100644
--- a/python/progress.h
+++ b/python/progress.h
@@ -1,31 +1,29 @@
-#ifndef PROGRESS_H
-#define PROGRESS_H
+// Description								/*{{{*/
+// $Id: progress.h,v 1.5 2003/06/03 03:03:23 mdz Exp $
+/* ######################################################################
 
-#include<iostream>
-
-struct PyOpProgressStruct : public OpProgress
-{
+   Progress - Wrapper for the progress related functions
 
-   PyObject *py_update_callback_func;
-   PyObject *py_update_callback_args;
+   ##################################################################### */
 
-   virtual void Update() {
-      if(py_update_callback_func == 0)
-	 return;
+#ifndef PROGRESS_H
+#define PROGRESS_H
 
-      // Build up the argument list... 
-      PyObject *arglist = Py_BuildValue("fO", Percent,py_update_callback_args);
+#include <apt-pkg/progress.h>
+#include <Python.h>
 
-      // ...for calling the Python compare function.
-      PyObject *result = PyEval_CallObject(py_update_callback_func,arglist);
+struct PyOpProgress : public OpProgress
+{
+   PyObject *callbackInst;
 
-      Py_XDECREF(result);
-      Py_DECREF(arglist);
+   void setCallbackInst(PyObject *o) {
+      callbackInst = o;
+   }
 
-      return;
-   };
+   virtual void Update();
+   virtual void Done();
 
-   PyOpProgressStruct() : OpProgress(), py_update_callback_func(0) {};
+   PyOpProgress() : OpProgress(), callbackInst(0) {};
 };
 
 #endif