aboutsummaryrefslogtreecommitdiffstats
path: root/src/gtk-redshift
diff options
context:
space:
mode:
authorFrancesco Marella <francesco.marella@gmail.com>2010-06-04 12:42:31 +0200
committerFrancesco Marella <francesco.marella@gmail.com>2010-06-04 12:42:31 +0200
commita5b9ff65c421de27d81f9317a17467592fab3552 (patch)
treef6588aecf14ce07dc1273d1d73e95ae32e732d90 /src/gtk-redshift
parentAdd redshift-idle icon. (diff)
downloadredshift-ng-a5b9ff65c421de27d81f9317a17467592fab3552.tar.gz
redshift-ng-a5b9ff65c421de27d81f9317a17467592fab3552.tar.bz2
redshift-ng-a5b9ff65c421de27d81f9317a17467592fab3552.tar.xz
Add the autofoo needed to choose GTK+ status icon or app-indicator
Passing 'enable-appindicator=yes' to the configure script the GTK+ status icon will be disabled.
Diffstat (limited to 'src/gtk-redshift')
-rw-r--r--src/gtk-redshift/Makefile.am24
-rw-r--r--src/gtk-redshift/gtk-redshift.in (renamed from src/gtk-redshift/gtk-redshift)4
-rw-r--r--src/gtk-redshift/statusicon.py2
3 files changed, 25 insertions, 5 deletions
diff --git a/src/gtk-redshift/Makefile.am b/src/gtk-redshift/Makefile.am
index d0d8695..9c8479f 100644
--- a/src/gtk-redshift/Makefile.am
+++ b/src/gtk-redshift/Makefile.am
@@ -1,5 +1,6 @@
if ENABLE_GTK
+module=statusicon
gtk_redshift_PYTHON = \
__init__.py \
statusicon.py
@@ -8,12 +9,31 @@ nodist_gtk_redshift_PYTHON = \
gtk_redshiftdir = $(pythondir)/gtk_redshift
dist_bin_SCRIPTS = gtk-redshift
-EXTRA_DIST = defs.py.in
+EXTRA_DIST = gtk-redshift.in \
+ defs.py.in
endif
-CLEANFILES = defs.py
+if ENABLE_APPINDICATOR
+module=rsappindicator
+gtk_redshift_PYTHON = \
+ __init__.py \
+ rsappindicator.py
+nodist_gtk_redshift_PYTHON = \
+ defs.py
+gtk_redshiftdir = $(pythondir)/gtk_redshift
+
+dist_bin_SCRIPTS = gtk-redshift
+EXTRA_DIST = gtk-redshift.in \
+ defs.py.in
+endif
+
+CLEANFILES = defs.py \
+ gtk-redshift
# Local python definitions
+gtk-redshift: gtk-redshift.in
+ sed -e "s|\@module\@|$(module)|g" $< > $@
+
defs.py: defs.py.in
sed -e "s|\@bindir\@|$(bindir)|g" \
-e "s|\@localedir\@|$(localedir)|g" $< > $@
diff --git a/src/gtk-redshift/gtk-redshift b/src/gtk-redshift/gtk-redshift.in
index f62c6f1..18ee145 100644
--- a/src/gtk-redshift/gtk-redshift
+++ b/src/gtk-redshift/gtk-redshift.in
@@ -19,5 +19,5 @@
if __name__ == '__main__':
- from gtk_redshift.statusicon import run_statusicon
- run_statusicon()
+ from gtk_redshift.@module@ import run
+ run()
diff --git a/src/gtk-redshift/statusicon.py b/src/gtk-redshift/statusicon.py
index 9925c35..2295963 100644
--- a/src/gtk-redshift/statusicon.py
+++ b/src/gtk-redshift/statusicon.py
@@ -30,7 +30,7 @@ import gtk, glib
import defs
-def run_statusicon():
+def run():
# Internationalisation
gettext.bindtextdomain('redshift', defs.LOCALEDIR)
gettext.textdomain('redshift')