lp://qastaging/~dobey/ubuntuone-client/no-pygtk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/ubuntuone-client at revision 1379

Brian Curtin (community): Approve on 2013-01-28

Paul Hummer (community): Approve on 2013-01-28

Diff: 346 lines (+42/-111)

10 files modified

bin/u1sdtool (+3/-8)
bin/ubuntuone-syncdaemon (+4/-8)
contrib/dbus-docs (+3/-6)
contrib/login_email_password.py (+3/-9)
tests/platform/notification/test_linux.py (+4/-15)
tests/platform/os_helper/test_linux.py (+5/-10)
ubuntuone/platform/notification/__init__.py (+1/-3)
ubuntuone/platform/notification/linux.py (+11/-29)
ubuntuone/platform/os_helper/linux.py (+5/-10)
ubuntuone/platform/sync_menu/linux.py (+3/-13)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1108036: Twisted use of pygtkcompat breaks support of old pygobject APIS

Critical

Fix Released

Link a bug report

Related blueprints

1383. By dobey on 2013-01-28

Fix sync_menu to move glib import into try/except as well.

1382. By dobey on 2013-01-28

Need to revert the os_helper change and keep allowing older gio usage for now.

1381. By dobey on 2013-01-28

Update copyright headers in modified files.

1380. By dobey on 2013-01-28

Also remove use of glib2reactor from other scripts

1379. By dobey on 2013-01-28

Only ever use gi.repository based APIs from now on.

1378. By Mike McCracken on 2013-01-18

- Clean up test suite for filesystem_notifications on darwin and windows.

1377. By dobey on 2013-01-17

Don't use g_type_init with new versions of glib.

1376. By Mike McCracken on 2013-01-17

- Patch NetworkManagerState in test_interaction_interfaces so it doesn't interfere with tests.

1375. By Mike McCracken on 2013-01-17

- Remove intermittent failures in ConnectionTestCase: tests now wait until test server is fully initialized.

1374. By Mike McCracken on 2013-01-17

- Reduce number of files test suite opens and doesn't close.