From 8a971533354af8dfd5cfca70d12c9fe648f4e126 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 23 Sep 2017 01:01:33 +0200 Subject: Python2 bindings: Fix import ayatana_appindicator failure by correctly adding the ayatana namespace. --- bindings/python/Makefile.am | 2 +- bindings/python/ayatana_appindicatormodule.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am index f57a2f7..32d43a3 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am @@ -19,7 +19,7 @@ pkgappindicator_PYTHON = __init__.py appindicatordir = $(pkgpyexecdir)/ayatana_appindicator appindicator_LTLIBRARIES = _ayatana_appindicator.la -_ayatana_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator +_ayatana_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_ayatana_appindicator _ayatana_appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -layatana-appindicator _ayatana_appindicator_la_SOURCES = ayatana_appindicatormodule.c nodist__ayatana_appindicator_la_SOURCES = ayatana_appindicator.c diff --git a/bindings/python/ayatana_appindicatormodule.c b/bindings/python/ayatana_appindicatormodule.c index 31d23a2..4bc7a04 100644 --- a/bindings/python/ayatana_appindicatormodule.c +++ b/bindings/python/ayatana_appindicatormodule.c @@ -29,20 +29,20 @@ License version 3 and version 2.1 along with this program. If not, see */ #include -void pyappindicator_register_classes (PyObject *d); -extern PyMethodDef pyappindicator_functions[]; +void pyayatana_appindicator_register_classes (PyObject *d); +extern PyMethodDef pyayatana_appindicator_functions[]; DL_EXPORT(void) -init_appindicator(void) +init_ayatana_appindicator(void) { PyObject *m, *d; init_pygobject (); - m = Py_InitModule ("_ayatana_appindicator", pyappindicator_functions); + m = Py_InitModule ("_ayatana_appindicator", pyayatana_appindicator_functions); d = PyModule_GetDict (m); - pyappindicator_register_classes (d); + pyayatana_appindicator_register_classes (d); _appindicator_add_constants (m, "APP_INDICATOR_"); if (PyErr_Occurred ()) { -- cgit v1.2.3