diff options
| -rw-r--r-- | NEWS | 9 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libmcclient/Makefile.am | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/mcd-account-manager-default.h | 2 | ||||
| -rw-r--r-- | src/mcd-account-manager-sso.h | 2 | ||||
| -rw-r--r-- | src/mcd-account-manager.h | 2 | ||||
| -rw-r--r-- | src/mcd-account.h | 3 | ||||
| -rw-r--r-- | tools/header-checks.am | 9 |
9 files changed, 36 insertions, 2 deletions
@@ -1,6 +1,8 @@ -telepathy-mission-control 5.8.0 (UNRELEASED) +telepathy-mission-control 5.8.0 (2011-07-22) ============================================ +The "It's a big ball of... branchy-wanchy stuff" release + Fixes: • Fix the regression tests to pass under newer telepathy-glib versions @@ -23,6 +25,11 @@ Fixes: not correctly handle all internal requests which should have been dispatched to an existing channel (fledermaus) +• The McdTransport framework should have considered "no plugins" to be + equivalent to "proceed", not "abort" (fledermaus) + +• Some files were missing G_END_DECLS, which broke C++ includes (fledermaus) + Enhancements: • Centralised debug control for MCP plugins via MCP_DEBUG environment diff --git a/configure.ac b/configure.ac index 88a42cfa..606aa0e6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Set the version number to e.g. 5.0.beta42 immediately before a release. dnl Set the version number to e.g. 5.0.beta42+ immediately after (this will dnl enable -Werror). -AC_INIT([telepathy-mission-control], [5.7.11+]) +AC_INIT([telepathy-mission-control], [5.8.0]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR(Makefile.am) diff --git a/libmcclient/Makefile.am b/libmcclient/Makefile.am index 4a64e3df..7a085963 100644 --- a/libmcclient/Makefile.am +++ b/libmcclient/Makefile.am @@ -204,3 +204,8 @@ _gen/svc-%.c _gen/svc-%.h: _gen/%.xml \ --not-implemented-func='tp_dbus_g_method_return_not_implemented' \ --allow-unstable \ $< Mc_Svc_ + +include ../tools/header-checks.am + +check-local: header-decl-macro-check + diff --git a/src/Makefile.am b/src/Makefile.am index dbc10d3d..9637fbd8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -358,3 +358,7 @@ _gen/svc-%.c _gen/svc-%.h: _gen/%.xml \ --not-implemented-func='tp_dbus_g_method_return_not_implemented' \ --allow-unstable \ $< Mc_Svc_ + +include ../tools/header-checks.am + +check-local: header-decl-macro-check diff --git a/src/mcd-account-manager-default.h b/src/mcd-account-manager-default.h index 06541d5a..99635bf9 100644 --- a/src/mcd-account-manager-default.h +++ b/src/mcd-account-manager-default.h @@ -71,4 +71,6 @@ GType mcd_account_manager_default_get_type (void) G_GNUC_CONST; McdAccountManagerDefault *mcd_account_manager_default_new (void); +G_END_DECLS + #endif diff --git a/src/mcd-account-manager-sso.h b/src/mcd-account-manager-sso.h index c4c6e8ad..108d0704 100644 --- a/src/mcd-account-manager-sso.h +++ b/src/mcd-account-manager-sso.h @@ -97,4 +97,6 @@ gboolean _mcd_account_manager_sso_get ( const gchar *account_suffix, const gchar *key); +G_END_DECLS + #endif diff --git a/src/mcd-account-manager.h b/src/mcd-account-manager.h index f9edf844..1d2bd19e 100644 --- a/src/mcd-account-manager.h +++ b/src/mcd-account-manager.h @@ -99,4 +99,6 @@ McdAccount *mcd_account_manager_lookup_account_by_path (McdAccountManager *accou McdStorage *mcd_account_manager_get_storage (McdAccountManager *manager); +G_END_DECLS + #endif diff --git a/src/mcd-account.h b/src/mcd-account.h index f81812f8..61689b4a 100644 --- a/src/mcd-account.h +++ b/src/mcd-account.h @@ -140,4 +140,7 @@ gboolean mcd_account_parameter_is_secret (McdAccount *self, const gchar *name); void mcd_account_property_changed (McdAccount *account, const gchar *name); + +G_END_DECLS + #endif diff --git a/tools/header-checks.am b/tools/header-checks.am new file mode 100644 index 00000000..af94dda3 --- /dev/null +++ b/tools/header-checks.am @@ -0,0 +1,9 @@ +header-decl-macro-check: $(filter %.h,$(DIST_SOURCES)) + @(for H in $^; \ + do \ + if [ x"$$(grep -l G_BEGIN_DECLS $$H)" != x"$$(grep -l G_END_DECLS $$H)" ]; \ + then \ + echo Unbalanced G_\*_DECL macros in $$H; \ + exit 1; \ + fi;\ + done) |