diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/redshift-gtk/Makefile.am | 2 | ||||
| -rw-r--r-- | src/redshift-gtk/statusicon.py | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e83073b..37a0308 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -59,7 +59,10 @@ endif if ENABLE_GEOCLUE redshift_SOURCES += location-geoclue.c location-geoclue.h -AM_CFLAGS += $(GEOCLUE_CFLAGS) $(GEOCLUE_LIBS) +AM_CFLAGS += \ + $(GEOCLUE_CFLAGS) $(GEOCLUE_LIBS) \ + $(GLIB_CFLAGS) $(GLIB_LIBS) redshift_LDADD += \ $(GEOCLUE_LIBS) $(GEOCLUE_CFLAGS) + $(GLIB_LIBS) $(GLIB_CFLAGS) endif diff --git a/src/redshift-gtk/Makefile.am b/src/redshift-gtk/Makefile.am index 96d7718..c4ab24f 100644 --- a/src/redshift-gtk/Makefile.am +++ b/src/redshift-gtk/Makefile.am @@ -8,7 +8,7 @@ nodist_redshift_gtk_PYTHON = \ defs.py redshift_gtkdir = $(pythondir)/redshift_gtk -dist_bin_SCRIPTS = redshift-gtk +bin_SCRIPTS = redshift-gtk endif EXTRA_DIST = defs.py.in redshift-gtk.in diff --git a/src/redshift-gtk/statusicon.py b/src/redshift-gtk/statusicon.py index 5685f08..08f28ef 100644 --- a/src/redshift-gtk/statusicon.py +++ b/src/redshift-gtk/statusicon.py @@ -79,7 +79,7 @@ class RedshiftStatusIcon(object): # Add toggle action self.toggle_item = Gtk.CheckMenuItem.new_with_label(_('Enabled')) - self.toggle_item.connect('activate', self.toggle_cb) + self.toggle_item.connect('activate', self.toggle_item_cb) self.status_menu.append(self.toggle_item) # Add suspend menu @@ -215,6 +215,10 @@ class RedshiftStatusIcon(object): self.status_icon, button, time) def toggle_cb(self, widget, data=None): + self.remove_suspend_timer() + self.child_toggle_status() + + def toggle_item_cb(self, widget, data=None): # Only toggle if a change from current state was requested if self.is_enabled() != widget.get_active(): self.remove_suspend_timer() |