Trim error message

We split off the DBus name since that is of no use to the user.

This will need more work.

2 files changed, 11 insertions, 2 deletions

diff --git a/src/ppm/modemproxy.py b/src/ppm/modemproxy.py
index 3943b7f..99e303f 100644
--- a/src/ppm/modemproxy.py
+++ b/src/ppm/modemproxy.py
@@ -207,7 +207,16 @@ class ModemManagerProxy(GObject.GObject):
                 self.reply_func(res, user_data)
         except Exception as err:
             if self.error_func:
-                me = ModemError("%s failed: %s" % (self.request, err))
+                # We don't get a proper error domain so we assume
+                # 'GDBus.Error:org.freedesktop.*: <error message>
+                msg = err.message.split(':', 2)
+                if len(msg) == 3:
+                    msg = msg[-1]
+                else:
+                    msg = err.message
+                print(msg)
+                me = ModemError("%s failed: %s" % (self.request.replace('_', ' '),
+                                                   msg))
                 self.error_func(me)
 
     def on_get_managed_objects_finished(self, proxy, res, user_data):
diff --git a/src/prepaid-manager-applet.py b/src/prepaid-manager-applet.py
index 60486cf..8b227a0 100755
--- a/src/prepaid-manager-applet.py
+++ b/src/prepaid-manager-applet.py
@@ -285,8 +285,8 @@ class PPMController(Gtk.Application):
         GLib.timeout_add(500, self.init_account_and_provider)
 
     def on_modem_error(self, e):
-        self.view.show_modem_error(e.msg)
         logging.error(e.msg)
+        self.view.show_modem_error(e.msg)
         # The modem might have disconnected. So reschedule the setup
         self.schedule_setup()