Merge lp:~lkundrak/qreator/libnm into lp:qreator

[Lubomir Rintel]

Port to libnm.

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=857227

[Lubomir Rintel (lkundrak)]

Ping?

[David Planella (dpm)]

Apologies for not replying sooner, life got in the way. Thanks so much for your work on this fix and for the merge request.

Looks good to me, happy to merge!

review: Approve

[Lubomir Rintel (lkundrak)]

On Sun, 2018-07-29 at 23:21 +0000, David Planella wrote:
> Review: Approve
>
> Apologies for not replying sooner, life got in the way. Thanks so
> much for your work on this fix and for the merge request.
>
> Looks good to me, happy to merge!

Actually, a pleasant surprise. With the libnm porting crusade, I've
encountered way too many dormant projects, and I getting a response
after months is not what happens often.

Thank you

Lubo

[David Planella (dpm)]

Excellent. Note that I had to do an extra change to the branch afterwards, to avoid an exception when the SSID has no data:

https://bazaar.launchpad.net/~qreator-hackers/qreator/trunk/revision/203?remember=201&compare_revid=201

=== modified file 'debian/control'
--- debian/control	2016-06-13 20:01:23 +0000
+++ debian/control	2017-12-19 14:48:45 +0000
@@ -26,7 +26,7 @@
  gir1.2-gtk-3.0,
  gir1.2-gtkchamplain-0.12,
  gir1.2-gtkclutter-1.0,
- gir1.2-networkmanager-1.0,
+ gir1.2-nm-1.0,
  gnome-icon-theme-symbolic,
  python-cairo,
  python-dbus,
 
=== modified file 'qreator/QRCode.py'
--- qreator/QRCode.py	2016-06-10 13:57:52 +0000
+++ qreator/QRCode.py	2017-12-19 14:48:45 +0000
@@ -20,8 +20,13 @@
 except ImportError:
     print "You need to install the python-qrencode package"
     sys.exit(1)
-import Image
-import ImageOps
+
+try:
+    from PIL import Image
+    from PIL import ImageOps
+except ImportError:
+    import Image
+    import ImageOps
 import cairo
 import array
 
 
=== modified file 'qreator/qrcodes/QRCodeWifiGtk.py'
--- qreator/qrcodes/QRCodeWifiGtk.py	2013-08-06 06:40:48 +0000
+++ qreator/qrcodes/QRCodeWifiGtk.py	2017-12-19 14:48:45 +0000
@@ -17,7 +17,7 @@
 from GtkHelpers import clear_text_entry, show_clear_icon
 from qreator_lib.i18n import _
 from qreator_lib.helpers import get_data_file
-from gi.repository import Gtk, NetworkManager, NMClient, GLib, GdkPixbuf
+from gi.repository import Gtk, NM, GLib, GdkPixbuf
 
 
 def _escape(st):
@@ -141,14 +141,15 @@
 
 def get_ssids():
     """Returns a list of ssids sorted by the signal strength."""
-    nmc = NMClient.Client.new()
+    nmc = NM.Client.new()
     devs = nmc.get_devices()
 
     ssids = []
     for dev in devs:
-        if dev.get_device_type() == NetworkManager.DeviceType.WIFI:
+        if dev.get_device_type() == NM.DeviceType.WIFI:
             for ap in dev.get_access_points():
-                ssids.append((ap.get_strength(), ap.get_ssid()))
+                ssid = NM.utils_ssid_to_utf8(ap.get_ssid().get_data());
+                ssids.append((ap.get_strength(), ssid))
     ssids.sort()
     ssids.reverse()   # strongest has the highest number -> should be first
     return ssids
 
=== modified file 'setup.py'
--- setup.py	2016-06-13 19:28:58 +0000
+++ setup.py	2017-12-19 14:48:45 +0000
@@ -117,17 +117,18 @@
     def run(self):
         DistUtilsExtra.auto.install_auto.run(self)
 
-        target_data = '/' + os.path.relpath(self.install_data, self.root) + '/'
+        root = '/' if self.root is None else self.root
+        target_data = '/' + os.path.relpath(self.install_data, root) + '/'
         target_pkgdata = target_data + 'share/qreator/'
-        target_scripts = '/' + os.path.relpath(self.install_scripts, self.root) + '/'
+        target_scripts = '/' + os.path.relpath(self.install_scripts, root) + '/'
 
         values = {'__qreator_data_directory__': "'%s'" % (target_pkgdata),
                   '__version__': "'%s'" % self.distribution.get_version()}
         update_config(self.install_lib, values)
 
-        desktop_file = move_desktop_file(self.root, target_data, self.prefix)
+        desktop_file = move_desktop_file(root, target_data, self.prefix)
         update_desktop_file(desktop_file, target_pkgdata, target_scripts)
-        compile_schemas(self.root, target_data)
+        compile_schemas(root, target_data)
 
 
 ##################################################################################