[nautilus] general: load fallback file icon from resources

[Ernestas Kulik <ernestask src gnome org>]

commit 366f0038c418d6bf3f8444fd3700a135d2d011b6
Author: Ernestas Kulik <ernestask gnome org>
Date:   Wed Aug 9 13:23:14 2017 +0300

    general: load fallback file icon from resources
    
    The fallback file icon is outdated now and the fact that it is stored in
    binary format in a source file makes it harder to update it. This commit
    uses the upstream PNG and changes the code to load it from resources.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=786042

 src/meson.build                      |    2 -
 src/nautilus-default-file-icon.c     |  534 ----------------------------------
 src/nautilus-default-file-icon.h     |   29 --
 src/nautilus-icon-info.c             |   12 +-
 src/nautilus-window.c                |    6 +
 src/resources/nautilus.gresource.xml |    1 +
 src/resources/text-x-preview.png     |  Bin 0 -> 923 bytes
 7 files changed, 9 insertions(+), 575 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index e9252f2..9f01f5b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -158,8 +158,6 @@ libnautilus_sources = [
     'nautilus-column-utilities.h',
     'nautilus-debug.c',
     'nautilus-debug.h',
-    'nautilus-default-file-icon.c',
-    'nautilus-default-file-icon.h',
     'nautilus-directory-async.c',
     'nautilus-directory-notify.h',
     'nautilus-directory-private.h',
diff --git a/src/nautilus-icon-info.c b/src/nautilus-icon-info.c
index 34d5844..854feb2 100644
--- a/src/nautilus-icon-info.c
+++ b/src/nautilus-icon-info.c
@@ -19,7 +19,6 @@
 #include <string.h>
 #include "nautilus-icon-info.h"
 #include "nautilus-icon-names.h"
-#include "nautilus-default-file-icon.h"
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 
@@ -545,15 +544,8 @@ nautilus_icon_info_get_pixbuf (NautilusIconInfo *icon)
     res = nautilus_icon_info_get_pixbuf_nodefault (icon);
     if (res == NULL)
     {
-        res = gdk_pixbuf_new_from_data (nautilus_default_file_icon,
-                                        GDK_COLORSPACE_RGB,
-                                        TRUE,
-                                        8,
-                                        nautilus_default_file_icon_width,
-                                        nautilus_default_file_icon_height,
-                                        nautilus_default_file_icon_width * 4,         /* stride */
-                                        NULL,         /* don't destroy info */
-                                        NULL);
+        res = gdk_pixbuf_new_from_resource ("/org/gnome/nautilus/text-x-preview.png",
+                                            NULL);
     }
 
     return res;
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 951059a..6eaa95c 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -3070,6 +3070,11 @@ nautilus_event_get_window_open_flags (void)
 void
 nautilus_window_show_about_dialog (NautilusWindow *window)
 {
+    const gchar *artists[] =
+    {
+        "The GNOME Project",
+        NULL
+    };
     const gchar *authors[] =
     {
         "Alexander Larsson",
@@ -3125,6 +3130,7 @@ nautilus_window_show_about_dialog (NautilusWindow *window)
                            "comments", _("Access and organize your files."),
                            "copyright", "Copyright © 1999–2016 The Files Authors",
                            "license-type", GTK_LICENSE_GPL_3_0,
+                           "artists", artists,
                            "authors", authors,
                            "documenters", documenters,
                            /* Translators should localize the following string
diff --git a/src/resources/nautilus.gresource.xml b/src/resources/nautilus.gresource.xml
index 720bfa5..3dd60ba 100644
--- a/src/resources/nautilus.gresource.xml
+++ b/src/resources/nautilus.gresource.xml
@@ -27,5 +27,6 @@
     <file alias="icons/knob.png">../../icons/knob.png</file>
     <file>css/Adwaita.css</file>
     <file>css/nautilus.css</file>
+    <file>text-x-preview.png</file>
   </gresource>
 </gresources>
diff --git a/src/resources/text-x-preview.png b/src/resources/text-x-preview.png
new file mode 100644
index 0000000..0d45ff9
Binary files /dev/null and b/src/resources/text-x-preview.png differ