From 442fb9bd5df72e6eb89c34352882ac80f9c9660b Mon Sep 17 00:00:00 2001 From: Christian Stadelmann Date: Tue, 3 Nov 2015 19:18:51 +0100 Subject: Specify required Gtk version This fixes a warning when starting redshift-gtk with gtk 3.18. --- src/redshift-gtk/statusicon.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/redshift-gtk/statusicon.py b/src/redshift-gtk/statusicon.py index b766175..e09b523 100644 --- a/src/redshift-gtk/statusicon.py +++ b/src/redshift-gtk/statusicon.py @@ -29,6 +29,9 @@ import signal import re import gettext +import gi +gi.require_version('Gtk', '3.0') + from gi.repository import Gtk, GLib, GObject try: -- cgit v1.2.3-70-g09d2 From 56cef8d9cc2474e6e7382f9e702d35ab7f6355a8 Mon Sep 17 00:00:00 2001 From: Javier Cantero Date: Sat, 14 Nov 2015 12:09:34 +0100 Subject: Also specify required AppIndicator3 version Avoid another GObject Introspection warning in redshift-gtk by providing the required version of AppIndicator3 before import it. --- src/redshift-gtk/statusicon.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/redshift-gtk/statusicon.py b/src/redshift-gtk/statusicon.py index e09b523..2974b77 100644 --- a/src/redshift-gtk/statusicon.py +++ b/src/redshift-gtk/statusicon.py @@ -35,6 +35,7 @@ gi.require_version('Gtk', '3.0') from gi.repository import Gtk, GLib, GObject try: + gi.require_version('AppIndicator3', '0.1') from gi.repository import AppIndicator3 as appindicator except ImportError: appindicator = None -- cgit v1.2.3-70-g09d2 From ae2e23325b883eb8b5d41c4d48751d75ed5a9a25 Mon Sep 17 00:00:00 2001 From: Javier Cantero Date: Sun, 15 Nov 2015 12:05:45 +0100 Subject: Fallback if AppIndicator3 req. version unavailable Catch in the except block the case when the required version of Appindicator3 is not available to also fallback in GtkStatusIcon widget. --- src/redshift-gtk/statusicon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redshift-gtk/statusicon.py b/src/redshift-gtk/statusicon.py index 2974b77..5159437 100644 --- a/src/redshift-gtk/statusicon.py +++ b/src/redshift-gtk/statusicon.py @@ -37,7 +37,7 @@ from gi.repository import Gtk, GLib, GObject try: gi.require_version('AppIndicator3', '0.1') from gi.repository import AppIndicator3 as appindicator -except ImportError: +except (ImportError, ValueError): appindicator = None from . import defs -- cgit v1.2.3-70-g09d2