brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backends/color-store: Unify and simplify codepaths for profile ready

Browse Source 
Just steal from the hash table all the times, and use autopointers
to cleanup if needed

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3788>
This commit is contained in:
Marco Trevisan (Treviño) 2024-05-29 20:57:03 +02:00 committed by Marge Bot
parent 430e55a535
commit de8691c7ff
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/backends/meta-color-store.c
View File

@ -90,21 +90,17 @@ on_directory_profile_ready (MetaColorProfile *color_profile,
gboolean success, gboolean success,
MetaColorStore *color_store) MetaColorStore *color_store)
{ {
g_autoptr (MetaColorProfile) stolen_color_profile = NULL;
g_autofree char *stolen_file_path = NULL;
if (!g_hash_table_steal_extended (color_store->pending_local_profiles,
meta_color_profile_get_file_path (color_profile),
(gpointer *) &stolen_file_path,
(gpointer *) &stolen_color_profile))
g_warn_if_reached ();
if (!success) if (!success)
{ return;
g_hash_table_remove (color_store->pending_local_profiles,
meta_color_profile_get_file_path (color_profile));
return;
}
g_object_ref (color_profile);
if (!g_hash_table_remove (color_store->pending_local_profiles,
meta_color_profile_get_file_path (color_profile)))
{
g_object_unref (color_profile);
g_warn_if_reached ();
}
g_hash_table_insert (color_store->profiles, g_hash_table_insert (color_store->profiles,
g_strdup (meta_color_profile_get_id (color_profile)), g_strdup (meta_color_profile_get_id (color_profile)),
@ -113,8 +109,6 @@ on_directory_profile_ready (MetaColorProfile *color_profile,
meta_topic (META_DEBUG_COLOR, "Created colord profile '%s' from '%s'", meta_topic (META_DEBUG_COLOR, "Created colord profile '%s' from '%s'",
meta_color_profile_get_id (color_profile), meta_color_profile_get_id (color_profile),
meta_color_profile_get_file_path (color_profile)); meta_color_profile_get_file_path (color_profile));
g_object_unref (color_profile);
} }
static void static void