From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 18 Oct 2019 12:20:25 +0000 (-0500)
Subject: Drop gtk_icon_theme_get_example_icon_name
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~696^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6373ced6084cb1b2e8824a2e94c68b0a3a386413;p=gtk4.git

Drop gtk_icon_theme_get_example_icon_name

This function is not useful. Every icon theme
on my system either does not have that field,
or has it as 'folder'. So, just use 'folder'
when you need an example icon.
---

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 93485b2def..ca90aca5b1 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -5310,7 +5310,6 @@ gtk_icon_theme_load_icon
 gtk_icon_theme_load_icon_for_scale
 gtk_icon_theme_list_icons
 gtk_icon_theme_get_icon_sizes
-gtk_icon_theme_get_example_icon_name
 gtk_icon_theme_rescan_if_needed
 gtk_icon_info_new_for_pixbuf
 gtk_icon_info_get_base_size
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index bf829c2584..fa25c55f49 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -258,7 +258,6 @@ typedef struct
   gchar *name;
   gchar *display_name;
   gchar *comment;
-  gchar *example;
 
   /* In search order */
   GList *dirs;
@@ -1140,10 +1139,6 @@ insert_theme (GtkIconTheme *self,
     g_key_file_get_locale_string (theme_file, 
                                   "Icon Theme", "Comment",
                                   NULL, NULL);
-  theme->example = 
-    g_key_file_get_string (theme_file, 
-                           "Icon Theme", "Example",
-                           NULL);
 
   theme->dirs = NULL;
   for (i = 0; dirs[i] != NULL; i++)
@@ -2322,41 +2317,6 @@ gtk_icon_theme_list_icons (GtkIconTheme *self,
   return list;
 }
 
-/**
- * gtk_icon_theme_get_example_icon_name:
- * @self: a #GtkIconTheme
- * 
- * Gets the name of an icon that is representative of the
- * current theme (for instance, to use when presenting
- * a list of themes to the user.)
- * 
- * Returns: (nullable): the name of an example icon or %NULL.
- *     Free with g_free().
- */
-gchar *
-gtk_icon_theme_get_example_icon_name (GtkIconTheme *self)
-{
-  GList *l;
-  IconTheme *theme;
-
-  g_return_val_if_fail (GTK_IS_ICON_THEME (self), NULL);
-  
-  ensure_valid_themes (self);
-
-  l = self->themes;
-  while (l != NULL)
-    {
-      theme = l->data;
-      if (theme->example)
-        return g_strdup (theme->example);
-      
-      l = l->next;
-    }
-  
-  return NULL;
-}
-
-
 static gboolean
 rescan_themes (GtkIconTheme *self)
 {
@@ -2422,7 +2382,6 @@ theme_destroy (IconTheme *theme)
   g_free (theme->display_name);
   g_free (theme->comment);
   g_free (theme->name);
-  g_free (theme->example);
 
   g_list_free_full (theme->dirs, (GDestroyNotify) theme_dir_destroy);
   
diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index fbe56bf8a7..9345af71b0 100644
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -198,8 +198,6 @@ GtkIconInfo * gtk_icon_theme_lookup_by_gicon_for_scale (GtkIconTheme
 GDK_AVAILABLE_IN_ALL
 GList *       gtk_icon_theme_list_icons            (GtkIconTheme                *self,
 						    const gchar                 *context);
-GDK_AVAILABLE_IN_ALL
-char *        gtk_icon_theme_get_example_icon_name (GtkIconTheme                *self);
 
 GDK_AVAILABLE_IN_ALL
 gboolean      gtk_icon_theme_rescan_if_needed      (GtkIconTheme                *self);