From 824bc48adb464d5360237975fc5369f0b634d9b9 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Mon, 19 Nov 2012 16:10:55 -0500 Subject: [PATCH] Remove two accidentally-exported symbols This reverts commit 85976cf91deae6ac7cf1639a187a424ff7296968 and properly removes the offending symbols from gio.symbols. These two private symbols were found to be exported during Colin's recent work cleaning up function visibility (among other things). They were never exposed in any header file and I am 100% certain that they have never been used by anybody. They were always private -- only exposed on the library symbol list. This change will cause ABI checking tools to complain that we have removed functions, but the change is completely harmless for actual applications. https://bugzilla.gnome.org/show_bug.cgi?id=687441 --- gio/gio.symbols | 2 -- gio/gmenumodel.c | 8 ++------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/gio/gio.symbols b/gio/gio.symbols index b2a95b2..b1808f2 100644 --- a/gio/gio.symbols +++ b/gio/gio.symbols @@ -1680,7 +1680,6 @@ g_menu_append g_menu_append_item g_menu_append_section g_menu_append_submenu -g_menu_attribute_hash_iter_get_type g_menu_attribute_iter_get_name g_menu_attribute_iter_get_next g_menu_attribute_iter_get_type @@ -1709,7 +1708,6 @@ g_menu_item_set_label g_menu_item_set_link g_menu_item_set_section g_menu_item_set_submenu -g_menu_link_hash_iter_get_type g_menu_link_iter_get_name g_menu_link_iter_get_next g_menu_link_iter_get_type diff --git a/gio/gmenumodel.c b/gio/gmenumodel.c index 822e155..f9cd826 100644 --- a/gio/gmenumodel.c +++ b/gio/gmenumodel.c @@ -195,9 +195,7 @@ typedef struct typedef GMenuLinkIterClass GMenuLinkHashIterClass; -/* 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); +static GType g_menu_link_hash_iter_get_type (void); G_DEFINE_TYPE (GMenuLinkHashIter, g_menu_link_hash_iter, G_TYPE_MENU_LINK_ITER) @@ -253,9 +251,7 @@ typedef struct typedef GMenuAttributeIterClass GMenuAttributeHashIterClass; -/* 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); +static 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