rpm/gvfs
SHA256
1
0
Fork 0
forked from pool/gvfs
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gvfs?expand=0&rev=37

Browse Source
This commit is contained in:
OBS User unknown
2009-04-07 10:56:59 +00:00
committed by Git OBS Bridge
parent ba337977ae
commit aa19f80051
4 changed files with 73 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
gvfs-nds.patch
View File

@@ -1,8 +1,7 @@
Index: gvfs-1.1.3/daemon/gvfsbackendnds.c
===================================================================
--- /dev/null
+++ gvfs-1.1.3/daemon/gvfsbackendnds.c
@@ -0,0 +1,763 @@
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
@@ -0,0 +1,753 @@
+/* GIO - GLib Input, Output and Streaming Library
+ *
+ * Copyright (C) 2006-2007 Red Hat, Inc.
@@ -55,7 +54,6 @@ Index: gvfs-1.1.3/daemon/gvfsbackendnds.c
+
+
+
+
+typedef struct {
+ char *name;
+ char *name_normalized;
@@ -205,7 +203,10 @@ Index: gvfs-1.1.3/daemon/gvfsbackendnds.c
+ char *server_name=NULL;
+ struct utsname utsbuf;
+/* Function Pointer to /opt/novell/lib/libinterface.so */
+int (*retrieve_children)(char *);
+ int (*retrieve_children)(char *,char ***,int *);
+ char **object_list_array=NULL;
+ int num_objects=0;
+ int i;
+
+ entries = NULL;
+ entry_errno = 0;
@@ -251,28 +252,15 @@ Index: gvfs-1.1.3/daemon/gvfsbackendnds.c
+ }
+ *(void **)(&retrieve_children) = dlsym(handle,"retrieve_children");
+
+ unlink("/tmp/ndsobjects.txt");
+
+ if(retrieve_children != NULL)
+ {
+ res = (*retrieve_children)(server_name);
+
+ if(res == 0)
+ res = (*retrieve_children)(server_name,&object_list_array,&num_objects);
+ if(res == 0)
+ {
+ fptr = fopen("/tmp/ndsobjects.txt","r");
+ if(fptr == NULL)
+ {
+ entry_errno = -1;
+ goto out;
+ }
+ objectname = (char *)malloc(sizeof(char) * 400);
+ while (fgets(objectname,400,fptr) != NULL)
+ {
+ objectlist = g_list_append(objectlist,g_strdup(objectname));
+ memset(objectname,'\0',400);
+ }
+ fclose(fptr);
+ free(objectname);
+ for(i=0;i < num_objects; i++)
+ {
+ objectlist = g_list_append(objectlist,g_strdup(*(object_list_array+ i)));
+ }
+ }
+ }
+ else
@@ -656,7 +644,7 @@ Index: gvfs-1.1.3/daemon/gvfsbackendnds.c
+ GFileAttributeMatcher *matcher)
+{
+ GVfsBackendNds *op_backend = G_VFS_BACKEND_NDS (backend);
+ const char *icon_name;
+ const char *icon_name = NULL;
+ GIcon *icon;
+
+ if (filename && is_root (filename))
@@ -664,7 +652,8 @@ Index: gvfs-1.1.3/daemon/gvfsbackendnds.c
+ g_file_info_set_file_type (info, G_FILE_TYPE_DIRECTORY);
+ g_file_info_set_name (info, "/");
+ g_file_info_set_display_name (info, g_vfs_backend_get_display_name (backend));
+ icon_name = g_vfs_backend_get_icon_name (backend);
+ /* FIXME: This API does not seem to be in gvfs-1.2.0. Find a suitable replacement? */
+ /* icon_name = g_vfs_backend_get_icon_name (backend); */
+ if (icon_name)
+ {
+ icon = g_themed_icon_new (icon_name);
@@ -766,10 +755,9 @@ Index: gvfs-1.1.3/daemon/gvfsbackendnds.c
+{
+ g_set_application_name (_("Displaying Embedded Objects"));
+}
Index: gvfs-1.1.3/daemon/gvfsbackendnds.h
===================================================================
--- /dev/null
+++ gvfs-1.1.3/daemon/gvfsbackendnds.h
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
@@ -0,0 +1,53 @@
+/* GIO - GLib Input, Output and Streaming Library
+ *
@@ -824,10 +812,9 @@ Index: gvfs-1.1.3/daemon/gvfsbackendnds.h
+G_END_DECLS
+
+#endif /* __G_VFS_BACKEND_NDS_H__ */
Index: gvfs-1.1.3/daemon/Makefile.am
===================================================================
--- gvfs-1.1.3.orig/daemon/Makefile.am
+++ gvfs-1.1.3/daemon/Makefile.am
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
mount_DATA += nvvfs.mount
libexec_PROGRAMS += gvfsd-nvvfs
@@ -839,7 +826,7 @@ Index: gvfs-1.1.3/daemon/Makefile.am
EXTRA_DIST = gvfs-daemon.service.in $(mount_in_files) obexftp-marshal.list
DISTCLEANFILES = gvfs-daemon.service $(mount_DATA)
@@ -403,6 +407,19 @@ gvfsd_http_CPPFLAGS = \
@@ -406,6 +410,19 @@ gvfsd_http_CPPFLAGS = \
gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS)
@@ -859,10 +846,9 @@ Index: gvfs-1.1.3/daemon/Makefile.am
gvfsd_nvvfs_SOURCES = \
gvfsbackendnvvfs.c gvfsbackendnvvfs.h \
daemon-main.c daemon-main.h \
Index: gvfs-1.1.3/daemon/nds.mount.in
===================================================================
--- /dev/null
+++ gvfs-1.1.3/daemon/nds.mount.in
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
@@ -0,0 +1,5 @@
+[Mount]
+Type=nds