[meld] bin/meld: Fix unintentional glib requirement bump



commit ac8220ca0908bab3fc97f5ef1b53a652d34f539c
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Oct 16 06:06:29 2016 +1000

    bin/meld: Fix unintentional glib requirement bump
    
    GLib.log_set_handler() is only available in 2.46, and I definitely
    didn't intend that version bump.

 bin/meld |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/bin/meld b/bin/meld
index bafb4e0..bc6a4df 100755
--- a/bin/meld
+++ b/bin/meld
@@ -252,7 +252,12 @@ def setup_glib_logging():
 
     def log_adapter(domain, level, message, user_data):
         log.log(levels[level], message)
-    GLib.log_set_handler(log_domain, level_flag, log_adapter, None)
+
+    try:
+        GLib.log_set_handler(log_domain, level_flag, log_adapter, None)
+    except AttributeError:
+        # Only present in glib 2.46+
+        pass
 
 
 def environment_hacks():


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]