Attachment #22841 for bug #61265

View | Details | Raw Unified | Return to bug 61265
Collapse All | Expand All




				      CdIccStore *store)
{
	CdIccStorePrivate *priv = GET_PRIVATE (store);
	g_autoptr(CdIcc) tmp = NULL;
	CdIccStoreDirHelper *helper;
	g_autofree gchar *path = NULL;

- 
 CdMain: failed to emit ProfileAdded: failed to register object:
 An object is already exported for the interface
 org.freedesktop.ColorManager.Profile at .../profiles/icc_<checksum>
--
src/cd-main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Lines 1656-1661 cd_main_icc_store_added_cb (CdIccStore *icc_store, Link Here

(-)a/src/cd-main.c (-2 / +2 lines)
1656	if (!ret) {	1656	if (!ret) {
1657	g_warning ("CdMain: failed to emit ProfileAdded: %s",	1657	g_warning ("CdMain: failed to emit ProfileAdded: %s",
1658	error->message);	1658	error->message);
		1659	cd_profile_array_remove (priv->profiles_array, profile);
1659	return;	1660	return;
1660	}	1661	}
1661	}	1662	}
Lines 1666-1672 cd_main_icc_store_removed_cb (CdIccStore *icc_store, Link Here
1666	gpointer user_data)	1667	gpointer user_data)
1667	{	1668	{
1668	CdMainPrivate priv = (CdMainPrivate ) user_data;	1669	CdMainPrivate priv = (CdMainPrivate ) user_data;
1669	CdProfile *profile;	1670	g_autoptr(CdProfile) profile = NULL;
1670		1671
1671	/* check the profile should be invalidated automatically */	1672	/* check the profile should be invalidated automatically */
1672	profile = cd_profile_array_get_by_filename (priv->profiles_array,	1673	profile = cd_profile_array_get_by_filename (priv->profiles_array,
1673	-

Return to bug 61265

Lines 299-305 cd_icc_store_file_monitor_changed_cb (GFileMonitor *monitor, Link Here

(-)a/lib/colord/cd-icc-store.c (-3 / +1 lines)
299	CdIccStore *store)	299	CdIccStore *store)
300	{	300	{
301	CdIccStorePrivate *priv = GET_PRIVATE (store);	301	CdIccStorePrivate *priv = GET_PRIVATE (store);
302	CdIcc *tmp;	302	g_autoptr(CdIcc) tmp = NULL;
303	CdIccStoreDirHelper *helper;	303	CdIccStoreDirHelper *helper;
304	g_autofree gchar *path = NULL;	304	g_autofree gchar *path = NULL;
305		305
306	-
307	CdMain: failed to emit ProfileAdded: failed to register object:	306	CdMain: failed to emit ProfileAdded: failed to register object:
308	An object is already exported for the interface	307	An object is already exported for the interface
309	org.freedesktop.ColorManager.Profile at .../profiles/icc_<checksum>	308	org.freedesktop.ColorManager.Profile at .../profiles/icc_<checksum>
310	--
311	src/cd-main.c \| 3 ++-	309	src/cd-main.c \| 3 ++-
312	1 file changed, 2 insertions(+), 1 deletion(-)	310	1 file changed, 2 insertions(+), 1 deletion(-)