[Pkg-xfce-commits] r2817 - in desktop/trunk/thunar/debian: . patches
corsac at alioth.debian.org
corsac at alioth.debian.org
Sat Feb 28 13:13:42 UTC 2009
Author: corsac
Date: 2009-02-28 13:13:42 +0000 (Sat, 28 Feb 2009)
New Revision: 2817
Added:
desktop/trunk/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch
Modified:
desktop/trunk/thunar/debian/changelog
Log:
* debian/patches:
- 02_thunar-icon-naming-spec-compliance added, make Thunar
xdg-compliant wrt. icon naming.
Modified: desktop/trunk/thunar/debian/changelog
===================================================================
--- desktop/trunk/thunar/debian/changelog 2009-02-28 13:02:33 UTC (rev 2816)
+++ desktop/trunk/thunar/debian/changelog 2009-02-28 13:13:42 UTC (rev 2817)
@@ -15,10 +15,12 @@
- 05_thunar-vfs-nozombies finally.
* debian/rules:
- fail if dh_install misses files.
+
[ Xfce 4.6 Beta 1 “Fuzzy”]
* new upstream beta release.
* debian/control:
- update build-deps for Fuzzy.
+
[ Xfce 4.6 Beta 2 “Hopper”]
* new upstream beta release.
* debian/control:
@@ -67,8 +69,11 @@
- add ${misc:Depends} to -dev depends.
* debian/libthunar-vfs-1-2.shlibs:
- bump shlibs to 1.0.0.
+ * debian/patches:
+ - 02_thunar-icon-naming-spec-compliance added, make Thunar
+ xdg-compliant wrt. icon naming.
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 24 Feb 2009 23:56:09 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 28 Feb 2009 14:01:41 +0100
thunar (0.9.0-10) unstable; urgency=low
Added: desktop/trunk/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch (rev 0)
+++ desktop/trunk/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch 2009-02-28 13:13:42 UTC (rev 2817)
@@ -0,0 +1,425 @@
+Index: thunar/thunar-dialogs.c
+===================================================================
+--- thunar/thunar-dialogs.c (revision 27924)
++++ thunar/thunar-dialogs.c (working copy)
+@@ -462,7 +462,7 @@
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0);
+ gtk_widget_show (table);
+
+- image = gtk_image_new_from_icon_name ("stock_folder-copy", GTK_ICON_SIZE_BUTTON);
++ image = gtk_image_new_from_icon_name ("folder-copy", GTK_ICON_SIZE_BUTTON);
+ gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+ gtk_misc_set_padding (GTK_MISC (image), 6, 6);
+ gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 1, GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+Index: thunar/thunar-dnd.c
+===================================================================
+--- thunar/thunar-dnd.c (revision 27924)
++++ thunar/thunar-dnd.c (working copy)
+@@ -68,7 +68,7 @@
+ {
+ 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[] = { "stock_folder-copy", "stock_folder-move", NULL };
++ static const gchar *dnd_action_icons[] = { "folder-copy", "folder-move", NULL };
+
+ ThunarxProviderFactory *factory;
+ GdkDragAction dnd_action = 0;
+Index: thunar/thunar-file.c
+===================================================================
+--- thunar/thunar-file.c (revision 27924)
++++ thunar/thunar-file.c (working copy)
+@@ -1645,16 +1645,16 @@
+
+ /* special icon for the home node */
+ if (G_UNLIKELY (thunar_file_is_home (file))
+- && gtk_icon_theme_has_icon (icon_theme, "gnome-fs-home"))
++ && gtk_icon_theme_has_icon (icon_theme, "user-home"))
+ {
+- return "gnome-fs-home";
++ return "user-home";
+ }
+
+ /* special icon for the desktop node */
+ if (G_UNLIKELY (thunar_file_is_desktop (file))
+- && gtk_icon_theme_has_icon (icon_theme, "gnome-fs-desktop"))
++ && gtk_icon_theme_has_icon (icon_theme, "user-desktop"))
+ {
+- return "gnome-fs-desktop";
++ return "user-desktop";
+ }
+
+ /* try to be smart when determining icons for executable files
+@@ -1674,10 +1674,10 @@
+
+ /* check if we have an accept icon for the icon we found */
+ if ((icon_state == THUNAR_FILE_ICON_STATE_DROP || icon_state == THUNAR_FILE_ICON_STATE_OPEN)
+- && strcmp (icon_name, "gnome-fs-directory") == 0
+- && gtk_icon_theme_has_icon (icon_theme, "gnome-fs-directory-accept"))
++ && strcmp (icon_name, "folder") == 0
++ && gtk_icon_theme_has_icon (icon_theme, "folder-drag-accept"))
+ {
+- return "gnome-fs-directory-accept";
++ return "folder-drag-accept";
+ }
+
+ return icon_name;
+Index: thunar/thunar-icon-factory.c
+===================================================================
+--- thunar/thunar-icon-factory.c (revision 27924)
++++ thunar/thunar-icon-factory.c (working copy)
+@@ -1036,7 +1036,7 @@
+ if (G_UNLIKELY (thumb_state == THUNAR_FILE_THUMB_STATE_LOADING))
+ {
+ /* check if the icon theme supports the loading icon */
+- icon = thunar_icon_factory_lookup_icon (factory, "gnome-fs-loading-icon", icon_size, FALSE);
++ icon = thunar_icon_factory_lookup_icon (factory, "image-loading", icon_size, FALSE);
+ if (G_LIKELY (icon != NULL))
+ return icon;
+ }
+Index: thunar/thunar-stock.c
+===================================================================
+--- thunar/thunar-stock.c (revision 27924)
++++ thunar/thunar-stock.c (working copy)
+@@ -45,12 +45,12 @@
+ /* keep in sync with thunar-stock.h */
+ static const ThunarStockIcon thunar_stock_icons[] =
+ {
+- { THUNAR_STOCK_DESKTOP, "gnome-fs-desktop", },
+- { THUNAR_STOCK_HOME, "gnome-fs-home", },
++ { THUNAR_STOCK_DESKTOP, "user-desktop", },
++ { THUNAR_STOCK_HOME, "user-home", },
+ { THUNAR_STOCK_SHORTCUTS, "stock_thunar-shortcuts", },
+- { THUNAR_STOCK_TEMPLATES, "stock_thunar-templates", },
+- { THUNAR_STOCK_TRASH_EMPTY, "gnome-fs-trash-empty", },
+- { THUNAR_STOCK_TRASH_FULL, "gnome-fs-trash-full", },
++ { THUNAR_STOCK_TEMPLATES, "text-x-generic-template", },
++ { THUNAR_STOCK_TRASH_EMPTY, "user-trash", },
++ { THUNAR_STOCK_TRASH_FULL, "user-trash-full", },
+ };
+
+
+Index: thunar/thunar-application.c
+===================================================================
+--- thunar/thunar-application.c (revision 27924)
++++ thunar/thunar-application.c (working copy)
+@@ -1149,7 +1149,7 @@
+ _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
+
+ /* launch the operation */
+- thunar_application_launch (application, parent, "stock_folder-copy",
++ thunar_application_launch (application, parent, "folder-copy",
+ _("Copying files..."), thunar_vfs_copy_files,
+ source_path_list, target_path_list, new_files_closure);
+ }
+@@ -1182,7 +1182,7 @@
+ _thunar_return_if_fail (target_path != NULL);
+
+ /* collect the target paths and launch the job */
+- thunar_application_collect_and_launch (application, parent, "stock_folder-copy",
++ thunar_application_collect_and_launch (application, parent, "folder-copy",
+ _("Copying files..."), thunar_vfs_copy_files,
+ source_path_list, target_path, new_files_closure);
+ }
+@@ -1216,7 +1216,7 @@
+ _thunar_return_if_fail (target_path != NULL);
+
+ /* collect the target paths and launch the job */
+- thunar_application_collect_and_launch (application, parent, "stock_link",
++ thunar_application_collect_and_launch (application, parent, "insert-link",
+ _("Creating symbolic links..."),
+ thunar_vfs_link_files, source_path_list,
+ target_path, new_files_closure);
+@@ -1256,12 +1256,15 @@
+ /* determine the appropriate message text and the icon based on the target_path */
+ if (thunar_vfs_path_get_scheme (target_path) == THUNAR_VFS_PATH_SCHEME_TRASH)
+ {
+- icon = "gnome-fs-trash-full";
++ icon = "user-trash-full";
+ text = _("Moving files into the trash...");
+ }
+ else
+ {
+- icon = "stock_folder-move";
++ /* What kind of icon-name should we use according to the
++ * icon-naming-spec?
++ */
++ icon = "folder-move";
+ text = _("Moving files...");
+ }
+
+@@ -1376,7 +1379,7 @@
+ if (G_LIKELY (response == GTK_RESPONSE_YES))
+ {
+ /* launch the "Delete" operation */
+- thunar_application_launch (application, parent, "stock_delete",
++ thunar_application_launch (application, parent, "edit-delete",
+ _("Deleting files..."), unlink_stub,
+ path_list, path_list, NULL);
+ }
+@@ -1428,7 +1431,7 @@
+ _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
+
+ /* launch the operation */
+- thunar_application_launch (application, parent, "stock_new",
++ thunar_application_launch (application, parent, "document-new",
+ _("Creating files..."), creat_stub,
+ path_list, path_list, new_files_closure);
+ }
+@@ -1468,7 +1471,7 @@
+ _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
+
+ /* launch the operation */
+- thunar_application_launch (application, parent, "stock_folder",
++ thunar_application_launch (application, parent, "folder-new",
+ _("Creating directories..."), mkdir_stub,
+ path_list, path_list, new_files_closure);
+ }
+@@ -1532,7 +1535,7 @@
+ path_list.prev = NULL;
+
+ /* launch the operation */
+- thunar_application_launch (application, parent, "gnome-fs-trash-empty",
++ thunar_application_launch (application, parent, "user-trash",
+ _("Emptying the Trash..."),
+ unlink_stub, &path_list, NULL, NULL);
+
+@@ -1668,7 +1671,7 @@
+ else if (G_LIKELY (response == GTK_RESPONSE_YES))
+ {
+ /* launch the operation */
+- thunar_application_launch (application, parent, "stock_folder-move",
++ thunar_application_launch (application, parent, "folder-move",
+ _("Restoring files..."), thunar_vfs_move_files,
+ source_path_list, target_path_list, new_files_closure);
+ }
+Index: plugins/thunar-tpa/thunar-tpa.desktop.in.in
+===================================================================
+--- plugins/thunar-tpa/thunar-tpa.desktop.in.in (revision 27924)
++++ plugins/thunar-tpa/thunar-tpa.desktop.in.in (working copy)
+@@ -3,6 +3,6 @@
+ Encoding=UTF-8
+ _Name=Trash Applet
+ _Comment=Display the trash can
+-Icon=gnome-fs-trash-empty
++Icon=user-trash
+ X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/thunar-tpa
+
+Index: plugins/thunar-tpa/thunar-tpa-icon.c
+===================================================================
+--- plugins/thunar-tpa/thunar-tpa-icon.c (revision 27924)
++++ plugins/thunar-tpa/thunar-tpa-icon.c (working copy)
+@@ -175,7 +175,7 @@
+ gtk_widget_show (icon->button);
+
+ /* setup the image for the trash icon */
+- icon->image = gtk_image_new_from_icon_name ("gnome-fs-trash-empty", GTK_ICON_SIZE_BUTTON);
++ icon->image = gtk_image_new_from_icon_name ("user-trash", GTK_ICON_SIZE_BUTTON);
+ gtk_container_add (GTK_CONTAINER (icon->button), icon->image);
+ gtk_widget_show (icon->image);
+
+@@ -287,7 +287,7 @@
+ gtk_tooltips_set_tip (icon->tooltips, icon->button, full ? _("Trash is full") : _("Trash is empty"), NULL);
+
+ /* setup the appropriate icon */
+- gtk_image_set_from_icon_name (GTK_IMAGE (icon->image), full ? "gnome-fs-trash-full" : "gnome-fs-trash-empty", GTK_ICON_SIZE_BUTTON);
++ gtk_image_set_from_icon_name (GTK_IMAGE (icon->image), full ? "user-trash-full" : "user-trash", GTK_ICON_SIZE_BUTTON);
+
+ /* apply the new state */
+ icon->full = full;
+Index: thunar-vfs/thunar-vfs-volume.c
+===================================================================
+--- thunar-vfs/thunar-vfs-volume.c (revision 27924)
++++ thunar-vfs/thunar-vfs-volume.c (working copy)
+@@ -398,83 +398,76 @@
+ kind = thunar_vfs_volume_get_kind (volume);
+ switch (kind)
+ {
+-cdrom:
+- case THUNAR_VFS_VOLUME_KIND_CDROM:
+- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-cdrom"))
+- return "gnome-dev-cdrom";
+- break;
+-
+- case THUNAR_VFS_VOLUME_KIND_CDR:
+- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-cdr"))
+- return "gnome-dev-disc-cdr";
+- goto cdrom;
+-
+- case THUNAR_VFS_VOLUME_KIND_CDRW:
+- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-cdrw"))
+- return "gnome-dev-disc-cdrw";
+- goto cdrom;
+-
+-dvdrom:
+- case THUNAR_VFS_VOLUME_KIND_DVDROM:
+- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdrom"))
+- return "gnome-dev-disc-dvdrom";
+- else if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-dvd"))
+- return "gnome-dev-dvd";
+- goto cdrom;
+-
+- case THUNAR_VFS_VOLUME_KIND_DVDRAM:
+- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdram"))
+- return "gnome-dev-disc-dvdram";
++ case THUNAR_VFS_VOLUME_KIND_DVDPLUSRW:
++ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-rw-plus"))
++ return "media-optical-dvd-rw-plus";
++ case THUNAR_VFS_VOLUME_KIND_DVDRW:
++ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-rw"))
++ return "media-optical-dvd-rw";
+ goto dvdrom;
+-
+-dvdr:
++ case THUNAR_VFS_VOLUME_KIND_DVDPLUSR:
++ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-r-plus"))
++ return "media-optical-dvd-r-plus";
+ case THUNAR_VFS_VOLUME_KIND_DVDR:
+- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdr"))
+- return "gnome-dev-disc-dvdr";
++ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-r"))
++ return "media-optical-dvd-r";
+ goto dvdrom;
+-
+- case THUNAR_VFS_VOLUME_KIND_DVDRW:
+- case THUNAR_VFS_VOLUME_KIND_DVDPLUSRW:
+- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdrw"))
+- return "gnome-dev-disc-dvdrw";
++ case THUNAR_VFS_VOLUME_KIND_DVDRAM:
++ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-ram"))
++ return "media-optical-dvd-ram";
+ goto dvdrom;
++dvdrom:
++ case THUNAR_VFS_VOLUME_KIND_DVDROM:
++ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd"))
++ return "media-optical-dvd";
++ goto optical;
++
++ case THUNAR_VFS_VOLUME_KIND_CDRW:
++ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-cd-rw"))
++ return "media-optical-cd-rw";
++ goto cdrom;
++ case THUNAR_VFS_VOLUME_KIND_CDR:
++ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-cd-r"))
++ return "media-optical-cd-r";
++ goto cdrom;
++cdrom:
++ case THUNAR_VFS_VOLUME_KIND_CDROM:
++ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-cd"))
++ return "media-optical-cd";
++ goto optical;
++ case THUNAR_VFS_VOLUME_KIND_AUDIO_CD:
++ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-audio"))
++ return "media-optical-audio";
++ goto optical;
++optical:
++ if (gtk_icon_theme_has_icon (icon_theme, "media-optical"))
++ return "media-optical";
++ break;
+
+- case THUNAR_VFS_VOLUME_KIND_DVDPLUSR:
+- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdr-plus"))
+- return "gnome-dev-disc-dvdr-plus";
+- goto dvdr;
+-
+ case THUNAR_VFS_VOLUME_KIND_FLOPPY:
+- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-floppy"))
+- return "gnome-dev-floppy";
++ if (gtk_icon_theme_has_icon (icon_theme, "media-floppy"))
++ return "media-floppy";
+ break;
+-
+ case THUNAR_VFS_VOLUME_KIND_HARDDISK:
+- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-harddisk"))
+- return "gnome-dev-harddisk";
++ if (gtk_icon_theme_has_icon (icon_theme, "drive-harddisk"))
++ return "drive-harddisk";
+ break;
+
+ case THUNAR_VFS_VOLUME_KIND_USBSTICK:
+- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-removable-usb"))
+- return "gnome-dev-removable-usb";
+- else if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-harddisk-usb"))
+- return "gnome-dev-harddisk-usb";
+- break;
+-
++ if (gtk_icon_theme_has_icon (icon_theme, "drive-removable-media-usb"))
++ return "drive-removable-media-usb";
++ goto removable_media;
+ case THUNAR_VFS_VOLUME_KIND_AUDIO_PLAYER:
+- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-ipod"))
+- return "gnome-dev-ipod";
+- break;
++ if (gtk_icon_theme_has_icon (icon_theme, "drive-removable-media-ipod"))
++ return "drive-removable-media-ipod";
++ goto removable_media;
+
+- case THUNAR_VFS_VOLUME_KIND_AUDIO_CD:
+- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-cdrom-audio"))
+- return "gnome-dev-cdrom-audio";
+- goto cdrom;
+
+ case THUNAR_VFS_VOLUME_KIND_MEMORY_CARD:
+ case THUNAR_VFS_VOLUME_KIND_REMOVABLE_DISK:
+- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-removable"))
+- return "gnome-dev-removable";
++removable_media:
++ if (gtk_icon_theme_has_icon (icon_theme, "drive-removable-media"))
++ return "drive-removable-media";
+ break;
+
+ default:
+Index: thunar-vfs/thunar-vfs-mime-info.c
+===================================================================
+--- thunar-vfs/thunar-vfs-mime-info.c (revision 27924)
++++ thunar-vfs/thunar-vfs-mime-info.c (working copy)
+@@ -47,18 +47,18 @@
+ const gchar icon[19];
+ } GNOME_INODE_ICONNAMES[] =
+ {
+- { "blockdevice", "gnome-fs-blockdev" },
+- { "chardevice", "gnome-fs-chardev" },
+- { "directory", "gnome-fs-directory" },
+- { "fifo", "gnome-fs-fifo" },
+- { "socket", "gnome-fs-socket" },
++ { "blockdevice", "inode-blockdev" },
++ { "chardevice", "inode-chardev" },
++ { "directory", "folder" },
++ { "fifo", "inode-fifo" },
++ { "socket", "inode-socket" },
+ };
+
+ /* first fallback gnome icon name */
+ static const gchar GNOME_FS_REGULAR[] = "gnome-fs-regular";
+
+ /* second fallback gnome icon name */
+-static const gchar GNOME_MIME_APPLICATION_OCTET_STREAM[] = "gnome-mime-application-octet-stream";
++static const gchar GNOME_MIME_APPLICATION_OCTET_STREAM[] = "application-x-executable";
+
+ /* generic standard icon names (Icon Naming Spec 0.8) */
+ static const gchar XDG_GENERIC_ICONNAMES[][18] =
+Index: thunar-vfs/thunar-vfs-io-trash.c
+===================================================================
+--- thunar-vfs/thunar-vfs-io-trash.c (revision 27924)
++++ thunar-vfs/thunar-vfs-io-trash.c (working copy)
+@@ -1119,7 +1119,7 @@
+ info->ctime = mtime;
+ info->mime_info = thunar_vfs_mime_info_ref (_thunar_vfs_mime_inode_directory);
+ info->path = thunar_vfs_path_ref (_thunar_vfs_path_trash_root);
+- info->custom_icon = g_strdup (empty ? "gnome-fs-trash-empty" : "gnome-fs-trash-full");
++ info->custom_icon = g_strdup (empty ? "user-trash" : "user-trash-full");
+ info->display_name = g_strdup (_("Trash"));
+ info->ref_count = 1;
+ }
+Index: thunar-vfs/thunar-vfs-io-local.c
+===================================================================
+--- thunar-vfs/thunar-vfs-io-local.c (revision 27924)
++++ thunar-vfs/thunar-vfs-io-local.c (working copy)
+@@ -390,7 +390,7 @@
+ if (G_UNLIKELY (filename[0] == G_DIR_SEPARATOR && filename[1] == '\0'))
+ {
+ /* root folder gets a special custom icon... */
+- info->custom_icon = g_strdup ("gnome-dev-harddisk");
++ info->custom_icon = g_strdup ("drive-harddisk");
+
+ /* ...and a special display name */
+ info->display_name = g_strdup (_("File System"));
More information about the Pkg-xfce-commits
mailing list