Online Accounts: GNOME Control Center

Merge lp://qastaging/~ballogy/gnome-control-center-signon/standalone-fixes into lp://qastaging/gnome-control-center-signon

standalone-fixes
Merge into trunk

Proposed by Balló György on 2012-10-29

Status:	Merged
Approved by:	David King on 2012-10-30
Approved revision:	121
Merged at revision:	121
Proposed branch:	lp://qastaging/~ballogy/gnome-control-center-signon/standalone-fixes
Merge into:	lp://qastaging/gnome-control-center-signon
Diff against target:	30 lines (+7/-1) 2 files modified Makefile.am (+6/-0) data/credentials-preferences.desktop.in.in (+1/-1)
To merge this branch:	bzr merge lp://qastaging/~ballogy/gnome-control-center-signon/standalone-fixes
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
David King (community)		2012-10-29	Approve on 2012-10-30
Review via email: mp+131993@code.qastaging.launchpad.net

Description of the change

This change contains two small fixes when building the standalone binary:

* Fix building tests by removing libcredentials.la from tests_ldadd if build without gnome-control-center

* Remove 'X-GNOME-Settings-Panel' from categories in credentials-preferences.desktop file, because if defined, the desktop file does not appear in the GNOME menu.

Revision history for this message