Sun Feb 10 01:12:35 PST 2013

3 files changed, 0 insertions, 131 deletions

diff --git a/extra/thunar/thunar-1.4.0-dont-add-duplicates-of-devices.patch b/extra/thunar/thunar-1.4.0-dont-add-duplicates-of-devices.patch
deleted file mode 100644
index ee8636392..000000000
--- a/extra/thunar/thunar-1.4.0-dont-add-duplicates-of-devices.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -uprb Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c Thunar-1.4.0/thunar/thunar-shortcuts-model.c
---- Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c	2012-11-03 07:42:39.000000000 +0200
-+++ Thunar-1.4.0/thunar/thunar-shortcuts-model.c	2012-11-03 08:13:25.000000000 +0200
-@@ -1221,11 +1221,25 @@ thunar_shortcuts_model_volume_added (GVo
-                                      GVolume              *volume,
-                                      ThunarShortcutsModel *model)
- {
-+  GList *lp;
-+  gint  idx;
-+
-   _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor));
-   _thunar_return_if_fail (model->volume_monitor == volume_monitor);
-   _thunar_return_if_fail (G_IS_VOLUME (volume));
-   _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
- 
-+  /* check that the volume is not in the internal list already */
-+  if (g_list_find (model->hidden_volumes, volume) != NULL)
-+    return;
-+
-+  /* nor in the list of visible volumes */
-+  for (idx = 0, lp = model->shortcuts; lp != NULL; ++idx, lp = lp->next)
-+    {
-+      if (THUNAR_SHORTCUT (lp->data)->volume == volume)
-+        return;
-+    }
-+
-   /* place the volume on the hidden list */
-   model->hidden_volumes = g_list_prepend (model->hidden_volumes, g_object_ref (volume));
- 
-diff -uprb Thunar-1.4.0.orig/thunar/thunar-tree-model.c Thunar-1.4.0/thunar/thunar-tree-model.c
---- Thunar-1.4.0.orig/thunar/thunar-tree-model.c	2012-11-03 07:42:39.000000000 +0200
-+++ Thunar-1.4.0/thunar/thunar-tree-model.c	2012-11-03 08:09:36.000000000 +0200
-@@ -1127,11 +1127,26 @@ thunar_tree_model_volume_added (GVolumeM
-                                 GVolume                *volume,
-                                 ThunarTreeModel        *model)
- {
-+  ThunarTreeModelItem *item = NULL;
-+  GNode               *node;
-+
-   _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor));
-   _thunar_return_if_fail (model->volume_monitor == volume_monitor);
-   _thunar_return_if_fail (G_IS_VOLUME (volume));
-   _thunar_return_if_fail (THUNAR_IS_TREE_MODEL (model));
- 
-+  /* check that the volume is not in the internal list already */
-+  if (g_list_find (model->hidden_volumes, volume) != NULL)
-+    return;
-+
-+  /* nor in the list of visible volumes */
-+  for (node = model->root->children; node != NULL; node = node->next)
-+    {
-+      item = THUNAR_TREE_MODEL_ITEM (node->data);
-+      if (item->volume == volume)
-+        return;
-+    }
-+
-   /* place the volume on the hidden list */
-   model->hidden_volumes = g_list_prepend (model->hidden_volumes, g_object_ref (volume));
- 
diff --git a/extra/thunar/thunar-1.4.0-show-loop-devices-hack.patch b/extra/thunar/thunar-1.4.0-show-loop-devices-hack.patch
deleted file mode 100644
index 95bbc6665..000000000
--- a/extra/thunar/thunar-1.4.0-show-loop-devices-hack.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -upr Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c Thunar-1.4.0/thunar/thunar-gio-extensions.c
---- Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c	2012-05-26 07:03:39.000000000 +0300
-+++ Thunar-1.4.0/thunar/thunar-gio-extensions.c	2012-05-26 07:05:06.000000000 +0300
-@@ -550,6 +550,11 @@ thunar_g_volume_is_present (GVolume *vol
-       has_media = g_drive_has_media (drive);
-       g_object_unref (drive);
-     }
-+  else
-+    {
-+      /* XXX: hack to show loop devices with gvfs 1.12 / udisks2 */
-+      has_media = g_volume_can_mount (volume);
-+    }
- 
-   mount = g_volume_get_mount (volume);
-   if (mount != NULL)
diff --git a/extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch b/extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch
deleted file mode 100644
index d054180b5..000000000
--- a/extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 6b5c1c908b60965825407fb4557d024514a4f89a Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick@xfce.org>
-Date: Wed, 05 Dec 2012 17:34:38 +0000
-Subject: Show NoDisplay=true applications (bug #9595).
-
-See http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html
----
-diff --git a/thunar/thunar-chooser-button.c b/thunar/thunar-chooser-button.c
-index f7ae355..f2993b8 100644
---- a/thunar/thunar-chooser-button.c
-+++ b/thunar/thunar-chooser-button.c
-@@ -453,7 +453,6 @@ thunar_chooser_button_file_changed (ThunarChooserButton *chooser_button,
-           /* add all possible applications */
-           for (lp = app_infos, i = 0; lp != NULL; lp = lp->next, ++i)
-             {
--              /* skip infos that have NoDisplay or OnlyShowIn set */
-               if (thunar_g_app_info_should_show (lp->data))
-                 {
-                   /* insert the item into the store */
-diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c
-index d77f72a..1b9026a 100644
---- a/thunar/thunar-gio-extensions.c
-+++ b/thunar/thunar-gio-extensions.c
-@@ -569,26 +569,17 @@ gboolean
- thunar_g_app_info_should_show (GAppInfo *info)
- {
- #ifdef HAVE_GIO_UNIX
--  const gchar *filename;
--
-   _thunar_return_val_if_fail (G_IS_APP_INFO (info), FALSE);
- 
--  /* check if NoDesktop is set or OnlyShowIn is set but
--   * does not contain XFCE */
--  if (g_app_info_should_show (info))
--    return TRUE;
--
-   if (G_IS_DESKTOP_APP_INFO (info))
-     {
--      /* show custom command from the user directory, this to not
--       * exclude custom commands */
--      filename = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info));
--      if (filename != NULL
--          && g_str_has_prefix (filename, g_get_user_data_dir ()))
--        return TRUE;
-+      /* NoDisplay=true files should be visible in the interface,
-+       * because this key is intent to hide mime-helpers from the
-+       * application menu. Hidden=true is never returned by GIO. */
-+      return g_desktop_app_info_get_show_in (G_DESKTOP_APP_INFO (info), NULL);
-     }
- 
--  return FALSE;
-+  return TRUE;
- #else
-   /* we cannot exclude custom actions, so show everything */
-   return TRUE;
---
-cgit v0.9.0.3