Git Repositories

Ship stock_folder-{copy,move}.png with Thunar itself (bug #6851).
authorJannis Pohlmann <jannis@xfce.org>
Wed, 26 Jan 2011 22:17:18 +0000 (23:17 +0100)
committerJannis Pohlmann <jannis@xfce.org>
Wed, 26 Jan 2011 22:17:18 +0000 (23:17 +0100)
These icons were part of older gnome-icon-theme releases but have now
disappeared. There are no useful equivalents in the icon naming
specification or the GTK+ stock icons (well, there is GTK_STOCK_COPY,
but no appropriate replacement for "stock_folder-move"), so for now it's
best to ship the icons ourselves, I think.

AUTHORS
NEWS
icons/16x16/Makefile.am
icons/16x16/stock_folder-copy.png [new file with mode: 0644]
icons/16x16/stock_folder-move.png [new file with mode: 0644]
icons/24x24/Makefile.am
icons/24x24/stock_folder-copy.png [new file with mode: 0644]
icons/24x24/stock_folder-move.png [new file with mode: 0644]
thunar/thunar-dnd.c

diff --git a/AUTHORS b/AUTHORS
index d44a8fa..34a0f53 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,3 +9,9 @@ the code was written by Andrew Trigell <tridge@linuxcare.com> with the help of
 Paul "Rusty" Russell <rusty@linuxcare.com>. Luke Kenneth Casson Leighton
 <luke@samba.org> also contributed a few patches. Sorted freelist merge code
 added by Jeremy Allison <jeremy@valinux.com>.
+
+The stock_folder-copy and stock_folder-move icons where taken from 
+gnome-icon-theme 2.18.0 whose authors are Lapo Calamandrei <calamandrei@gmail.com>,
+Rodney Dawes <dobey@novell.com>, Luca Ferretti <elle.uca@libero.it>,
+Tuomas Kuosmanen <tigert@gimp.org>, Andreas Nilsson <nisses.mail@home.se>
+and Jakub Steiner <jimmac@novell.com>. The icons are licensed under GPL.
diff --git a/NEWS b/NEWS
index d4dec4c..b548d88 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@
 - Fix truncated strings when loading and storing emblems (bug #7171).
 - Only erase top-level items from trash (bug #7147).
 - Don't interpret file display names as format strings (bug #7128).
+- Ship stock_folder-copy.png and stock_folder-move.png icons with
+  Thunar itself (bug #6851).
 
 1.2.0
 =====
index 5e3fbf1..d91ac9e 100644 (file)
@@ -6,6 +6,8 @@ apps_DATA =                                                             \
 
 stockdir = $(datadir)/icons/hicolor/16x16/stock/navigation
 stock_DATA =                                                           \
+       stock_folder-copy.png                                           \
+       stock_folder-move.png                                           \
        stock_thunar-shortcuts.png                                      \
        stock_thunar-templates.png
 
diff --git a/icons/16x16/stock_folder-copy.png b/icons/16x16/stock_folder-copy.png
new file mode 100644 (file)
index 0000000..e67381a
Binary files /dev/null and b/icons/16x16/stock_folder-copy.png differ
diff --git a/icons/16x16/stock_folder-move.png b/icons/16x16/stock_folder-move.png
new file mode 100644 (file)
index 0000000..111f69d
Binary files /dev/null and b/icons/16x16/stock_folder-move.png differ
index 3c6cf97..49a1e38 100644 (file)
@@ -4,7 +4,13 @@ iconsdir = $(datadir)/icons/hicolor/24x24/apps
 icons_DATA =                                                           \
        Thunar.png
 
+stockdir = $(datadir)/icons/hicolor/24x24/stock/navigation
+stock_DATA =                                                           \
+       stock_folder-copy.png                                           \
+       stock_folder-move.png
+
 EXTRA_DIST =                                                           \
-       $(icons_DATA)
+       $(icons_DATA)                                                   \
+       $(stock_DATA)
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/icons/24x24/stock_folder-copy.png b/icons/24x24/stock_folder-copy.png
new file mode 100644 (file)
index 0000000..2db0368
Binary files /dev/null and b/icons/24x24/stock_folder-copy.png differ
diff --git a/icons/24x24/stock_folder-move.png b/icons/24x24/stock_folder-move.png
new file mode 100644 (file)
index 0000000..d8ab50d
Binary files /dev/null and b/icons/24x24/stock_folder-move.png differ
index 92259bc..9871eb0 100644 (file)
@@ -1,21 +1,22 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
- * Copyright (c) 2009-2010 Jannis Pohlmann <jannis@xfce.org>
+ * Copyright (c) 2009-2011 Jannis Pohlmann <jannis@xfce.org>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of 
+ * the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public 
+ * License along with this program; if not, write to the Free 
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -69,7 +70,7 @@ thunar_dnd_ask (GtkWidget    *widget,
 {
   static const GdkDragAction dnd_action_items[] = { GDK_ACTION_COPY, GDK_ACTION_MOVE, GDK_ACTION_LINK };
   static const gchar        *dnd_action_names[] = { N_ ("_Copy here"), N_ ("_Move here"), N_ ("_Link here") };
-  static const gchar        *dnd_action_icons[] = { GTK_STOCK_COPY, "folder-move", NULL };
+  static const gchar        *dnd_action_icons[] = { "stock_folder-copy", "stock_folder-move", NULL };
 
   ThunarxProviderFactory *factory;
   GdkDragAction           dnd_action = 0;