Merge lp:~dobey/ubuntuone-client/grrrr-gir-4-0 into lp:ubuntuone-client/stable-4-0

[dobey]

Use GI bindings of GLib instead of static bindings in launch/login scripts.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Mike McCracken (mikemc)]

review: Approve

=== modified file 'bin/ubuntuone-launch'
--- bin/ubuntuone-launch	2012-04-09 20:07:05 +0000
+++ bin/ubuntuone-launch	2012-10-16 14:21:26 +0000
@@ -63,10 +63,9 @@
         sys.exit(1)
 
 import dbus
-import glib
-import gobject
 
 from dbus.mainloop.glib import DBusGMainLoop
+from gi.repository import GLib
 from twisted.internet import defer
 
 from ubuntuone.syncdaemon.config import get_user_config
@@ -76,7 +75,7 @@
 @defer.inlineCallbacks
 def main():
     """Start syncdaemon and ask it to connect, if possible."""
-    gobject.set_application_name("ubuntuone-launch")
+    GLib.set_application_name("ubuntuone-launch")
 
     files_sync_enabled = get_user_config().get_files_sync_enabled()
     if not files_sync_enabled:
@@ -99,5 +98,5 @@
     # os._exit feels like it's cheating, but it's simple and fast
     d.addCallbacks(lambda _: os._exit(0), lambda _: os._exit(1))
 
-    mainloop = glib.MainLoop()
+    mainloop = GLib.MainLoop()
     mainloop.run()
 
=== modified file 'bin/ubuntuone-login'
--- bin/ubuntuone-login	2012-06-18 08:48:44 +0000
+++ bin/ubuntuone-login	2012-10-16 14:21:26 +0000
@@ -40,8 +40,8 @@
 
 import dbus.mainloop.glib
 import dbus.service
-import glib
 
+from gi.repository import GLib
 from ubuntuone.logger import basic_formatter
 from ubuntuone.platform.credentials import logger
 from ubuntuone.platform.credentials.dbus_service import (
@@ -70,8 +70,8 @@
 
     logger.info("Starting Ubuntu One login manager for bus %r.", DBUS_BUS_NAME)
     bus_name = dbus.service.BusName(DBUS_BUS_NAME, bus=dbus.SessionBus())
-    mainloop = glib.MainLoop()
-    CredentialsManagement(timeout_func=glib.timeout_add,
+    mainloop = GLib.MainLoop()
+    CredentialsManagement(timeout_func=GLib.timeout_add,
                           shutdown_func=mainloop.quit,
                           bus_name=bus_name, object_path=DBUS_CREDENTIALS_PATH)