lp:~charlesk/indicator-transfer/add-plugins

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:indicator-transfer/15.10 at revision 33

Ken VanDine: Approve on 2015-08-13

Renato Araujo Oliveira Filho (community): Approve on 2015-08-13

PS Jenkins bot (community): Approve (continuous-integration) on 2015-08-13

Diff: 2168 lines (+1134/-224)

36 files modified

CMakeLists.txt (+18/-4)
cmake/FindValgrind.cmake (+41/-0)
cmake_uninstall.cmake.in (+21/-0)
data/CMakeLists.txt (+9/-0)
data/indicator-transfer.pc.in (+8/-0)
debian/control (+30/-2)
debian/indicator-transfer-download-manager.install (+1/-0)
debian/indicator-transfer.install (+5/-0)
debian/libindicator-transfer-dev.install (+3/-0)
debian/libindicator-transfer0.install (+1/-0)
include/transfer/CMakeLists.txt (+6/-2)
include/transfer/controller.h (+3/-3)
include/transfer/dm-source.h (+15/-14)
include/transfer/multisource.h (+58/-0)
include/transfer/plugin-source.h (+49/-0)
include/transfer/source.h (+15/-5)
include/transfer/transfer.h (+5/-5)
src/CMakeLists.txt (+19/-8)
src/controller.cpp (+8/-8)
src/dm-plugin/CMakeLists.txt (+21/-0)
src/dm-plugin/dm-plugin.cpp (+32/-0)
src/dm-plugin/dm-source.cpp (+46/-36)
src/main.cpp (+4/-4)
src/multisource.cpp (+207/-0)
src/plugin-source.cpp (+108/-0)
src/source.cpp (+2/-2)
tests/CMakeLists.txt (+18/-12)
tests/controller-mock.h (+2/-2)
tests/data/valgrind.suppression (+2/-0)
tests/glib-fixture.h (+27/-36)
tests/mock-source-plugin.cpp (+32/-0)
tests/source-mock.h (+11/-6)
tests/test-controller.cpp (+68/-68)
tests/test-multisource.cpp (+166/-0)
tests/test-plugin-source.cpp (+66/-0)
tests/test-view-gmenu.cpp (+7/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

51. By Charles Kerr on 2015-08-13

sync with trunk

50. By Renato Filho on 2015-08-03

merge lp:~renatofilho/indicator-transfer/add-plugins-fix-build

49. By Charles Kerr on 2015-08-03

remove unused google test cmake rules; use a more selective target_link_library for the test plugin library

48. By Charles Kerr on 2015-08-03

use target_link_libraries for the mock-source-plugin test module too

47. By Charles Kerr on 2015-08-03

add target_link_libraries for libindicator-transfer.so

46. By Charles Kerr on 2015-07-31

merge renato's dev package branch <lp:~renatofilho/indicator-transfer/dev-package>

Merged branch lp:~renatofilho/indicator-transfer/dev-package

45. By Charles Kerr on 2015-07-31

make Transfer class method virtual

44. By Charles Kerr on 2015-07-31

remove unnecessary function declarations

43. By Charles Kerr on 2015-07-30

add -fPIC to make linker happy

42. By Charles Kerr on 2015-07-30

hm, it helps if you bzr add all the new files... :/