Moved PyDict_SetItemString for printer info level structures into conv functions.

(This used to be commit f7fadfdd73d3ba12dbfc7bf18319ce72f79a0dcc)

diff --git a/source3/python/py_spoolss_printers.c b/source3/python/py_spoolss_printers.c
index 17c8af902a847e3179800ab224f768e316de2cc9..d20b144502830a8b5a599eed827e35aad4e8105c 100644 (file)
--- a/source3/python/py_spoolss_printers.c
+++ b/source3/python/py_spoolss_printers.c
@@ -170,8 +170,6 @@ PyObject *spoolss_getprinter(PyObject *self, PyObject *args, PyObject *kw)
                break;
        }
 
-       PyDict_SetItemString(result, "level", PyInt_FromLong(level));
-
        Py_INCREF(result);
        return result;
 }

diff --git a/source3/python/py_spoolss_printers_conv.c b/source3/python/py_spoolss_printers_conv.c
index 89980ef25a921b5d6cb4a2f7408c374dc4f184bb..b20382922cc4f2f0a0491f7c283383624f903c33 100644 (file)
--- a/source3/python/py_spoolss_printers_conv.c
+++ b/source3/python/py_spoolss_printers_conv.c
@@ -181,6 +181,7 @@ BOOL py_to_DEVICEMODE(DEVICEMODE *devmode, PyObject *dict)
 BOOL py_from_PRINTER_INFO_0(PyObject **dict, PRINTER_INFO_0 *info)
 {
        *dict = from_struct(info, py_PRINTER_INFO_0);
+       PyDict_SetItemString(*dict, "level", PyInt_FromLong(0));
        return True;
 }
 
@@ -196,6 +197,7 @@ BOOL py_to_PRINTER_INFO_0(PRINTER_INFO_0 *info, PyObject *dict)
 BOOL py_from_PRINTER_INFO_1(PyObject **dict, PRINTER_INFO_1 *info)
 {
        *dict = from_struct(info, py_PRINTER_INFO_1);
+       PyDict_SetItemString(*dict, "level", PyInt_FromLong(1));
        return True;
 }
 
@@ -220,6 +222,8 @@ BOOL py_from_PRINTER_INFO_2(PyObject **dict, PRINTER_INFO_2 *info)
        if (py_from_DEVICEMODE(&obj, info->devmode))
                PyDict_SetItemString(*dict, "device_mode", obj);
 
+       PyDict_SetItemString(*dict, "level", PyInt_FromLong(2));
+
        return True;
 }
 
@@ -260,6 +264,8 @@ BOOL py_from_PRINTER_INFO_3(PyObject **dict, PRINTER_INFO_3 *info)
        if (py_from_SECDESC(&obj, info->secdesc))
                PyDict_SetItemString(*dict, "security_descriptor", obj);
 
+       PyDict_SetItemString(*dict, "level", PyInt_FromLong(3));
+
        return True;
 }