- Update to 0.2.2
This commit is contained in:
Tomas Bzatek
parent
57f832b1c8
commit
98c2162028
@ -1 +1 @@
|
|||||||
gvfs-0.2.1.tar.bz2
|
gvfs-0.2.2.tar.bz2
|
||||||
|
|||||||
@ -1,119 +0,0 @@
|
|||||||
Index: daemon/gvfsbackendarchive.c
|
|
||||||
===================================================================
|
|
||||||
--- daemon/gvfsbackendarchive.c (revision 1670)
|
|
||||||
+++ daemon/gvfsbackendarchive.c (working copy)
|
|
||||||
@@ -45,6 +45,8 @@
|
|
||||||
#include "gvfsdaemonutils.h"
|
|
||||||
#include "gvfskeyring.h"
|
|
||||||
|
|
||||||
+#define MOUNT_ICON_NAME "drive-removable-media"
|
|
||||||
+
|
|
||||||
/* #define PRINT_DEBUG */
|
|
||||||
|
|
||||||
#ifdef PRINT_DEBUG
|
|
||||||
@@ -291,11 +293,12 @@
|
|
||||||
#define archive_file_find(ba, filename) archive_file_get_from_path((ba)->files, (filename) + 1, FALSE)
|
|
||||||
|
|
||||||
static void
|
|
||||||
-create_root_file (GVfsBackendArchive *ba, GIcon *icon)
|
|
||||||
+create_root_file (GVfsBackendArchive *ba)
|
|
||||||
{
|
|
||||||
ArchiveFile *root = g_slice_new0 (ArchiveFile);
|
|
||||||
GFileInfo *info;
|
|
||||||
char *s, *display_name;
|
|
||||||
+ GIcon *icon;
|
|
||||||
|
|
||||||
root = g_slice_new0 (ArchiveFile);
|
|
||||||
root->name = g_strdup ("/");
|
|
||||||
@@ -319,7 +322,9 @@
|
|
||||||
g_file_info_set_content_type (info, "inode/directory");
|
|
||||||
g_file_info_set_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE, "inode/directory");
|
|
||||||
|
|
||||||
+ icon = g_themed_icon_new ("folder");
|
|
||||||
g_file_info_set_icon (info, icon);
|
|
||||||
+ g_object_unref (icon);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
@@ -444,7 +449,9 @@
|
|
||||||
ArchiveFile *file = archive_file_get_from_path (ba->files,
|
|
||||||
archive_entry_pathname (entry),
|
|
||||||
TRUE);
|
|
||||||
- archive_file_set_info_from_entry (file, entry);
|
|
||||||
+ /* Don't set info for root */
|
|
||||||
+ if (file != ba->files)
|
|
||||||
+ archive_file_set_info_from_entry (file, entry);
|
|
||||||
archive_read_data_skip (archive->archive);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -544,15 +551,10 @@
|
|
||||||
g_vfs_backend_set_display_name (backend, g_file_info_get_display_name (info));
|
|
||||||
|
|
||||||
icon = g_file_info_get_icon (info);
|
|
||||||
-#if 0
|
|
||||||
- if (G_IS_THEMED_ICON (icon))
|
|
||||||
- g_vfs_backend_set_icon_name (backend,
|
|
||||||
- g_themed_icon_get_names (G_THEMED_ICON (icon))[0]);
|
|
||||||
- else
|
|
||||||
-#endif
|
|
||||||
- g_vfs_backend_set_icon_name (backend, "package-x-generic");
|
|
||||||
|
|
||||||
- create_root_file (archive, icon);
|
|
||||||
+ g_vfs_backend_set_icon_name (backend, MOUNT_ICON_NAME);
|
|
||||||
+
|
|
||||||
+ create_root_file (archive);
|
|
||||||
create_file_tree (archive, G_VFS_JOB (job));
|
|
||||||
g_object_unref (info);
|
|
||||||
}
|
|
||||||
Index: mount-archive.desktop.in.in
|
|
||||||
===================================================================
|
|
||||||
--- mount-archive.desktop.in.in (revision 0)
|
|
||||||
+++ mount-archive.desktop.in.in (revision 0)
|
|
||||||
@@ -0,0 +1,13 @@
|
|
||||||
+[Desktop Entry]
|
|
||||||
+Encoding=UTF-8
|
|
||||||
+_Name=Archive Mounter
|
|
||||||
+Exec=@libexecdir@/gvfsd-archive file=%u
|
|
||||||
+MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/x-zip;
|
|
||||||
+Terminal=false
|
|
||||||
+StartupNotify=false
|
|
||||||
+Type=Application
|
|
||||||
+NoDisplay=true
|
|
||||||
+X-GNOME-Bugzilla-Bugzilla=GNOME
|
|
||||||
+X-GNOME-Bugzilla-Product=gvfs
|
|
||||||
+X-GNOME-Bugzilla-Component=archive-backend
|
|
||||||
+X-GNOME-Bugzilla-Version=@VERSION@
|
|
||||||
Index: Makefile.am
|
|
||||||
===================================================================
|
|
||||||
--- Makefile.am (revision 1670)
|
|
||||||
+++ Makefile.am (working copy)
|
|
||||||
@@ -1,5 +1,20 @@
|
|
||||||
NULL =
|
|
||||||
|
|
||||||
+@INTLTOOL_DESKTOP_RULE@
|
|
||||||
+
|
|
||||||
+desktop_in_files = mount-archive.desktop.in
|
|
||||||
+
|
|
||||||
+mount-archive.desktop.in: mount-archive.desktop.in.in
|
|
||||||
+ sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
|
|
||||||
+
|
|
||||||
+desktopdir = $(datadir)/applications
|
|
||||||
+if HAVE_ARCHIVE
|
|
||||||
+desktop_DATA = mount-archive.desktop
|
|
||||||
+else
|
|
||||||
+desktop_DATA =
|
|
||||||
+endif
|
|
||||||
+
|
|
||||||
+
|
|
||||||
SUBDIRS = \
|
|
||||||
common \
|
|
||||||
client \
|
|
||||||
@@ -18,6 +33,8 @@
|
|
||||||
|
|
||||||
EXTRA_DIST = \
|
|
||||||
MAINTAINERS \
|
|
||||||
+ mount-archive.desktop.in.in \
|
|
||||||
+ $(desktop_in_files) \
|
|
||||||
intltool-extract.in \
|
|
||||||
intltool-merge.in \
|
|
||||||
intltool-update.in \
|
|
||||||
52
gvfs-0.2.2-archive-integration.patch
Normal file
52
gvfs-0.2.2-archive-integration.patch
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
Index: mount-archive.desktop.in.in
|
||||||
|
===================================================================
|
||||||
|
--- mount-archive.desktop.in.in (revision 0)
|
||||||
|
+++ mount-archive.desktop.in.in (revision 0)
|
||||||
|
@@ -0,0 +1,13 @@
|
||||||
|
+[Desktop Entry]
|
||||||
|
+Encoding=UTF-8
|
||||||
|
+_Name=Archive Mounter
|
||||||
|
+Exec=@libexecdir@/gvfsd-archive file=%u
|
||||||
|
+MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/x-zip;
|
||||||
|
+Terminal=false
|
||||||
|
+StartupNotify=false
|
||||||
|
+Type=Application
|
||||||
|
+NoDisplay=true
|
||||||
|
+X-GNOME-Bugzilla-Bugzilla=GNOME
|
||||||
|
+X-GNOME-Bugzilla-Product=gvfs
|
||||||
|
+X-GNOME-Bugzilla-Component=archive-backend
|
||||||
|
+X-GNOME-Bugzilla-Version=@VERSION@
|
||||||
|
Index: Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- Makefile.am (revision 1670)
|
||||||
|
+++ Makefile.am (working copy)
|
||||||
|
@@ -1,5 +1,20 @@
|
||||||
|
NULL =
|
||||||
|
|
||||||
|
+@INTLTOOL_DESKTOP_RULE@
|
||||||
|
+
|
||||||
|
+desktop_in_files = mount-archive.desktop.in
|
||||||
|
+
|
||||||
|
+mount-archive.desktop.in: mount-archive.desktop.in.in
|
||||||
|
+ sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
|
||||||
|
+
|
||||||
|
+desktopdir = $(datadir)/applications
|
||||||
|
+if HAVE_ARCHIVE
|
||||||
|
+desktop_DATA = mount-archive.desktop
|
||||||
|
+else
|
||||||
|
+desktop_DATA =
|
||||||
|
+endif
|
||||||
|
+
|
||||||
|
+
|
||||||
|
SUBDIRS = \
|
||||||
|
common \
|
||||||
|
client \
|
||||||
|
@@ -18,6 +33,8 @@
|
||||||
|
|
||||||
|
EXTRA_DIST = \
|
||||||
|
MAINTAINERS \
|
||||||
|
+ mount-archive.desktop.in.in \
|
||||||
|
+ $(desktop_in_files) \
|
||||||
|
intltool-extract.in \
|
||||||
|
intltool-merge.in \
|
||||||
|
intltool-update.in \
|
||||||
@ -1,7 +1,7 @@
|
|||||||
Summary: Backends for the gio framework in GLib
|
Summary: Backends for the gio framework in GLib
|
||||||
Name: gvfs
|
Name: gvfs
|
||||||
Version: 0.2.1
|
Version: 0.2.2
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
URL: http://www.gtk.org
|
URL: http://www.gtk.org
|
||||||
@ -33,7 +33,7 @@ Requires(postun): desktop-file-utils
|
|||||||
# The patch touches Makefile.am files:
|
# The patch touches Makefile.am files:
|
||||||
BuildRequires: automake autoconf
|
BuildRequires: automake autoconf
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
Patch1: gvfs-0.2.1-archive-integration.patch
|
Patch1: gvfs-0.2.2-archive-integration.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The gvfs package provides backend implementations for the gio
|
The gvfs package provides backend implementations for the gio
|
||||||
@ -176,6 +176,9 @@ update-desktop-database &> /dev/null ||:
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 28 2008 Tomas Bzatek <tbzatek@redhat.com> - 0.2.2-1
|
||||||
|
- Update to 0.2.2
|
||||||
|
|
||||||
* Tue Mar 25 2008 Tomas Bzatek <tbzatek@redhat.com> - 0.2.1-4
|
* Tue Mar 25 2008 Tomas Bzatek <tbzatek@redhat.com> - 0.2.1-4
|
||||||
- Moved fuse stuff to a dedicated package
|
- Moved fuse stuff to a dedicated package
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user