From e1b0efa62a097a130a8d5a72c789fb8c1fefa19a Mon Sep 17 00:00:00 2001
From: FriedrichFroebel <FriedrichFroebel@users.noreply.github.com>
Date: Tue, 30 Jan 2018 11:28:29 +0100
Subject: [PATCH] Fix PyGIDeprecationWarnings (#51)

* Fix PyGIDeprecationWarning

* fix some more warnings
---
 usr/lib/blueberry/blueberry.py   | 10 +++++-----
 usr/lib/blueberry/rfkillMagic.py |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/usr/lib/blueberry/blueberry.py b/usr/lib/blueberry/blueberry.py
index 99d7a71..05fd1e8 100755
--- a/usr/lib/blueberry/blueberry.py
+++ b/usr/lib/blueberry/blueberry.py
@@ -23,7 +23,7 @@ class Blueberry(Gtk.Application):
     def __init__(self):
 
         Gtk.Application.__init__(self, application_id='com.linuxmint.blueberry', flags=Gio.ApplicationFlags.FLAGS_NONE)
-        self.window = Gtk.Window(Gtk.WindowType.TOPLEVEL)
+        self.window = Gtk.Window(type=Gtk.WindowType.TOPLEVEL)
         self.detect_desktop_environment()
         self.connect("activate", self.on_activate)
 
@@ -103,7 +103,7 @@ def create_window(self):
         stack_switcher.set_halign(Gtk.Align.CENTER)
         toolbar.show_all()
 
-        self.settings = Gio.Settings("org.blueberry")
+        self.settings = Gio.Settings(schema="org.blueberry")
 
         debug = False
         if len(sys.argv) > 1 and sys.argv[1] == "debug":
@@ -162,7 +162,7 @@ def create_window(self):
         self.obex_switch.set_active(self.settings.get_boolean("obex-enabled"))
         self.obex_switch.connect("notify::active", self.on_obex_switch_toggled)
         self.settings.connect("changed", self.on_settings_changed)
-        row = SettingsRow(Gtk.Label(_("Receive files from remote devices")), self.obex_switch)
+        row = SettingsRow(Gtk.Label(label=_("Receive files from remote devices")), self.obex_switch)
         row.set_tooltip_text(_("This option allows your computer to receive files transferred over Bluetooth (OBEX)"))
         section.add_row(row)
 
@@ -170,7 +170,7 @@ def create_window(self):
         self.tray_switch.set_active(self.settings.get_boolean("tray-enabled"))
         self.tray_switch.connect("notify::active", self.on_tray_switch_toggled)
         self.settings.connect("changed", self.on_settings_changed)
-        section.add_row(SettingsRow(Gtk.Label(_("Show a tray icon")), self.tray_switch))
+        section.add_row(SettingsRow(Gtk.Label(label=_("Show a tray icon")), self.tray_switch))
 
         self.window.add(self.main_box)
 
@@ -221,7 +221,7 @@ def on_settings_changed(self, settings, key):
         self.obex_switch.set_active(self.settings.get_boolean("obex-enabled"))
 
     def add_stack_page(self, message, name):
-        label = Gtk.Label(message)
+        label = Gtk.Label(label=message)
         self.stack.add_named(label, name)
         label.show()
 
diff --git a/usr/lib/blueberry/rfkillMagic.py b/usr/lib/blueberry/rfkillMagic.py
index 9ef3be3..03aaed5 100644
--- a/usr/lib/blueberry/rfkillMagic.py
+++ b/usr/lib/blueberry/rfkillMagic.py
@@ -3,7 +3,7 @@
 import subprocess
 import os
 import re
-from gi.repository import GObject
+from gi.repository import GLib
 
 RFKILL_CHK = ["/usr/sbin/rfkill", "list", "bluetooth"]
 RFKILL_BLOCK = ["/usr/sbin/rfkill", "block", "bluetooth"]
@@ -108,7 +108,7 @@ def update_state(self, line):
         self.update_ui()
 
     def update_ui(self):
-        GObject.idle_add(self.output_callback)
+        GLib.idle_add(self.output_callback)
 
     def try_set_blocked(self, blocked):
         thread.start_new_thread(self.set_block_thread, (blocked,))