From 81d8f2abc35f5b748474489ed567c6e682267ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Thu, 16 Jan 2025 23:13:15 +0100 Subject: [PATCH] M!157 - Replace all occurences of gtk_icon_info_free GtkIconInfo is a GObject so we can just use g_object_unref. Closes: https://gitlab.gnome.org/GNOME/evolution/-/merge_requests/157 --- src/addressbook/gui/widgets/eab-contact-formatter.c | 2 +- src/e-util/e-attachment-view.c | 2 +- src/e-util/e-emoticon.c | 2 +- src/e-util/e-icon-factory.c | 2 +- src/e-util/e-image-chooser.c | 2 +- src/e-util/e-online-button.c | 2 +- src/e-util/e-stock-request.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/addressbook/gui/widgets/eab-contact-formatter.c b/src/addressbook/gui/widgets/eab-contact-formatter.c index 081d630afb..b6f2acdf99 100644 --- a/src/addressbook/gui/widgets/eab-contact-formatter.c +++ b/src/addressbook/gui/widgets/eab-contact-formatter.c @@ -99,7 +99,7 @@ icon_available (const gchar *icon) icon_theme = gtk_icon_theme_get_default (); icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon, 16, 0); if (icon_info != NULL) - gtk_icon_info_free (icon_info); + g_object_unref (icon_info); return icon_info != NULL; } diff --git a/src/e-util/e-attachment-view.c b/src/e-util/e-attachment-view.c index 9e7a012207..469f9aa0ad 100644 --- a/src/e-util/e-attachment-view.c +++ b/src/e-util/e-attachment-view.c @@ -1914,7 +1914,7 @@ e_attachment_view_drag_begin (EAttachmentView *view, g_error_free (error); } - gtk_icon_info_free (icon_info); + g_object_unref (icon_info); } g_object_unref (icon); diff --git a/src/e-util/e-emoticon.c b/src/e-util/e-emoticon.c index 8082e7238b..fdea149e33 100644 --- a/src/e-util/e-emoticon.c +++ b/src/e-util/e-emoticon.c @@ -116,7 +116,7 @@ e_emoticon_dup_uri (const EEmoticon *emoticon) if (filename != NULL) { uri = g_filename_to_uri (filename, NULL, NULL); } - gtk_icon_info_free (icon_info); + g_object_unref (icon_info); g_return_val_if_fail (uri != NULL, NULL); return uri; diff --git a/src/e-util/e-icon-factory.c b/src/e-util/e-icon-factory.c index e43290de96..a397067a26 100644 --- a/src/e-util/e-icon-factory.c +++ b/src/e-util/e-icon-factory.c @@ -87,7 +87,7 @@ e_icon_factory_get_icon_filename (const gchar *icon_name, if (icon_info != NULL) { filename = g_strdup ( gtk_icon_info_get_filename (icon_info)); - gtk_icon_info_free (icon_info); + g_object_unref (icon_info); } return filename; diff --git a/src/e-util/e-image-chooser.c b/src/e-util/e-image-chooser.c index 317e87aea4..58222c2e53 100644 --- a/src/e-util/e-image-chooser.c +++ b/src/e-util/e-image-chooser.c @@ -322,7 +322,7 @@ image_chooser_set_icon_name (EImageChooser *chooser, filename = gtk_icon_info_get_filename (icon_info); e_image_chooser_set_from_file (chooser, filename); - gtk_icon_info_free (icon_info); + g_object_unref (icon_info); } static void diff --git a/src/e-util/e-online-button.c b/src/e-util/e-online-button.c index 3d48f2f495..a1d287fd8c 100644 --- a/src/e-util/e-online-button.c +++ b/src/e-util/e-online-button.c @@ -210,7 +210,7 @@ e_online_button_set_online (EOnlineButton *button, icon_theme, icon_name, GTK_ICON_SIZE_BUTTON, 0); filename = gtk_icon_info_get_filename (icon_info); online_button_update_icon (image, filename); - gtk_icon_info_free (icon_info); + g_object_unref (icon_info); g_object_notify (G_OBJECT (button), "online"); } diff --git a/src/e-util/e-stock-request.c b/src/e-util/e-stock-request.c index 9ffe183b0f..2875104fa8 100644 --- a/src/e-util/e-stock-request.c +++ b/src/e-util/e-stock-request.c @@ -179,7 +179,7 @@ process_stock_request_idle_cb (gpointer user_data) } } - gtk_icon_info_free (icon_info); + g_object_unref (icon_info); } else if (g_strcmp0 (g_uri_get_host (guri), "x-evolution-arrow-down") == 0) { GdkPixbuf *pixbuf; GdkRGBA rgba; -- GitLab