1 files changed, 182 insertions, 0 deletions
diff --git a/meta/packages/gtk+/gtk+-2.6.10/filesystem-volumes.patch b/meta/packages/gtk+/gtk+-2.6.10/filesystem-volumes.patch
new file mode 100644
index 0000000000..4386d83ee9
--- /dev/null
+++ b/meta/packages/gtk+/gtk+-2.6.10/filesystem-volumes.patch
@@ -0,0 +1,182 @@
+--- gtk+-2.6.8/gtk/gtkfilesystemunix.c.orig     2007-02-08 12:01:19.000000000 +0000
+++ gtk+-2.6.8/gtk/gtkfilesystemunix.c  2007-02-08 12:01:19.000000000 +0000
+@@ -33,6 +33,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/stat.h>
+#include <sys/statvfs.h>
+ #include <sys/types.h>
+ #include <pwd.h>
+ #ifdef HAVE_UNISTD_H
+@@ -358,7 +359,49 @@
+ static GSList *
+ gtk_file_system_unix_list_volumes (GtkFileSystem *file_system)
+ {
+-  return g_slist_append (NULL, get_root_volume ());
+  struct statvfs stv;
+  struct stat    st;
+  GSList * l = g_slist_append (NULL, get_root_volume ());
+
+  if (!statvfs ("/.", &stv))
+  {
+      fsblkcnt_t root_blocks = stv.f_blocks;
+      fsfilcnt_t root_files  = stv.f_files;
+         
+      GDir * dir;
+      if ((dir = g_dir_open ("/media", 0, NULL)) != NULL)
+      {
+         const gchar * name;
+         while ((name = g_dir_read_name (dir)) != NULL)
+         {
+             gchar * abs_name = g_strconcat ("/media/", name, NULL);
+                 
+             if (!stat (abs_name, &st) && S_ISDIR (st.st_mode))
+             {
+                 gchar * dot = g_strconcat (abs_name, "/.", NULL);
+                 if (!statvfs (dot, &stv) &&
+                     (stv.f_blocks != root_blocks ||
+                      stv.f_files  != root_files))
+                 {
+                     GtkFilePath * path = 
+                         gtk_file_system_filename_to_path (file_system,
+                                                           abs_name);
+
+                     if (path)
+                         l = g_slist_append (l, path);
+                 }
+
+                 g_free (dot);
+             }
+
+             g_free (abs_name);
+         }
+
+         g_dir_close (dir);
+      }
+  }
+
+  return l;
+ }
+ 
+ static GtkFileSystemVolume *
+@@ -375,10 +418,15 @@
+ 
+   len = strlen (filename);
+ 
+-  if (len > 1 && filename[len - 1] == '/')
+-    return g_strndup (filename, len - 1);
+-  else
+-    return g_memdup (filename, len + 1);
+  if (len > 1)
+  {
+    gchar *c = g_utf8_prev_char (filename + len);
+
+    if (c && *c == '/')
+       return g_strndup (filename, len - 1);
+  }
+  
+  return g_memdup (filename, len + 1);
+ }
+ 
+ static GtkFileFolder *
+@@ -590,7 +638,7 @@
+ gtk_file_system_unix_volume_get_base_path (GtkFileSystem        *file_system,
+                                           GtkFileSystemVolume  *volume)
+ {
+-  return gtk_file_path_new_dup ("/");
+  return gtk_file_path_copy ((GtkFilePath*)volume);
+ }
+ 
+ static gboolean
+@@ -616,7 +664,32 @@
+ gtk_file_system_unix_volume_get_display_name (GtkFileSystem       *file_system,
+                                              GtkFileSystemVolume *volume)
+ {
+-  return g_strdup (_("Filesystem")); /* Same as Nautilus */
+  gchar * slash;
+  gchar * path;
+  gchar * c;
+  
+  g_return_val_if_fail (file_system && volume, NULL);
+  
+  path = gtk_file_system_path_to_filename (file_system, (GtkFilePath*) volume);
+
+  g_return_val_if_fail (path && *path, NULL);
+  
+  if (path[0] == '/' && !path[1])
+    return g_strdup (_("Filesystem")); /* Same as Nautilus */
+
+  /* Now the media volumes */
+  /* strip trailing / if any */
+  c = g_utf8_prev_char (path + strlen(path));
+  
+  if (*c == '/')
+    *c = 0;
+
+  slash = g_utf8_strrchr (path, -1, '/');
+
+  if (!slash)
+      return g_strdup (path);
+
+  return g_strdup (slash + 1);
+ }
+ 
+ static IconType
+@@ -787,11 +860,54 @@
+                                         GError              **error)
+ {
+   GdkPixbuf *pixbuf;
+  gchar * slash;
+  gchar * path;
+  gchar * c;
+  const gchar * id = NULL;
+  
+  g_return_val_if_fail (file_system && volume, NULL);
+  
+  path = gtk_file_system_path_to_filename (file_system, (GtkFilePath*) volume);
+ 
+-  pixbuf = get_cached_icon (widget, "gnome-fs-blockdev", pixel_size);
+-  if (pixbuf)
+-    return pixbuf;
+  g_return_val_if_fail (path && *path, NULL);
+  
+  if (path[0] == '/' && !path[1])
+      id = "gnome-fs-blockdev";
+  else
+  {
+    /* Now the media volumes */
+    /* strip trailing / if any */
+    c = g_utf8_prev_char (path + strlen(path));
+  
+    if (*c == '/')
+      *c = 0;
+
+    slash = g_utf8_strrchr (path, -1, '/');
+ 
+    if (slash)
+    {
+       slash++;
+
+       if (!strcmp (slash, "card"))
+          id = "gnome-dev-media-sdmmc";
+       else if (!strcmp (slash, "cf"))
+         id = "gnome-dev-media-cf";
+       else if (!strncmp (slash, "mmc", 3))
+         id = "gnome-dev-media-sdmmc";
+       else if (!strcmp (slash, "usbhdd"))
+         id = "gnome-dev-removable-usb";
+       else
+         id = "gnome-dev-removable";
+    }
+  }
+
+  if (id)
+  {
+    pixbuf = get_cached_icon (widget, id, pixel_size);
+    if (pixbuf)
+       return pixbuf;
+  }
+  
+   pixbuf = get_fallback_icon (widget, ICON_BLOCK_DEVICE, error);
+   g_assert (pixbuf != NULL);
+

diff --git a/meta/packages/gtk+/gtk+-2.6.10/filesystem-volumes.patch b/meta/packages/gtk+/gtk+-2.6.10/filesystem-volumes.patch new file mode 100644 index 0000000000..4386d83ee9 --- /dev/null +++ b/meta/packages/gtk+/gtk+-2.6.10/filesystem-volumes.patch
@@ -0,0 +1,182 @@
	1	--- gtk+-2.6.8/gtk/gtkfilesystemunix.c.orig 2007-02-08 12:01:19.000000000 +0000
	2	+++ gtk+-2.6.8/gtk/gtkfilesystemunix.c 2007-02-08 12:01:19.000000000 +0000
	3	@@ -33,6 +33,7 @@
	4	#include <errno.h>
	5	#include <string.h>
	6	#include <sys/stat.h>
	7	+#include <sys/statvfs.h>
	8	#include <sys/types.h>
	9	#include <pwd.h>
	10	#ifdef HAVE_UNISTD_H
	11	@@ -358,7 +359,49 @@
	12	static GSList *
	13	gtk_file_system_unix_list_volumes (GtkFileSystem *file_system)
	14	{
	15	- return g_slist_append (NULL, get_root_volume ());
	16	+ struct statvfs stv;
	17	+ struct stat st;
	18	+ GSList * l = g_slist_append (NULL, get_root_volume ());
	19	+
	20	+ if (!statvfs ("/.", &stv))
	21	+ {
	22	+ fsblkcnt_t root_blocks = stv.f_blocks;
	23	+ fsfilcnt_t root_files = stv.f_files;
	24	+
	25	+ GDir * dir;
	26	+ if ((dir = g_dir_open ("/media", 0, NULL)) != NULL)
	27	+ {
	28	+ const gchar * name;
	29	+ while ((name = g_dir_read_name (dir)) != NULL)
	30	+ {
	31	+ gchar * abs_name = g_strconcat ("/media/", name, NULL);
	32	+
	33	+ if (!stat (abs_name, &st) && S_ISDIR (st.st_mode))
	34	+ {
	35	+ gchar * dot = g_strconcat (abs_name, "/.", NULL);
	36	+ if (!statvfs (dot, &stv) &&
	37	+ (stv.f_blocks != root_blocks \|\|
	38	+ stv.f_files != root_files))
	39	+ {
	40	+ GtkFilePath * path =
	41	+ gtk_file_system_filename_to_path (file_system,
	42	+ abs_name);
	43	+
	44	+ if (path)
	45	+ l = g_slist_append (l, path);
	46	+ }
	47	+
	48	+ g_free (dot);
	49	+ }
	50	+
	51	+ g_free (abs_name);
	52	+ }
	53	+
	54	+ g_dir_close (dir);
	55	+ }
	56	+ }
	57	+
	58	+ return l;
	59	}
	60
	61	static GtkFileSystemVolume *
	62	@@ -375,10 +418,15 @@
	63
	64	len = strlen (filename);
	65
	66	- if (len > 1 && filename[len - 1] == '/')
	67	- return g_strndup (filename, len - 1);
	68	- else
	69	- return g_memdup (filename, len + 1);
	70	+ if (len > 1)
	71	+ {
	72	+ gchar *c = g_utf8_prev_char (filename + len);
	73	+
	74	+ if (c && *c == '/')
	75	+ return g_strndup (filename, len - 1);
	76	+ }
	77	+
	78	+ return g_memdup (filename, len + 1);
	79	}
	80
	81	static GtkFileFolder *
	82	@@ -590,7 +638,7 @@
	83	gtk_file_system_unix_volume_get_base_path (GtkFileSystem *file_system,
	84	GtkFileSystemVolume *volume)
	85	{
	86	- return gtk_file_path_new_dup ("/");
	87	+ return gtk_file_path_copy ((GtkFilePath*)volume);
	88	}
	89
	90	static gboolean
	91	@@ -616,7 +664,32 @@
	92	gtk_file_system_unix_volume_get_display_name (GtkFileSystem *file_system,
	93	GtkFileSystemVolume *volume)
	94	{
	95	- return g_strdup (_("Filesystem")); /* Same as Nautilus */
	96	+ gchar * slash;
	97	+ gchar * path;
	98	+ gchar * c;
	99	+
	100	+ g_return_val_if_fail (file_system && volume, NULL);
	101	+
	102	+ path = gtk_file_system_path_to_filename (file_system, (GtkFilePath*) volume);
	103	+
	104	+ g_return_val_if_fail (path && *path, NULL);
	105	+
	106	+ if (path[0] == '/' && !path[1])
	107	+ return g_strdup (_("Filesystem")); /* Same as Nautilus */
	108	+
	109	+ /* Now the media volumes */
	110	+ /* strip trailing / if any */
	111	+ c = g_utf8_prev_char (path + strlen(path));
	112	+
	113	+ if (*c == '/')
	114	+ *c = 0;
	115	+
	116	+ slash = g_utf8_strrchr (path, -1, '/');
	117	+
	118	+ if (!slash)
	119	+ return g_strdup (path);
	120	+
	121	+ return g_strdup (slash + 1);
	122	}
	123
	124	static IconType
	125	@@ -787,11 +860,54 @@
	126	GError **error)
	127	{
	128	GdkPixbuf *pixbuf;
	129	+ gchar * slash;
	130	+ gchar * path;
	131	+ gchar * c;
	132	+ const gchar * id = NULL;
	133	+
	134	+ g_return_val_if_fail (file_system && volume, NULL);
	135	+
	136	+ path = gtk_file_system_path_to_filename (file_system, (GtkFilePath*) volume);
	137
	138	- pixbuf = get_cached_icon (widget, "gnome-fs-blockdev", pixel_size);
	139	- if (pixbuf)
	140	- return pixbuf;
	141	+ g_return_val_if_fail (path && *path, NULL);
	142	+
	143	+ if (path[0] == '/' && !path[1])
	144	+ id = "gnome-fs-blockdev";
	145	+ else
	146	+ {
	147	+ /* Now the media volumes */
	148	+ /* strip trailing / if any */
	149	+ c = g_utf8_prev_char (path + strlen(path));
	150	+
	151	+ if (*c == '/')
	152	+ *c = 0;
	153	+
	154	+ slash = g_utf8_strrchr (path, -1, '/');
	155
	156	+ if (slash)
	157	+ {
	158	+ slash++;
	159	+
	160	+ if (!strcmp (slash, "card"))
	161	+ id = "gnome-dev-media-sdmmc";
	162	+ else if (!strcmp (slash, "cf"))
	163	+ id = "gnome-dev-media-cf";
	164	+ else if (!strncmp (slash, "mmc", 3))
	165	+ id = "gnome-dev-media-sdmmc";
	166	+ else if (!strcmp (slash, "usbhdd"))
	167	+ id = "gnome-dev-removable-usb";
	168	+ else
	169	+ id = "gnome-dev-removable";
	170	+ }
	171	+ }
	172	+
	173	+ if (id)
	174	+ {
	175	+ pixbuf = get_cached_icon (widget, id, pixel_size);
	176	+ if (pixbuf)
	177	+ return pixbuf;
	178	+ }
	179	+
	180	pixbuf = get_fallback_icon (widget, ICON_BLOCK_DEVICE, error);
	181	g_assert (pixbuf != NULL);
	182