SHA256
1
0
forked from pool/gvfs

Accepting request 33506 from home:dimstar:branches:GNOME:Factory

Copy from home:dimstar:branches:GNOME:Factory/gvfs via accept of submit request 33506 revision 3.
Request was accepted with message:

OBS-URL: https://build.opensuse.org/request/show/33506
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=69
This commit is contained in:
Magnus Boman
2010-02-28 08:17:57 +00:00
committed by Git OBS Bridge
parent 5220089321
commit 663108c81f
8 changed files with 60 additions and 71 deletions

View File

@@ -1,6 +1,7 @@
diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnds.c gvfs-1.2.0/daemon/gvfsbackendnds.c
--- gvfs-1.2.0.orig/daemon/gvfsbackendnds.c 1970-01-01 05:30:00.000000000 +0530
+++ gvfs-1.2.0/daemon/gvfsbackendnds.c 2009-04-03 20:14:07.000000000 +0530
Index: gvfs-1.5.4/daemon/gvfsbackendnds.c
===================================================================
--- /dev/null
+++ gvfs-1.5.4/daemon/gvfsbackendnds.c
@@ -0,0 +1,753 @@
+/* GIO - GLib Input, Output and Streaming Library
+ *
@@ -755,9 +756,10 @@ diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnds.c gvfs-1.2.0/daemon/gvfsbackend
+{
+ g_set_application_name (_("Displaying Embedded Objects"));
+}
diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnds.h gvfs-1.2.0/daemon/gvfsbackendnds.h
--- gvfs-1.2.0.orig/daemon/gvfsbackendnds.h 1970-01-01 05:30:00.000000000 +0530
+++ gvfs-1.2.0/daemon/gvfsbackendnds.h 2009-04-03 19:51:07.000000000 +0530
Index: gvfs-1.5.4/daemon/gvfsbackendnds.h
===================================================================
--- /dev/null
+++ gvfs-1.5.4/daemon/gvfsbackendnds.h
@@ -0,0 +1,53 @@
+/* GIO - GLib Input, Output and Streaming Library
+ *
@@ -812,10 +814,11 @@ diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnds.h gvfs-1.2.0/daemon/gvfsbackend
+G_END_DECLS
+
+#endif /* __G_VFS_BACKEND_NDS_H__ */
diff -Nupr gvfs-1.2.0.orig/daemon/Makefile.am gvfs-1.2.0/daemon/Makefile.am
--- gvfs-1.2.0.orig/daemon/Makefile.am 2009-04-03 20:08:22.000000000 +0530
+++ gvfs-1.2.0/daemon/Makefile.am 2009-04-03 19:51:07.000000000 +0530
@@ -105,6 +105,10 @@ mount_in_files += nvvfs.mount.in
Index: gvfs-1.5.4/daemon/Makefile.am
===================================================================
--- gvfs-1.5.4.orig/daemon/Makefile.am
+++ gvfs-1.5.4/daemon/Makefile.am
@@ -112,6 +112,10 @@ mount_in_files += nvvfs.mount.in
mount_DATA += nvvfs.mount
libexec_PROGRAMS += gvfsd-nvvfs
@@ -826,7 +829,7 @@ diff -Nupr gvfs-1.2.0.orig/daemon/Makefile.am gvfs-1.2.0/daemon/Makefile.am
EXTRA_DIST = gvfs-daemon.service.in $(mount_in_files) obexftp-marshal.list
DISTCLEANFILES = gvfs-daemon.service $(mount_DATA)
@@ -406,6 +410,19 @@ gvfsd_http_CPPFLAGS = \
@@ -442,6 +446,19 @@ gvfsd_http_CPPFLAGS = \
gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS)
@@ -846,9 +849,10 @@ diff -Nupr gvfs-1.2.0.orig/daemon/Makefile.am gvfs-1.2.0/daemon/Makefile.am
gvfsd_nvvfs_SOURCES = \
gvfsbackendnvvfs.c gvfsbackendnvvfs.h \
daemon-main.c daemon-main.h \
diff -Nupr gvfs-1.2.0.orig/daemon/nds.mount.in gvfs-1.2.0/daemon/nds.mount.in
--- gvfs-1.2.0.orig/daemon/nds.mount.in 1970-01-01 05:30:00.000000000 +0530
+++ gvfs-1.2.0/daemon/nds.mount.in 2009-04-03 19:51:07.000000000 +0530
Index: gvfs-1.5.4/daemon/nds.mount.in
===================================================================
--- /dev/null
+++ gvfs-1.5.4/daemon/nds.mount.in
@@ -0,0 +1,5 @@
+[Mount]
+Type=nds