Version bump.

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

4 files changed, 11 insertions, 168 deletions

diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog
index 99975c322a58..969d207fd76a 100644
--- a/xfce-base/thunar/ChangeLog
+++ b/xfce-base/thunar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/thunar
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.105 2010/11/11 10:49:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.106 2010/12/05 16:33:55 ssuominen Exp $
+
+*thunar-1.1.5 (05 Dec 2010)
+
+  05 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> +thunar-1.1.5.ebuild:
+  Version bump.
 
 *thunar-1.1.4-r1 (11 Nov 2010)
 
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 7a0108a6a790..b0a417adc24e 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,7 +1,6 @@
-AUX thunar-1.1.4-trash_plug-in_API.patch 7822 RMD160 37a226c888ea55b134f8ea54e58c0f38ce56f5dc SHA1 f2f1ba48493f6ba0cd5ece756fef0a63d98c12db SHA256 8faab0f534e1a35f9596bab99c6a1c6a31713d3411387e6c736f97109f92f3a2
 DIST Thunar-1.0.2.tar.bz2 9320379 RMD160 c5b98203353cef7312b736053e5a7678d0644272 SHA1 f7ae00c32402e4bc502aba15477b78e2c558c7c3 SHA256 75829b34a68346b33f66882bedc9794d580c200d11af22541885750459b55c03
-DIST Thunar-1.1.4.tar.bz2 4180546 RMD160 61e965cca3185f0a04b18b1f5169f6e69396a99f SHA1 d4fbe786e44376155c3a68f208226349e79d3b4c SHA256 4576eec10b5a1b939c0dfb517d524ec3c217d659b928bb5436e6069d6de5abeb
+DIST Thunar-1.1.5.tar.bz2 4198704 RMD160 b00899aef46c8a61f92d1db0921a6654a5bd27fe SHA1 c37e263b01264c71157d012c1ec4d697a4b62d3a SHA256 c8ad7ed4ab842288dc70a1ba02b8a9d63cd9851e9f504f5867283605d1a21d1c
 EBUILD thunar-1.0.2.ebuild 2178 RMD160 7bc77198e5ce3737fbfbf69de1846654c4b3fd39 SHA1 9242021d0a58ffc2e193dadb77880e0eff56dee8 SHA256 567888a33ae7a222f84e7d3efcf13d90bc08999a426e29e05c85f65906313707
-EBUILD thunar-1.1.4-r1.ebuild 2003 RMD160 681db067b673d2b1b4d3e0ecd1b6b44462ca58ae SHA1 2025d2657c7c497450907f749819d541970a5d21 SHA256 6f65fb8d9c3c4fe1f0a5f8a883d36cb6f226ca44396428e90174c32a887bc3c8
-MISC ChangeLog 13915 RMD160 53df9b2be47fbb80eede011de556ba6066504e6f SHA1 c4d6effca784a75af0cfc5c0cf191242aece231e SHA256 399d89a712fec970f4660a7a14a8e3f1233559434fff096c82ac3c91c5571e45
+EBUILD thunar-1.1.5.ebuild 1940 RMD160 961b92aedba9b332edb94d4ba4eed7523f86af7d SHA1 c1bef29f7f18d8072027981e1fe93fd8cd568cbd SHA256 eb919a857ae36c441735eb6b636085ead25e94b76e818fcddbdc9e945222b3b0
+MISC ChangeLog 14037 RMD160 9db22bb65544a14215422f089add45965a4052f1 SHA1 a8b70b19d1e7dca672ffe69836c11c1484235a4f SHA256 80cbbdf3b07f2bd9f9f0866891387f2fa691f71fa9868555bdc8745e6b0f6edd
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
diff --git a/xfce-base/thunar/files/thunar-1.1.4-trash_plug-in_API.patch b/xfce-base/thunar/files/thunar-1.1.4-trash_plug-in_API.patch
deleted file mode 100644
index 61e529db0501..000000000000
--- a/xfce-base/thunar/files/thunar-1.1.4-trash_plug-in_API.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-http://git.xfce.org/xfce/thunar/commit/?id=117e927874dd607685d9bd752a6a4d20de937e49
-
---- plugins/thunar-tpa/thunar-tpa-bindings.h
-+++ plugins/thunar-tpa/thunar-tpa-bindings.h
-@@ -26,10 +26,10 @@
- inline
- #endif
- gboolean
--org_xfce_Trash_display_trash (DBusGProxy *proxy, const char * IN_display, GError **error)
-+org_xfce_Trash_display_trash (DBusGProxy *proxy, const char * IN_display, const char * IN_startup_id, GError **error)
- 
- {
--  return dbus_g_proxy_call (proxy, "DisplayTrash", error, G_TYPE_STRING, IN_display, G_TYPE_INVALID, G_TYPE_INVALID);
-+  return dbus_g_proxy_call (proxy, "DisplayTrash", error, G_TYPE_STRING, IN_display, G_TYPE_STRING, IN_startup_id, G_TYPE_INVALID, G_TYPE_INVALID);
- }
- 
- typedef void (*org_xfce_Trash_display_trash_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
-@@ -49,24 +49,24 @@
- inline
- #endif
- DBusGProxyCall*
--org_xfce_Trash_display_trash_async (DBusGProxy *proxy, const char * IN_display, org_xfce_Trash_display_trash_reply callback, gpointer userdata)
-+org_xfce_Trash_display_trash_async (DBusGProxy *proxy, const char * IN_display, const char * IN_startup_id, org_xfce_Trash_display_trash_reply callback, gpointer userdata)
- 
- {
-   DBusGAsyncData *stuff;
-   stuff = g_slice_new (DBusGAsyncData);
-   stuff->cb = G_CALLBACK (callback);
-   stuff->userdata = userdata;
--  return dbus_g_proxy_begin_call (proxy, "DisplayTrash", org_xfce_Trash_display_trash_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRING, IN_display, G_TYPE_INVALID);
-+  return dbus_g_proxy_begin_call (proxy, "DisplayTrash", org_xfce_Trash_display_trash_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRING, IN_display, G_TYPE_STRING, IN_startup_id, G_TYPE_INVALID);
- }
- static
- #ifdef G_HAVE_INLINE
- inline
- #endif
- gboolean
--org_xfce_Trash_empty_trash (DBusGProxy *proxy, const char * IN_display, GError **error)
-+org_xfce_Trash_empty_trash (DBusGProxy *proxy, const char * IN_display, const char * IN_startup_id, GError **error)
- 
- {
--  return dbus_g_proxy_call (proxy, "EmptyTrash", error, G_TYPE_STRING, IN_display, G_TYPE_INVALID, G_TYPE_INVALID);
-+  return dbus_g_proxy_call (proxy, "EmptyTrash", error, G_TYPE_STRING, IN_display, G_TYPE_STRING, IN_startup_id, G_TYPE_INVALID, G_TYPE_INVALID);
- }
- 
- typedef void (*org_xfce_Trash_empty_trash_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
-@@ -86,24 +86,24 @@
- inline
- #endif
- DBusGProxyCall*
--org_xfce_Trash_empty_trash_async (DBusGProxy *proxy, const char * IN_display, org_xfce_Trash_empty_trash_reply callback, gpointer userdata)
-+org_xfce_Trash_empty_trash_async (DBusGProxy *proxy, const char * IN_display, const char * IN_startup_id, org_xfce_Trash_empty_trash_reply callback, gpointer userdata)
- 
- {
-   DBusGAsyncData *stuff;
-   stuff = g_slice_new (DBusGAsyncData);
-   stuff->cb = G_CALLBACK (callback);
-   stuff->userdata = userdata;
--  return dbus_g_proxy_begin_call (proxy, "EmptyTrash", org_xfce_Trash_empty_trash_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRING, IN_display, G_TYPE_INVALID);
-+  return dbus_g_proxy_begin_call (proxy, "EmptyTrash", org_xfce_Trash_empty_trash_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRING, IN_display, G_TYPE_STRING, IN_startup_id, G_TYPE_INVALID);
- }
- static
- #ifdef G_HAVE_INLINE
- inline
- #endif
- gboolean
--org_xfce_Trash_move_to_trash (DBusGProxy *proxy, const char ** IN_filenames, const char * IN_display, GError **error)
-+org_xfce_Trash_move_to_trash (DBusGProxy *proxy, const char ** IN_filenames, const char * IN_display, const char * IN_startup_id, GError **error)
- 
- {
--  return dbus_g_proxy_call (proxy, "MoveToTrash", error, G_TYPE_STRV, IN_filenames, G_TYPE_STRING, IN_display, G_TYPE_INVALID, G_TYPE_INVALID);
-+  return dbus_g_proxy_call (proxy, "MoveToTrash", error, G_TYPE_STRV, IN_filenames, G_TYPE_STRING, IN_display, G_TYPE_STRING, IN_startup_id, G_TYPE_INVALID, G_TYPE_INVALID);
- }
- 
- typedef void (*org_xfce_Trash_move_to_trash_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
-@@ -123,14 +123,14 @@
- inline
- #endif
- DBusGProxyCall*
--org_xfce_Trash_move_to_trash_async (DBusGProxy *proxy, const char ** IN_filenames, const char * IN_display, org_xfce_Trash_move_to_trash_reply callback, gpointer userdata)
-+org_xfce_Trash_move_to_trash_async (DBusGProxy *proxy, const char ** IN_filenames, const char * IN_display, const char * IN_startup_id, org_xfce_Trash_move_to_trash_reply callback, gpointer userdata)
- 
- {
-   DBusGAsyncData *stuff;
-   stuff = g_slice_new (DBusGAsyncData);
-   stuff->cb = G_CALLBACK (callback);
-   stuff->userdata = userdata;
--  return dbus_g_proxy_begin_call (proxy, "MoveToTrash", org_xfce_Trash_move_to_trash_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRV, IN_filenames, G_TYPE_STRING, IN_display, G_TYPE_INVALID);
-+  return dbus_g_proxy_begin_call (proxy, "MoveToTrash", org_xfce_Trash_move_to_trash_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRV, IN_filenames, G_TYPE_STRING, IN_display, G_TYPE_STRING, IN_startup_id, G_TYPE_INVALID);
- }
- static
- #ifdef G_HAVE_INLINE
---- plugins/thunar-tpa/thunar-tpa.c
-+++ plugins/thunar-tpa/thunar-tpa.c
-@@ -1,6 +1,7 @@
- /*-
-  * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
-  * Copyright (c) 2010 Nick Schermer <nick@xfce.org>
-+ * Copyright (c) 2010 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
-@@ -460,6 +461,7 @@
- thunar_tpa_display_trash (ThunarTpa *plugin)
- {
-   gchar *display_name;
-+  gchar *startup_id;
- 
-   g_return_if_fail (THUNAR_IS_TPA (plugin));
- 
-@@ -472,7 +474,9 @@
- 
-       /* schedule a new call */
-       display_name = gdk_screen_make_display_name (gtk_widget_get_screen (GTK_WIDGET (plugin)));
--      plugin->display_trash_call = org_xfce_Trash_display_trash_async (plugin->proxy, display_name, thunar_tpa_display_trash_reply, plugin);
-+      startup_id = g_strdup_printf ("_TIME%d", gtk_get_current_event_time ());
-+      plugin->display_trash_call = org_xfce_Trash_display_trash_async (plugin->proxy, display_name, startup_id, thunar_tpa_display_trash_reply, plugin);
-+      g_free (startup_id);
-       g_free (display_name);
-     }
- }
-@@ -483,6 +487,7 @@
- thunar_tpa_empty_trash (ThunarTpa *plugin)
- {
-   gchar *display_name;
-+  gchar *startup_id;
- 
-   g_return_if_fail (THUNAR_IS_TPA (plugin));
- 
-@@ -495,7 +500,9 @@
- 
-       /* schedule a new call */
-       display_name = gdk_screen_make_display_name (gtk_widget_get_screen (GTK_WIDGET (plugin)));
--      plugin->empty_trash_call = org_xfce_Trash_empty_trash_async (plugin->proxy, display_name, thunar_tpa_empty_trash_reply, plugin);
-+      startup_id = g_strdup_printf ("_TIME%d", gtk_get_current_event_time ());
-+      plugin->empty_trash_call = org_xfce_Trash_empty_trash_async (plugin->proxy, display_name, startup_id, thunar_tpa_empty_trash_reply, plugin);
-+      g_free (startup_id);
-       g_free (display_name);
-     }
- }
-@@ -507,6 +514,7 @@
-                           const gchar **uri_list)
- {
-   gchar *display_name;
-+  gchar *startup_id;
- 
-   g_return_val_if_fail (THUNAR_IS_TPA (plugin), FALSE);
-   g_return_val_if_fail (uri_list != NULL, FALSE);
-@@ -521,7 +529,9 @@
- 
-   /* schedule a new call */
-   display_name = gdk_screen_make_display_name (gtk_widget_get_screen (GTK_WIDGET (plugin)));
--  plugin->move_to_trash_call = org_xfce_Trash_move_to_trash_async (plugin->proxy, uri_list, display_name, thunar_tpa_move_to_trash_reply, plugin);
-+  startup_id = g_strdup_printf ("_TIME%d", gtk_get_current_event_time ());
-+  plugin->move_to_trash_call = org_xfce_Trash_move_to_trash_async (plugin->proxy, uri_list, display_name, startup_id, thunar_tpa_move_to_trash_reply, plugin);
-+  g_free (startup_id);
-   g_free (display_name);
- 
-   return TRUE;
diff --git a/xfce-base/thunar/thunar-1.1.4-r1.ebuild b/xfce-base/thunar/thunar-1.1.5.ebuild
index 9139f28d249c..df6e06cdf322 100644
--- a/xfce-base/thunar/thunar-1.1.4-r1.ebuild
+++ b/xfce-base/thunar/thunar-1.1.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.1.4-r1.ebuild,v 1.1 2010/11/11 10:49:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.1.5.ebuild,v 1.1 2010/12/05 16:33:54 ssuominen Exp $
 
 EAPI=3
 inherit virtualx xfconf
 
 MY_P=${P/t/T}
 
-DESCRIPTION="File manager for Xfce4"
+DESCRIPTION="Xfce's file manager"
 HOMEPAGE="http://thunar.xfce.org/"
 SRC_URI="mirror://xfce/src/xfce/${PN}/1.1/${MY_P}.tar.bz2"
 
@@ -42,8 +42,6 @@ DEPEND="${COMMON_DEPEND}
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-trash_plug-in_API.patch )
-
 	XFCONF=(
 		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		--disable-dependency-tracking