mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 01:19:52 +00:00
Code Issues Projects Releases Wiki Activity

ported filechooser patcheas to gtk 2.12.3

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3408 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Tomas Frydrych
2008-01-04 15:51:51 +00:00
parent fe7eb79225
commit 9ea7515313
5 changed files with 14455 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/gtk+/gtk+-2.12.3/filechooser-default.patch
Vendored
+14188
View File
File diff suppressed because it is too large Load Diff
meta/packages/gtk+/gtk+-2.12.3/filechooser-utils.patch
Vendored
+32
View File
@@ -0,0 +1,32 @@
Index: gtk+-2.12.3/gtk/gtkfilechooserutils.h
===================================================================
--- gtk+-2.12.3.orig/gtk/gtkfilechooserutils.h 2007-12-04 16:52:08.000000000 +0000
+++ gtk+-2.12.3/gtk/gtkfilechooserutils.h 2008-01-02 13:15:17.000000000 +0000
@@ -41,7 +41,9 @@
GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE,
GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN,
GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION,
- GTK_FILE_CHOOSER_PROP_LAST = GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION
+ GTK_FILE_CHOOSER_PROP_ROOT_FOLDER,
+ GTK_FILE_CHOOSER_PROP_SHOW_CREATE_FOLDER,
+ GTK_FILE_CHOOSER_PROP_LAST = GTK_FILE_CHOOSER_PROP_SHOW_CREATE_FOLDER
} GtkFileChooserProp;
void _gtk_file_chooser_install_properties (GObjectClass *klass);
Index: gtk+-2.12.3/gtk/gtkfilechooserutils.c
===================================================================
--- gtk+-2.12.3.orig/gtk/gtkfilechooserutils.c 2007-12-04 16:52:08.000000000 +0000
+++ gtk+-2.12.3/gtk/gtkfilechooserutils.c 2008-01-02 13:15:17.000000000 +0000
@@ -117,6 +117,12 @@
g_object_class_override_property (klass,
GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION,
"do-overwrite-confirmation");
+ g_object_class_override_property (klass,
+ GTK_FILE_CHOOSER_PROP_ROOT_FOLDER,
+ "root-folder");
+ g_object_class_override_property (klass,
+ GTK_FILE_CHOOSER_PROP_SHOW_CREATE_FOLDER,
+ "show-create-folder");
}
/**
meta/packages/gtk+/gtk+-2.12.3/filechooser.patch
Vendored
+25
View File
@@ -0,0 +1,25 @@
Index: gtk+-2.12.3/gtk/gtkfilechooser.c
===================================================================
--- gtk+-2.12.3.orig/gtk/gtkfilechooser.c 2007-12-04 16:52:08.000000000 +0000
+++ gtk+-2.12.3/gtk/gtkfilechooser.c 2008-01-02 13:15:38.000000000 +0000
@@ -272,6 +272,20 @@
"if necessary."),
FALSE,
GTK_PARAM_READWRITE));
+
+ g_object_interface_install_property (g_iface,
+ g_param_spec_string ("root-folder",
+ P_("File System Root"),
+ P_("Root folder for the file system below which the user should not be able to switch"),
+ NULL,
+ G_PARAM_WRITABLE));
+
+ g_object_interface_install_property (g_iface,
+ g_param_spec_boolean ("show-create-folder",
+ P_("Show Create Folder button"),
+ P_("Whether the Create Folder button should be visible on the bar"),
+ TRUE,
+ G_PARAM_READWRITE));
}
/**
meta/packages/gtk+/gtk+-2.12.3/filesystem-volumes.patch
Vendored
+198
View File
@@ -0,0 +1,198 @@
Index: gtk+-2.12.3/gtk/gtkfilesystemunix.c
===================================================================
--- gtk+-2.12.3.orig/gtk/gtkfilesystemunix.c 2007-12-04 16:52:08.000000000 +0000
+++ gtk+-2.12.3/gtk/gtkfilesystemunix.c 2008-01-02 13:15:02.000000000 +0000
@@ -38,6 +38,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
@@ -474,7 +475,55 @@
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;
+
+ /* Skip ram disks */
+ if (!strcmp (name, "ram"))
+ continue;
+
+ 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 *
@@ -488,13 +537,18 @@
remove_trailing_slash (const char *filename)
{
int len;
-
+
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);
}
/* Delay callback dispatching
@@ -1128,7 +1182,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
@@ -1162,7 +1216,32 @@
gtk_file_system_unix_volume_get_display_name (GtkFileSystem *file_system,
GtkFileSystemVolume *volume)
{
- return g_strdup (_("File System")); /* 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
@@ -1250,10 +1329,57 @@
GtkFileSystemVolume *volume,
GError **error)
{
- /* FIXME: maybe we just always want to return GTK_STOCK_HARDDISK here?
- * or the new tango icon name?
- */
- return g_strdup ("gnome-dev-harddisk");
+ gchar * c;
+ gchar * slash;
+ gchar * path = NULL;
+ GtkFilePath * fpath;
+ const gchar * id = NULL;
+
+ g_return_val_if_fail (file_system && volume, NULL);
+
+ fpath = gtk_file_system_volume_get_base_path (file_system, volume);
+
+ if (!fpath)
+ goto out;
+
+ path = gtk_file_system_path_to_filename (file_system, fpath);
+ gtk_file_path_free (fpath);
+
+ if (!path || !*path || (*path == '/' && !path[1]))
+ goto out;
+
+ /* 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";
+ }
+
+ out:
+ g_free (path);
+
+ if (!id)
+ id = "gnome-fs-blockdev";
+
+ return g_strdup (id);
}
static char *
meta/packages/gtk+/gtk+_2.12.3.bb
+12 -7
View File
@@ -1,10 +1,10 @@
require gtk+.inc require gtk+.inc
DEPENDS += "cairo" DEPENDS += "cairo"
PR = "r2" PR = "r3"
# disable per default - untested and not all patches included. # disable per default - untested and not all patches included.
DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE = "-1"
SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
file://xsettings.patch;patch=1 \ file://xsettings.patch;patch=1 \
@@ -12,16 +12,21 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
file://disable-print.patch;patch=1 \ file://disable-print.patch;patch=1 \
file://hardcoded_libtool.patch;patch=1 \ file://hardcoded_libtool.patch;patch=1 \
file://no-demos.patch;patch=1 \ file://no-demos.patch;patch=1 \
file://cellrenderer-cairo.patch;patch=1;pnum=0 \ file://cellrenderer-cairo.patch;patch=1;pnum=0 \
file://entry-cairo.patch;patch=1;pnum=0 \ file://entry-cairo.patch;patch=1;pnum=0 \
file://toggle-font.diff;patch=1;pnum=0 \ file://toggle-font.diff;patch=1;pnum=0 \
file://scrolled-placement.patch;patch=1;pnum=0" file://scrolled-placement.patch;patch=1;pnum=0 \
file://filesystem-volumes.patch;patch=1 \
file://filechooser-utils.patch;patch=1 \
file://filechooser.patch;patch=1 \
file://filechooser-default.patch;patch=1 \
# temporary # temporary
# file://gtklabel-resize-patch;patch=1 \ # file://gtklabel-resize-patch;patch=1 \
# file://menu-deactivate.patch;patch=1 \ # file://menu-deactivate.patch;patch=1 \
# file://combo-arrow-size.patch;patch=1;pnum=0 \ # file://combo-arrow-size.patch;patch=1;pnum=0 \
# die die die # die die die
# file://pangoxft2.10.6.diff;patch=1" # file://pangoxft2.10.6.diff;patch=1 \
"
EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"