Online Accounts: GNOME Control Center

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

  1. standalone-fixes
  2. Merge into trunk
Proposed by Balló György
Status: Merged
Approved by: David King
Approved revision: 121
Merged at revision: 121
Proposed branch: lp:~ballogy/gnome-control-center-signon/standalone-fixes
Merge into: lp: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:~ballogy/gnome-control-center-signon/standalone-fixes
Reviewer Review Type Date Requested Status
David King (community) Approve
Review via email: mp+131993@code.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.

To post a comment you must log in.
Revision history for this message
David King (amigadave) wrote :

Looks good, thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2012-10-26 07:50:16 +0000
3+++ Makefile.am 2012-10-29 23:13:24 +0000
4@@ -149,10 +149,16 @@
5 dist_check_SCRIPTS = \
6 tests/test-account-plugin.sh
7
8+if WITH_GNOME_CONTROL_CENTER
9 tests_ldadd = \
10 $(CREDENTIALS_PANEL_LIBS) \
11 libaccount-plugin-@LIBACCOUNT_PLUGIN_API_VERSION@.la \
12 libcredentials.la
13+else
14+tests_ldadd = \
15+ $(CREDENTIALS_PANEL_LIBS) \
16+ libaccount-plugin-@LIBACCOUNT_PLUGIN_API_VERSION@.la
17+endif
18
19 tests_test_account_applications_model_SOURCES = \
20 $(common_vala_sources) \
21
22=== modified file 'data/credentials-preferences.desktop.in.in'
23--- data/credentials-preferences.desktop.in.in 2012-10-23 06:41:16 +0000
24+++ data/credentials-preferences.desktop.in.in 2012-10-29 23:13:24 +0000
25@@ -6,4 +6,4 @@
26 Terminal=false
27 Type=Application
28 StartupNotify=true
29-Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;
30+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-PersonalSettings;

Subscribers

People subscribed via source and target branches