diff -Nur thunar-shares-plugin-0.2.0-pre/configure.in thunar-shares-plugin-0.2.0-post/configure.in --- thunar-shares-plugin-0.2.0-pre/configure.in 2009-02-16 04:00:53.000000000 +0800 +++ thunar-shares-plugin-0.2.0-post/configure.in 2009-10-26 17:41:12.000000000 +0800 @@ -57,7 +57,6 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.12.0]) XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.10.0]) XDT_CHECK_PACKAGE([THUNARX], [thunarx-1], [0.8.0]) -XDT_CHECK_PACKAGE([THUNARVFS], [thunar-vfs-1], [0.8.0]) dnl ------------------------------------------------------- dnl Languages diff -Nur thunar-shares-plugin-0.2.0-pre/libshares/libshares-util.c thunar-shares-plugin-0.2.0-post/libshares/libshares-util.c --- thunar-shares-plugin-0.2.0-pre/libshares/libshares-util.c 2009-10-26 17:46:18.000000000 +0800 +++ thunar-shares-plugin-0.2.0-post/libshares/libshares-util.c 2009-10-26 18:33:33.000000000 +0800 @@ -26,8 +26,8 @@ #include #include +#include -#include #include #include "libshares-util.h" @@ -368,16 +368,17 @@ mode = st.st_mode; new_mode = mode; + + need_r = (mode & S_IROTH) == 0; + new_mode |= S_IROTH; - need_r = (mode & THUNAR_VFS_FILE_MODE_OTH_READ) == 0; - new_mode |= THUNAR_VFS_FILE_MODE_OTH_READ; - - need_w = is_writable && (mode & THUNAR_VFS_FILE_MODE_OTH_WRITE) == 0; + need_w = is_writable && (mode & S_IWOTH) == 0; if (need_w) - new_mode |= THUNAR_VFS_FILE_MODE_OTH_WRITE; + new_mode |= S_IWOTH; + + need_x = (mode & S_IXOTH) == 0; + new_mode |= S_IXOTH; - need_x = (mode & THUNAR_VFS_FILE_MODE_OTH_EXEC) == 0; - new_mode |= THUNAR_VFS_FILE_MODE_OTH_EXEC; if (need_r || need_w || need_x) { diff -Nur thunar-shares-plugin-0.2.0-pre/libshares/Makefile.am thunar-shares-plugin-0.2.0-post/libshares/Makefile.am --- thunar-shares-plugin-0.2.0-pre/libshares/Makefile.am 2009-02-16 03:54:41.000000000 +0800 +++ thunar-shares-plugin-0.2.0-post/libshares/Makefile.am 2009-10-26 17:41:12.000000000 +0800 @@ -17,14 +17,12 @@ $(PLATFORM_CFLAGS) \ $(GTK_CFLAGS) \ $(GLIB_CFLAGS) \ - $(THUNARX_CFLAGS) \ - $(THUNARVFS_CFLAGS) + $(THUNARX_CFLAGS) libshares_la_LDFLAGS = \ $(GTK_LIBS) \ $(GLIB_LIBS) \ $(THUNARX_LIBS) \ - $(THUNARVFS_LIBS) \ $(PLATFORM_LDFLAGS) # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff -Nur thunar-shares-plugin-0.2.0-pre/libshares/Makefile.in thunar-shares-plugin-0.2.0-post/libshares/Makefile.in --- thunar-shares-plugin-0.2.0-pre/libshares/Makefile.in 2009-02-16 04:01:03.000000000 +0800 +++ thunar-shares-plugin-0.2.0-post/libshares/Makefile.in 2009-10-26 17:50:36.000000000 +0800 @@ -176,10 +176,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -THUNARVFS_CFLAGS = @THUNARVFS_CFLAGS@ -THUNARVFS_LIBS = @THUNARVFS_LIBS@ -THUNARVFS_REQUIRED_VERSION = @THUNARVFS_REQUIRED_VERSION@ -THUNARVFS_VERSION = @THUNARVFS_VERSION@ THUNARX_CFLAGS = @THUNARX_CFLAGS@ THUNARX_LIBS = @THUNARX_LIBS@ THUNARX_REQUIRED_VERSION = @THUNARX_REQUIRED_VERSION@ @@ -260,14 +256,12 @@ $(PLATFORM_CFLAGS) \ $(GTK_CFLAGS) \ $(GLIB_CFLAGS) \ - $(THUNARX_CFLAGS) \ - $(THUNARVFS_CFLAGS) + $(THUNARX_CFLAGS) libshares_la_LDFLAGS = \ $(GTK_LIBS) \ $(GLIB_LIBS) \ $(THUNARX_LIBS) \ - $(THUNARVFS_LIBS) \ $(PLATFORM_LDFLAGS) all: all-am diff -Nur thunar-shares-plugin-0.2.0-pre/Makefile.in thunar-shares-plugin-0.2.0-post/Makefile.in --- thunar-shares-plugin-0.2.0-pre/Makefile.in 2009-02-16 04:01:03.000000000 +0800 +++ thunar-shares-plugin-0.2.0-post/Makefile.in 2009-10-26 17:41:12.000000000 +0800 @@ -181,10 +181,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -THUNARVFS_CFLAGS = @THUNARVFS_CFLAGS@ -THUNARVFS_LIBS = @THUNARVFS_LIBS@ -THUNARVFS_REQUIRED_VERSION = @THUNARVFS_REQUIRED_VERSION@ -THUNARVFS_VERSION = @THUNARVFS_VERSION@ THUNARX_CFLAGS = @THUNARX_CFLAGS@ THUNARX_LIBS = @THUNARX_LIBS@ THUNARX_REQUIRED_VERSION = @THUNARX_REQUIRED_VERSION@ diff -Nur thunar-shares-plugin-0.2.0-pre/po/zh_CN.po thunar-shares-plugin-0.2.0-post/po/zh_CN.po --- thunar-shares-plugin-0.2.0-pre/po/zh_CN.po 2009-02-16 03:54:41.000000000 +0800 +++ thunar-shares-plugin-0.2.0-post/po/zh_CN.po 2009-10-26 18:38:12.000000000 +0800 @@ -110,6 +110,10 @@ msgid "Add, edit and remove shared folders" msgstr "添加、修改和删除共享目录" +#: ../thunar-plugin/tsp-provider.c:155 +msgid "Sharing Option..." +msgstr "共享选项..." + #: ../data/admin-dialog-editor.xml.h:1 msgid "Comments:" msgstr "注释:" diff -Nur thunar-shares-plugin-0.2.0-pre/thunar-plugin/Makefile.am thunar-shares-plugin-0.2.0-post/thunar-plugin/Makefile.am --- thunar-shares-plugin-0.2.0-pre/thunar-plugin/Makefile.am 2009-02-16 03:54:41.000000000 +0800 +++ thunar-shares-plugin-0.2.0-post/thunar-plugin/Makefile.am 2009-10-26 17:41:12.000000000 +0800 @@ -19,8 +19,7 @@ $(PLATFORM_CFLAGS) \ $(GTK_CFLAGS) \ $(GLIB_CFLAGS) \ - $(THUNARX_CFLAGS) \ - $(THUNARVFS_CFLAGS) + $(THUNARX_CFLAGS) thunar_shares_plugin_la_LDFLAGS = \ -avoid-version \ @@ -29,7 +28,6 @@ $(GTK_LIBS) \ $(GLIB_LIBS) \ $(THUNARX_LIBS) \ - $(THUNARVFS_LIBS) \ $(PLATFORM_LDFLAGS) thunar_shares_plugin_la_LIBADD= \ diff -Nur thunar-shares-plugin-0.2.0-pre/thunar-plugin/Makefile.in thunar-shares-plugin-0.2.0-post/thunar-plugin/Makefile.in --- thunar-shares-plugin-0.2.0-pre/thunar-plugin/Makefile.in 2009-02-16 04:01:03.000000000 +0800 +++ thunar-shares-plugin-0.2.0-post/thunar-plugin/Makefile.in 2009-10-26 17:51:10.000000000 +0800 @@ -189,10 +189,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -THUNARVFS_CFLAGS = @THUNARVFS_CFLAGS@ -THUNARVFS_LIBS = @THUNARVFS_LIBS@ -THUNARVFS_REQUIRED_VERSION = @THUNARVFS_REQUIRED_VERSION@ -THUNARVFS_VERSION = @THUNARVFS_VERSION@ THUNARX_CFLAGS = @THUNARX_CFLAGS@ THUNARX_LIBS = @THUNARX_LIBS@ THUNARX_REQUIRED_VERSION = @THUNARX_REQUIRED_VERSION@ @@ -275,8 +271,7 @@ $(PLATFORM_CFLAGS) \ $(GTK_CFLAGS) \ $(GLIB_CFLAGS) \ - $(THUNARX_CFLAGS) \ - $(THUNARVFS_CFLAGS) + $(THUNARX_CFLAGS) thunar_shares_plugin_la_LDFLAGS = \ -avoid-version \ @@ -285,7 +280,6 @@ $(GTK_LIBS) \ $(GLIB_LIBS) \ $(THUNARX_LIBS) \ - $(THUNARVFS_LIBS) \ $(PLATFORM_LDFLAGS) thunar_shares_plugin_la_LIBADD = \ diff -Nur thunar-shares-plugin-0.2.0-pre/thunar-plugin/thunar-shares-plugin.c thunar-shares-plugin-0.2.0-post/thunar-plugin/thunar-shares-plugin.c --- thunar-shares-plugin-0.2.0-pre/thunar-plugin/thunar-shares-plugin.c 2009-02-16 03:54:41.000000000 +0800 +++ thunar-shares-plugin-0.2.0-post/thunar-plugin/thunar-shares-plugin.c 2009-10-26 18:33:54.000000000 +0800 @@ -22,7 +22,7 @@ #include #endif -#include +#include #include #include "tsp-provider.h" diff -Nur thunar-shares-plugin-0.2.0-pre/thunar-plugin/tsp-page.c thunar-shares-plugin-0.2.0-post/thunar-plugin/tsp-page.c --- thunar-shares-plugin-0.2.0-pre/thunar-plugin/tsp-page.c 2009-02-16 03:54:41.000000000 +0800 +++ thunar-shares-plugin-0.2.0-post/thunar-plugin/tsp-page.c 2009-10-26 18:34:20.000000000 +0800 @@ -22,7 +22,7 @@ #include #endif -#include +#include #include #include diff -Nur thunar-shares-plugin-0.2.0-pre/thunar-plugin/tsp-provider.c thunar-shares-plugin-0.2.0-post/thunar-plugin/tsp-provider.c --- thunar-shares-plugin-0.2.0-pre/thunar-plugin/tsp-provider.c 2009-10-26 17:46:18.000000000 +0800 +++ thunar-shares-plugin-0.2.0-post/thunar-plugin/tsp-provider.c 2009-10-26 18:39:23.000000000 +0800 @@ -22,6 +22,8 @@ #include #endif +#include + #include #include @@ -152,7 +154,7 @@ /* append the "Sharing Option" action */ action = g_object_new (GTK_TYPE_ACTION, "name", "TspProvider::share", - "label","Sharing Option...", + "label",_("Sharing Option..."), #if !GTK_CHECK_VERSION(2,9,0) "stock-id", "gnome-fs-share", #else