From 6fc65d5b0fd61f6a5e371a501c63eeb0a4997f14 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 13 Jun 2014 09:28:27 -0400
Subject: [PATCH] Rename cursor pngs to their resource name

This allows us to get rid of some aliases in the .gresource.xml.
---
 gtk/gtk.gresource.xml                               |  10 +++++-----
 .../cursor/{cursor_dnd_ask.png => dnd-ask.png}      | Bin
 .../cursor/{cursor_dnd_copy.png => dnd-copy.png}    | Bin
 .../cursor/{cursor_dnd_link.png => dnd-link.png}    | Bin
 .../cursor/{cursor_dnd_move.png => dnd-move.png}    | Bin
 .../cursor/{cursor_dnd_none.png => dnd-none.png}    | Bin
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename gtk/resources/cursor/{cursor_dnd_ask.png => dnd-ask.png} (100%)
 rename gtk/resources/cursor/{cursor_dnd_copy.png => dnd-copy.png} (100%)
 rename gtk/resources/cursor/{cursor_dnd_link.png => dnd-link.png} (100%)
 rename gtk/resources/cursor/{cursor_dnd_move.png => dnd-move.png} (100%)
 rename gtk/resources/cursor/{cursor_dnd_none.png => dnd-none.png} (100%)

diff --git a/gtk/gtk.gresource.xml b/gtk/gtk.gresource.xml
index 3d491d37b0..91e0848796 100644
--- a/gtk/gtk.gresource.xml
+++ b/gtk/gtk.gresource.xml
@@ -6,11 +6,11 @@
     <file alias="theme/gtk-win32-xp.css">theme/win32/gtk-win32-xp.css</file>
     <file alias="theme/gtk-win32-base.css">theme/win32/gtk-win32-base.css</file>
     <file alias="theme/gtk-win32-classic.css">theme/win32/gtk-win32-classic.css</file>
-    <file alias="cursor/dnd-ask.png">cursor/cursor_dnd_ask.png</file>
-    <file alias="cursor/dnd-link.png">cursor/cursor_dnd_link.png</file>
-    <file alias="cursor/dnd-none.png">cursor/cursor_dnd_none.png</file>
-    <file alias="cursor/dnd-move.png">cursor/cursor_dnd_move.png</file>
-    <file alias="cursor/dnd-copy.png">cursor/cursor_dnd_copy.png</file>
+    <file>cursor/dnd-ask.png</file>
+    <file>cursor/dnd-link.png</file>
+    <file>cursor/dnd-none.png</file>
+    <file>cursor/dnd-move.png</file>
+    <file>cursor/dnd-copy.png</file>
     <file compressed="true">ui/gtkaboutdialog.ui</file>
     <file compressed="true">ui/gtkactionbar.ui</file>
     <file compressed="true">ui/gtkappchooserdialog.ui</file>
diff --git a/gtk/resources/cursor/cursor_dnd_ask.png b/gtk/resources/cursor/dnd-ask.png
similarity index 100%
rename from gtk/resources/cursor/cursor_dnd_ask.png
rename to gtk/resources/cursor/dnd-ask.png
diff --git a/gtk/resources/cursor/cursor_dnd_copy.png b/gtk/resources/cursor/dnd-copy.png
similarity index 100%
rename from gtk/resources/cursor/cursor_dnd_copy.png
rename to gtk/resources/cursor/dnd-copy.png
diff --git a/gtk/resources/cursor/cursor_dnd_link.png b/gtk/resources/cursor/dnd-link.png
similarity index 100%
rename from gtk/resources/cursor/cursor_dnd_link.png
rename to gtk/resources/cursor/dnd-link.png
diff --git a/gtk/resources/cursor/cursor_dnd_move.png b/gtk/resources/cursor/dnd-move.png
similarity index 100%
rename from gtk/resources/cursor/cursor_dnd_move.png
rename to gtk/resources/cursor/dnd-move.png
diff --git a/gtk/resources/cursor/cursor_dnd_none.png b/gtk/resources/cursor/dnd-none.png
similarity index 100%
rename from gtk/resources/cursor/cursor_dnd_none.png
rename to gtk/resources/cursor/dnd-none.png