From 85976cf91deae6ac7cf1639a187a424ff7296968 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 2 Nov 2012 14:54:19 +0000 Subject: [PATCH] Bring back a couple of private-but-extern symbols These both existed in 2.34.1, but are not exposed in headers, and were meant to be private. Making them static (in commit 84475e43) was technically an ABI break, and in particular it causes abicheck.sh to fail. Bug: https://bugzilla.gnome.org/show_bug.cgi?id=687441 Reviewed-by: Colin Walters --- gio/gmenumodel.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gio/gmenumodel.c b/gio/gmenumodel.c index f9cd826..822e155 100644 --- a/gio/gmenumodel.c +++ b/gio/gmenumodel.c @@ -195,7 +195,9 @@ typedef struct typedef GMenuLinkIterClass GMenuLinkHashIterClass; -static GType g_menu_link_hash_iter_get_type (void); +/* Strictly speaking, this is (unintentionally) ABI now, but don't use it + * outside GIO. bgo#687441 */ +GType g_menu_link_hash_iter_get_type (void); G_DEFINE_TYPE (GMenuLinkHashIter, g_menu_link_hash_iter, G_TYPE_MENU_LINK_ITER) @@ -251,7 +253,9 @@ typedef struct typedef GMenuAttributeIterClass GMenuAttributeHashIterClass; -static GType g_menu_attribute_hash_iter_get_type (void); +/* Strictly speaking, this is (unintentionally) ABI now, but don't use it + * outside GIO. bgo#687441 */ +GType g_menu_attribute_hash_iter_get_type (void); G_DEFINE_TYPE (GMenuAttributeHashIter, g_menu_attribute_hash_iter, G_TYPE_MENU_ATTRIBUTE_ITER) -- 2.7.4