diff options
Diffstat (limited to 'bindings/python')
| -rw-r--r-- | bindings/python/Makefile.am | 25 | ||||
| -rw-r--r-- | bindings/python/__init__.py | 2 | ||||
| -rw-r--r-- | bindings/python/appindicator-arg-types.py | 2 | ||||
| -rw-r--r-- | bindings/python/ayatana_appindicator.defs (renamed from bindings/python/appindicator.defs) | 0 | ||||
| -rw-r--r-- | bindings/python/ayatana_appindicator.override.in (renamed from bindings/python/appindicator.override.in) | 4 | ||||
| -rw-r--r-- | bindings/python/ayatana_appindicatormodule.c (renamed from bindings/python/appindicatormodule.c) | 8 |
6 files changed, 22 insertions, 19 deletions
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am index fe95c02..f57a2f7 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am @@ -1,10 +1,10 @@ defsdir = $(datadir)/pygtk/2.0/defs -defs_DATA = appindicator.defs +defs_DATA = ayatana_appindicator.defs #CFLAGS = -Wall -Werror INCLUDES = \ -I$(top_srcdir)/src \ - -DG_LOG_DOMAIN=\"appindicator-python\" \ + -DG_LOG_DOMAIN=\"ayatana-appindicator-python\" \ -DDATADIR=\"$(datadir)\" \ -DLIBDIR=\"$(libdir)\" \ $(APPINDICATOR_PYTHON_CFLAGS) \ @@ -13,20 +13,21 @@ INCLUDES = \ pkgpythondir = $(pyexecdir) pkgpyexecdir = $(pyexecdir) -pkgappindicatordir = $(pkgpythondir)/appindicator +pkgappindicatordir = $(pkgpythondir)/ayatana_appindicator pkgappindicator_PYTHON = __init__.py -appindicatordir = $(pkgpyexecdir)/appindicator -appindicator_LTLIBRARIES = _appindicator.la +appindicatordir = $(pkgpyexecdir)/ayatana_appindicator +appindicator_LTLIBRARIES = _ayatana_appindicator.la -_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator -_appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -lappindicator -_appindicator_la_SOURCES = appindicatormodule.c -nodist__appindicator_la_SOURCES = appindicator.c +_ayatana_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_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 -CLEANFILES = appindicator.c -EXTRA_DIST = appindicator.override.in appindicator-arg-types.py $(defs_DATA) -appindicator.c: $(defs_DATA) appindicator.override +CLEANFILES = ayatana_appindicator.c +DISTCLEANFILES = Makefile.in +EXTRA_DIST = ayatana_appindicator.override.in appindicator-arg-types.py $(defs_DATA) +ayatana_appindicator.c: $(defs_DATA) ayatana_appindicator.override %.c: %.defs ($(PYGTK_CODEGEN) \ diff --git a/bindings/python/__init__.py b/bindings/python/__init__.py index 20e2140..5dd1329 100644 --- a/bindings/python/__init__.py +++ b/bindings/python/__init__.py @@ -24,4 +24,4 @@ # License version 3 and version 2.1 along with this program. If not, see # <http://www.gnu.org/licenses/> -from _appindicator import * +from _ayatana_appindicator import * diff --git a/bindings/python/appindicator-arg-types.py b/bindings/python/appindicator-arg-types.py index 9d74aa0..46066ca 100644 --- a/bindings/python/appindicator-arg-types.py +++ b/bindings/python/appindicator-arg-types.py @@ -1,4 +1,4 @@ -# Python bindings for libappindicator. +# Python bindings for libayatana-appindicator. # # Copyright 2009 Canonical Ltd. # diff --git a/bindings/python/appindicator.defs b/bindings/python/ayatana_appindicator.defs index 4fcc2d5..4fcc2d5 100644 --- a/bindings/python/appindicator.defs +++ b/bindings/python/ayatana_appindicator.defs diff --git a/bindings/python/appindicator.override.in b/bindings/python/ayatana_appindicator.override.in index 84d3159..3fdeb24 100644 --- a/bindings/python/appindicator.override.in +++ b/bindings/python/ayatana_appindicator.override.in @@ -1,5 +1,5 @@ /* -Python bindings for libappindicator. +Python bindings for libayatana-appindicator. Copyright 2009 Canonical Ltd. @@ -59,7 +59,7 @@ _appindicator_add_constants(PyObject *module, const gchar *strip_prefix) PyErr_Print(); } %% -modulename appindicator +modulename ayatana_appindicator %% import gobject.GObject as PyGObject_Type import gtk.Menu as PyGtkMenu_Type diff --git a/bindings/python/appindicatormodule.c b/bindings/python/ayatana_appindicatormodule.c index b66639c..31d23a2 100644 --- a/bindings/python/appindicatormodule.c +++ b/bindings/python/ayatana_appindicatormodule.c @@ -1,11 +1,13 @@ /* -Python bindings for libappindicator. +Python bindings for libayatana-appindicator. Copyright 2009 Canonical Ltd. +Copyright 2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Authors: Eitan Isaacson <eitan@ascender.com> Neil Jagdish Patel <neil.patel@canonical.com> + Mike Gabriel <mike.gabriel@das-netzwerkteam.de> This program is free software: you can redistribute it and/or modify it under the terms of either or both of the following licenses: @@ -37,13 +39,13 @@ init_appindicator(void) init_pygobject (); - m = Py_InitModule ("_appindicator", pyappindicator_functions); + m = Py_InitModule ("_ayatana_appindicator", pyappindicator_functions); d = PyModule_GetDict (m); pyappindicator_register_classes (d); _appindicator_add_constants (m, "APP_INDICATOR_"); if (PyErr_Occurred ()) { - Py_FatalError ("can't initialise module appindicator"); + Py_FatalError ("can't initialise module ayatana_appindicator"); } } |