diff options
Diffstat (limited to 'xfce-base/thunar')
| -rw-r--r-- | xfce-base/thunar/ChangeLog | 7 | ||||
| -rw-r--r-- | xfce-base/thunar/files/thunar-1.1.4-trash_plug-in_API.patch | 159 | ||||
| -rw-r--r-- | xfce-base/thunar/thunar-1.1.5.ebuild (renamed from xfce-base/thunar/thunar-1.1.4-r1.ebuild) | 6 |
3 files changed, 8 insertions, 164 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/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 |