libappindicator

Merge lp://staging/~charlesk/libappindicator/fix-test-merge into lp://staging/libappindicator/13.04

fix-test-merge
Merge into trunk.13.04

Proposed by Charles Kerr on 2013-01-29

Status:

Merged

Approved by:

Ted Gould on 2013-01-30

Approved revision:

253

Merged at revision:

248

Proposed branch:

lp://staging/~charlesk/libappindicator/fix-test-merge

Merge into:

lp://staging/libappindicator/13.04

Diff against target:

789 lines (+106/-307)

18 files modified

autogen.sh (+1/-0)
configure.ac (+2/-2)
debian/changelog (+8/-9)
debian/control (+1/-0)
debian/rules (+9/-3)
docs/reference/Makefile.am (+10/-12)
docs/reference/tmpl/libappindicator-unused.sgml (+0/-42)
gtk-doc.local.make (+0/-194)
src/app-indicator.c (+10/-16)
src/generate-id.c (+1/-1)
tests/Makefile.am (+9/-1)
tests/test-libappindicator-dbus-client.c (+0/-2)
tests/test-libappindicator-fallback-item.c (+1/-1)
tests/test-libappindicator-fallback-watcher.c (+2/-3)
tests/test-libappindicator-status-client.c (+2/-4)
tests/test-libappindicator-status-server.c (+22/-15)
tests/test-libappindicator.c (+28/-0)
tests/test-simple-app.c (+0/-2)

To merge this branch:

bzr merge lp://staging/~charlesk/libappindicator/fix-test-merge

Related bugs:

Bug #1102589: Coverity INTEGER_OVERFLOW - CID 10970	Medium	Fix Released
Bug #1102595: Coverity COPY_PASTE_ERROR - CID 10969	Medium	Fix Released
Bug #1103087: indicators call deprecated glib function g_type_init()	High	Fix Released
Bug #1109128: test-libappindicator-status fails with "Toggle count: 99"	Medium	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Ted Gould (community)		2013-01-29	Approve on 2013-01-30
PS Jenkins bot (community)	continuous-integration		Approve on 2013-01-29
Review via email: mp+145454@code.staging.launchpad.net

Commit message

This is a continuation of ~mathieu-tl/libappindicator/fix-test-merge/ which adds fixes for bug #1102589, bug #1102595, bug #1109128, and bug #1103087, which should get it finally passing CI.

Description of the change

This is a continuation of ~mathieu-tl/libappindicator/fix-test-merge/ which adds fixes for bug #1102589, bug #1102595, bug #1109128, and bug #1103087, which should get it finally passing CI.