[latexila/wip/latexila-next: 52/56] Don't use gtk_icon_theme_add_builtin_icon() (deprecated)

[Sébastien Wilmet <swilmet src gnome org>]

commit a001db4e7ac3fe7975bfb331dc48695549dd70c2
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri Jul 11 17:10:03 2014 +0200

    Don't use gtk_icon_theme_add_builtin_icon() (deprecated)
    
    Use gtk_icon_theme_add_resource_path() instead, which is easier to use.

 configure.ac                          |    2 +-
 src/liblatexila/latexila-build-view.c |    6 +-
 src/liblatexila/latexila-utils.c      |   72 +++++---------------------------
 3 files changed, 16 insertions(+), 64 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d420cc9..cc002e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ LT_INIT
 # Required dependencies versions
 # Update also the --target-glib option in src/Makefile.am.
 GLIB_REQUIRED_VERSION="2.40"
-GTK_REQUIRED_VERSION="3.6"
+GTK_REQUIRED_VERSION="3.13.4"
 GTKSOURCEVIEW_REQUIRED_VERSION="3.10"
 GTKSPELL_REQUIRED_VERSION="3.0.4"
 VALA_REQUIRED_VERSION="0.20.0"
diff --git a/src/liblatexila/latexila-build-view.c b/src/liblatexila/latexila-build-view.c
index 9e74780..1ee5260 100644
--- a/src/liblatexila/latexila-build-view.c
+++ b/src/liblatexila/latexila-build-view.c
@@ -123,7 +123,7 @@ get_icon_name_from_state (LatexilaBuildState state)
     case LATEXILA_BUILD_STATE_SUCCEEDED:
       /* This stock item doesn't have an icon name replacement, but the stock-id
        * works fine. For GTK+ 4 it will probably be removed, so we can copy the
-       * icon (at the good size) in the latexila sources.
+       * icon in the latexila sources.
        */
       G_GNUC_BEGIN_IGNORE_DEPRECATIONS
       return GTK_STOCK_APPLY;
@@ -146,7 +146,7 @@ get_icon_name_from_msg_type (LatexilaBuildMsgType type)
   switch (type)
     {
     case LATEXILA_BUILD_MSG_TYPE_JOB_SUB_COMMAND:
-      return "latexila-gray-square";
+      return "gray-square";
 
     case LATEXILA_BUILD_MSG_TYPE_ERROR:
       return "dialog-error";
@@ -155,7 +155,7 @@ get_icon_name_from_msg_type (LatexilaBuildMsgType type)
       return "dialog-warning";
 
     case LATEXILA_BUILD_MSG_TYPE_BADBOX:
-      return "latexila-badbox";
+      return "badbox";
 
     default:
       return NULL;
diff --git a/src/liblatexila/latexila-utils.c b/src/liblatexila/latexila-utils.c
index 0d6de02..686a6e4 100644
--- a/src/liblatexila/latexila-utils.c
+++ b/src/liblatexila/latexila-utils.c
@@ -150,70 +150,22 @@ latexila_utils_replace_home_dir_with_tilde (const gchar *filename)
 /**
  * latexila_utils_register_icons:
  *
- * Register the LaTeXila icons to the #GtkIconTheme as built-in icons prefixed
- * with "latexila-". For example the icon located at
- * data/images/stock-icons/badbox.png in the LaTeXila git repository will be
- * available with the icon name "latexila-badbox". The "stock-icons" directory
- * name is for historical reasons and should be changed when stock icons are no
- * longer used in LaTeXila.
+ * Register the LaTeXila icons to the #GtkIconTheme as built-in icons. For
+ * example the icon located at data/images/stock-icons/badbox.png in the
+ * LaTeXila git repository will be available with the icon name "badbox". The
+ * "stock-icons" directory name is for historical reasons and should be changed
+ * when stock icons are no longer used in LaTeXila.
+ *
+ * TODO: prefix icon names with "latexila-", so the badbox.png would be
+ * "latexila-badbox". Also, put icons in subdirectories for each size, so it is
+ * better for icons available in several sizes. As an example there is currently
+ * table-size16.png and table-size24.png.
  */
 void
 latexila_utils_register_icons (void)
 {
-  gchar *resource_path = "/org/gnome/latexila/stock-icons/";
-  gchar **icon_files;
-  gchar **icon_file;
-  GError *error = NULL;
-
-  icon_files = g_resources_enumerate_children (resource_path,
-                                               G_RESOURCE_LOOKUP_FLAGS_NONE,
-                                               &error);
-
-  if (error != NULL)
-    {
-      g_warning ("Failed to register new icons: %s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  for (icon_file = icon_files; icon_file != NULL && *icon_file != NULL; icon_file++)
-    {
-      gchar *icon_path;
-      GdkPixbuf *pixbuf;
-
-      icon_path = g_strdup_printf ("%s%s", resource_path, *icon_file);
-      pixbuf = gdk_pixbuf_new_from_resource (icon_path, &error);
-
-      if (error == NULL)
-        {
-          gint width = gdk_pixbuf_get_width (pixbuf);
-          gint height = gdk_pixbuf_get_height (pixbuf);
-          gint size = MAX (width, height);
-          gchar *short_name = latexila_utils_get_shortname (*icon_file);
-          gchar *icon_name = g_strdup_printf ("latexila-%s", short_name);
-
-          if (width != height)
-            {
-              g_warning ("Icon with different width and height: %s", *icon_file);
-            }
-
-          gtk_icon_theme_add_builtin_icon (icon_name, size, pixbuf);
-
-          g_free (short_name);
-          g_free (icon_name);
-        }
-      else
-        {
-          g_warning ("Failed to register icon: %s", error->message);
-          g_error_free (error);
-          error = NULL;
-        }
-
-      g_free (icon_path);
-      g_object_unref (pixbuf);
-    }
-
-  g_strfreev (icon_files);
+  gtk_icon_theme_add_resource_path (gtk_icon_theme_get_default (),
+                                    "/org/gnome/latexila/stock-icons/");
 }
 
 /**