qulogic/libgnt

Merge 2.x.y

2014-02-17, Tomasz Wasilczyk
d73aa438daf8
Parents 43be578e496fc37afb64c6ad
Children aa332bbcc67acb04970b17e6
Merge 2.x.y
1 files changed, 16 insertions(+), 1 deletions(-)
  • +16 -1
    gntwm.c
    • --- a/gntwm.c Wed Feb 12 12:59:00 2014 +0530
    +++ b/gntwm.c Mon Feb 17 16:43:14 2014 +0100
    @@ -1277,7 +1277,12 @@
    {
    char *dir = g_path_get_dirname(path);
    FILE *file = fopen(path, "r");
    - PyObject *pp = PySys_GetObject("path"), *dirobj = PyString_FromString(dir);
    + PyObject *pp = PySys_GetObject("path");
    +#if PY_MAJOR_VERSION >= 3
    + PyObject *dirobj = PyUnicode_FromString(dir);
    +#else
    + PyObject *dirobj = PyString_FromString(dir);
    +#endif
    PyList_Insert(pp, 0, dirobj);
    Py_DECREF(dirobj);
    @@ -1568,7 +1573,17 @@
    gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "run-python", run_python,
    GNT_KEY_F3, NULL);
    if (!Py_IsInitialized()) {
    +#if PY_MAJOR_VERSION >= 3
    + wchar_t *name;
    + size_t len;
    + len = mbstowcs(NULL, "gnt", 0);
    + name = g_new(wchar_t, len + 1);
    + mbstowcs(name, "gnt", len + 1);
    + Py_SetProgramName(name);
    + g_free(name);
    +#else
    Py_SetProgramName("gnt");
    +#endif
    Py_Initialize();
    started_python = TRUE;
    }