From 130eaa7d69ed4803041774442ccb6a9d7ea1ec4c Mon Sep 17 00:00:00 2001 From: Steve Zesch Date: Mon, 14 May 2012 13:35:03 -0400 Subject: Forked gnome-user-share. Work in progress. --- data/Makefile.am | 42 ++++ data/dav_groupfile | 1 + data/dav_user_2.0.conf | 40 ++++ data/dav_user_2.2.conf | 72 ++++++ data/desktop_mate_file_sharing.schemas.in | 94 ++++++++ data/file-share-properties.ui | 364 +++++++++++++++++++++++++++++ data/icons/16x16/Makefile.am | 6 + data/icons/16x16/mate-obex-server.png | Bin 0 -> 964 bytes data/icons/16x16/mate-obex-server.svg | 128 ++++++++++ data/icons/22x22/Makefile.am | 6 + data/icons/22x22/mate-obex-server.png | Bin 0 -> 1537 bytes data/icons/22x22/mate-obex-server.svg | 136 +++++++++++ data/icons/32x32/Makefile.am | 6 + data/icons/32x32/mate-obex-server.png | Bin 0 -> 2582 bytes data/icons/32x32/mate-obex-server.svg | 151 ++++++++++++ data/icons/48x48/Makefile.am | 6 + data/icons/48x48/mate-obex-server.png | Bin 0 -> 4581 bytes data/icons/48x48/mate-obex-server.svg | 171 ++++++++++++++ data/icons/Makefile.am | 17 ++ data/mate-user-share-properties.desktop.in | 14 ++ data/mate-user-share.desktop.in.in | 9 + 21 files changed, 1263 insertions(+) create mode 100644 data/Makefile.am create mode 100644 data/dav_groupfile create mode 100644 data/dav_user_2.0.conf create mode 100644 data/dav_user_2.2.conf create mode 100644 data/desktop_mate_file_sharing.schemas.in create mode 100644 data/file-share-properties.ui create mode 100644 data/icons/16x16/Makefile.am create mode 100644 data/icons/16x16/mate-obex-server.png create mode 100644 data/icons/16x16/mate-obex-server.svg create mode 100644 data/icons/22x22/Makefile.am create mode 100644 data/icons/22x22/mate-obex-server.png create mode 100644 data/icons/22x22/mate-obex-server.svg create mode 100644 data/icons/32x32/Makefile.am create mode 100644 data/icons/32x32/mate-obex-server.png create mode 100644 data/icons/32x32/mate-obex-server.svg create mode 100644 data/icons/48x48/Makefile.am create mode 100644 data/icons/48x48/mate-obex-server.png create mode 100644 data/icons/48x48/mate-obex-server.svg create mode 100644 data/icons/Makefile.am create mode 100644 data/mate-user-share-properties.desktop.in create mode 100644 data/mate-user-share.desktop.in.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000..8c9e3b9 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,42 @@ +SUBDIRS = icons + +@INTLTOOL_SCHEMAS_RULE@ +schemadir = $(GCONF_SCHEMA_FILE_DIR) +schema_in_files = desktop_mate_file_sharing.schemas.in +schema_DATA = $(schema_in_files:.schemas.in=.schemas) + +@INTLTOOL_DESKTOP_RULE@ +desktopdir = $(datadir)/applications +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +desktop_in_files = mate-user-share-properties.desktop.in + +autostartdir = $(sysconfdir)/xdg/autostart/ +autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) +autostart_in_files = mate-user-share.desktop.in + +appdir = $(datadir)/mate-user-share +app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_groupfile file-share-properties.ui + +install-data-local: +if GCONF_SCHEMAS_INSTALL + -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + $(GCONFTOOL) --makefile-install-rule $(schema_DATA) +endif + +if GCONF_SCHEMAS_INSTALL +uninstall-local: + -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + $(GCONFTOOL) --makefile-uninstall-rule $(schema_DATA) +endif + +EXTRA_DIST = $(schema_in_files) \ + $(app_DATA) \ + $(desktop_in_files) \ + mate-user-share.desktop.in.in \ + file-share-properties.ui + +CLEANFILES = $(desktop_DATA) $(autostart_DATA) + +DISTCLEANFILES = $(schema_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/dav_groupfile b/data/dav_groupfile new file mode 100644 index 0000000..e005c7b --- /dev/null +++ b/data/dav_groupfile @@ -0,0 +1 @@ +guest: guest diff --git a/data/dav_user_2.0.conf b/data/dav_user_2.0.conf new file mode 100644 index 0000000..0be05f3 --- /dev/null +++ b/data/dav_user_2.0.conf @@ -0,0 +1,40 @@ +ServerRoot ${XDG_CONFIG_HOME}/user-share +PidFile pid +LockFile lock +LogLevel crit +#LogLevel info +ErrorLog log +DAVLockDB lock + +LimitXMLRequestBody 100000 + +LoadModule dav_module /etc/httpd/modules/mod_dav.so +LoadModule dav_fs_module /etc/httpd/modules/mod_dav_fs.so +LoadModule auth_digest_module /etc/httpd/modules/mod_auth_digest.so + +DocumentRoot ${XDG_PUBLICSHARE_DIR} + + AllowOverride None + DAV On + + AuthType Digest + AuthName "Please log in as the user guest" + AuthDigestDomain / + AuthDigestFile ${XDG_CONFIG_HOME}/user-share/passwd + + + + Require user guest + + + + + Require user guest + + + + +StartServers 1 +MinSpareServers 1 +MaxSpareServers 1 +MaxClients 3 diff --git a/data/dav_user_2.2.conf b/data/dav_user_2.2.conf new file mode 100644 index 0000000..f38d9ee --- /dev/null +++ b/data/dav_user_2.2.conf @@ -0,0 +1,72 @@ +ServerRoot ${XDG_CONFIG_HOME}/user-share +PidFile pid +LockFile lock +LogLevel crit +#LogLevel info +ErrorLog log +DAVLockDB lock + +LimitXMLRequestBody 100000 + +LoadModule dav_module ${HTTP_MODULES_PATH}/mod_dav.so +LoadModule dav_fs_module ${HTTP_MODULES_PATH}/mod_dav_fs.so +LoadModule authn_file_module ${HTTP_MODULES_PATH}/mod_authn_file.so +LoadModule auth_digest_module ${HTTP_MODULES_PATH}/mod_auth_digest.so +LoadModule authz_groupfile_module ${HTTP_MODULES_PATH}/mod_authz_groupfile.so +LoadModule dnssd_module ${HTTP_MODULES_PATH}/mod_dnssd.so + +DNSSDEnable on +DNSSDAutoRegisterVHosts Off +DNSSDAutoRegisterUserDir Off + + + DocumentRoot ${XDG_PUBLICSHARE_DIR} + + + DAV On + + AuthType Digest + AuthName "${GUS_LOGIN_LABEL}" + AuthDigestDomain / + + AuthDigestProvider file + AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd + AuthGroupFile /usr/share/gnome-user-share/dav_groupfile + + + Require user guest + Require group guest + + + + + Require user guest + Require group guest + + + + DNSSDServiceName "${GUS_SHARE_NAME}" + DNSSDServiceTypes _webdav._tcp + DNSSDServiceTxtRecord u=guest + + + +StartServers 1 +MaxClients 3 + + + MinSpareServers 1 + MaxSpareServers 1 + + + + MinSpareThreads 1 + MaxSpareThreads 1 + ThreadsPerChild 3 + + + + MinSpareThreads 1 + MaxSpareThreads 1 + ThreadsPerChild 3 + diff --git a/data/desktop_mate_file_sharing.schemas.in b/data/desktop_mate_file_sharing.schemas.in new file mode 100644 index 0000000..72c740b --- /dev/null +++ b/data/desktop_mate_file_sharing.schemas.in @@ -0,0 +1,94 @@ + + + + + /schemas/desktop/mate/file_sharing/enabled + /desktop/mate/file_sharing/enabled + mate-user-share + bool + false + + Share Public directory over the network + If this is true, the Public directory in the users home directory will be shared over the network when the user is logged in. + + + + /schemas/desktop/mate/file_sharing/require_password + /desktop/mate/file_sharing/require_password + mate-user-share + string + never + + When to require passwords + When to ask for passwords. Possible values are "never", "on_write", and "always". + + + + /schemas/desktop/mate/file_sharing/bluetooth_enabled + /desktop/mate/file_sharing/bluetooth_enabled + mate-user-share + bool + false + + Share Public directory over Bluetooth + If this is true, the Public directory in the users home directory will be shared over Bluetooth when the user is logged in. + + + + /schemas/desktop/mate/file_sharing/bluetooth_allow_write + /desktop/mate/file_sharing/bluetooth_allow_write + mate-user-share + bool + false + + Whether to allow Bluetooth clients to write files. + Whether to allow Bluetooth clients to write files, or share the files read-only. + + + + /schemas/desktop/mate/file_sharing/bluetooth_require_pairing + /desktop/mate/file_sharing/bluetooth_require_pairing + mate-user-share + bool + true + + Whether Bluetooth clients need to pair with the computer to send files. + Whether Bluetooth clients need to pair with the computer to send files. + + + + /schemas/desktop/mate/file_sharing/bluetooth_obexpush_enabled + /desktop/mate/file_sharing/bluetooth_obexpush_enabled + mate-user-share + bool + false + + Whether Bluetooth clients can send files using ObexPush. + If this is true, Bluetooth devices can send files to the user's Downloads directory when logged in. + + + + /schemas/desktop/mate/file_sharing/bluetooth_accept_files + /desktop/mate/file_sharing/bluetooth_accept_files + mate-user-share + string + bonded + + When to accept files sent over Bluetooth + When to accept files sent over Bluetooth. Possible values are "always", "bonded" and "ask". + + + + /schemas/desktop/mate/file_sharing/bluetooth_notify + /desktop/mate/file_sharing/bluetooth_notify + mate-user-share + bool + false + + Whether to notify about newly received files. + Whether to notify about newly received files. + + + + + diff --git a/data/file-share-properties.ui b/data/file-share-properties.ui new file mode 100644 index 0000000..ad7f36c --- /dev/null +++ b/data/file-share-properties.ui @@ -0,0 +1,364 @@ + + + + + + 5 + Personal File Sharing Preferences + False + folder-remote + dialog + False + + + True + 2 + + + True + 5 + 18 + + + True + 6 + + + True + 0 + <b>Share Files over the Network</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + 3 + 2 + 12 + 6 + + + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + True + False + + + 1 + 2 + 2 + 3 + + + + + + _Share public files on network + True + True + False + True + True + + + 2 + GTK_FILL + + + + + + True + 0 + _Password: + True + password_entry + + + 2 + 3 + GTK_SHRINK | GTK_FILL + + + + + + True + _Require password: + True + password_combo + + + 1 + 2 + GTK_SHRINK | GTK_FILL + + + + + + + + 1 + + + + + False + 0 + + + + + True + 6 + + + True + 0 + <b>Share Files over Bluetooth</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + 6 + + + Share public files over _Bluetooth + True + True + False + True + True + + + False + False + 0 + + + + + Allo_w remote devices to delete files + True + True + False + True + True + + + False + False + 1 + + + + + Require re_mote devices to bond with this computer + True + True + False + True + True + + + False + False + 2 + + + + + + + 1 + + + + + False + 1 + + + + + True + 6 + + + True + 0 + <b>Receive Files over Bluetooth</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + 3 + 2 + 12 + 6 + + + Receive files in _Downloads folder over Bluetooth + True + True + False + True + True + + + 2 + + + + + + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + 0 + _Accept files: + True + accept_obexpush_combo + + + 1 + 2 + GTK_FILL + + + + + + _Notify about received files + True + True + False + True + True + + + 2 + 2 + 3 + GTK_FILL + + + + + + + + 1 + + + + + False + 2 + + + + + 1 + + + + + True + end + + + gtk-close + True + True + True + False + True + + + 0 + + + + + gtk-help + True + True + True + True + + + end + 1 + True + + + + + False + end + 0 + + + + + + close_button + help_button + + + diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am new file mode 100644 index 0000000..ab3bade --- /dev/null +++ b/data/icons/16x16/Makefile.am @@ -0,0 +1,6 @@ +icondir = $(datadir)/icons/hicolor/16x16/apps +icon_DATA = mate-obex-server.png + +EXTRA_DIST = $(icon_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/16x16/mate-obex-server.png b/data/icons/16x16/mate-obex-server.png new file mode 100644 index 0000000..530bd74 Binary files /dev/null and b/data/icons/16x16/mate-obex-server.png differ diff --git a/data/icons/16x16/mate-obex-server.svg b/data/icons/16x16/mate-obex-server.svg new file mode 100644 index 0000000..a079da3 --- /dev/null +++ b/data/icons/16x16/mate-obex-server.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am new file mode 100644 index 0000000..51e0c6d --- /dev/null +++ b/data/icons/22x22/Makefile.am @@ -0,0 +1,6 @@ +icondir = $(datadir)/icons/hicolor/22x22/apps +icon_DATA = mate-obex-server.png + +EXTRA_DIST = $(icon_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/22x22/mate-obex-server.png b/data/icons/22x22/mate-obex-server.png new file mode 100644 index 0000000..87dfc4c Binary files /dev/null and b/data/icons/22x22/mate-obex-server.png differ diff --git a/data/icons/22x22/mate-obex-server.svg b/data/icons/22x22/mate-obex-server.svg new file mode 100644 index 0000000..3564596 --- /dev/null +++ b/data/icons/22x22/mate-obex-server.svg @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am new file mode 100644 index 0000000..8f59d28 --- /dev/null +++ b/data/icons/32x32/Makefile.am @@ -0,0 +1,6 @@ +icondir = $(datadir)/icons/hicolor/32x32/apps +icon_DATA = mate-obex-server.png + +EXTRA_DIST = $(icon_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/32x32/mate-obex-server.png b/data/icons/32x32/mate-obex-server.png new file mode 100644 index 0000000..d96a3c3 Binary files /dev/null and b/data/icons/32x32/mate-obex-server.png differ diff --git a/data/icons/32x32/mate-obex-server.svg b/data/icons/32x32/mate-obex-server.svg new file mode 100644 index 0000000..97fe59e --- /dev/null +++ b/data/icons/32x32/mate-obex-server.svg @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am new file mode 100644 index 0000000..afeaae4 --- /dev/null +++ b/data/icons/48x48/Makefile.am @@ -0,0 +1,6 @@ +icondir = $(datadir)/icons/hicolor/48x48/apps +icon_DATA = mate-obex-server.png + +EXTRA_DIST = $(icon_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/48x48/mate-obex-server.png b/data/icons/48x48/mate-obex-server.png new file mode 100644 index 0000000..d297c0d Binary files /dev/null and b/data/icons/48x48/mate-obex-server.png differ diff --git a/data/icons/48x48/mate-obex-server.svg b/data/icons/48x48/mate-obex-server.svg new file mode 100644 index 0000000..3775ccd --- /dev/null +++ b/data/icons/48x48/mate-obex-server.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am new file mode 100644 index 0000000..26a633d --- /dev/null +++ b/data/icons/Makefile.am @@ -0,0 +1,17 @@ +SUBDIRS = 16x16 22x22 32x32 48x48 + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: update-icon-cache +uninstall-hook: update-icon-cache +update-icon-cache: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi + + +-include $(top_srcdir)/git.mk diff --git a/data/mate-user-share-properties.desktop.in b/data/mate-user-share-properties.desktop.in new file mode 100644 index 0000000..1b0bf74 --- /dev/null +++ b/data/mate-user-share-properties.desktop.in @@ -0,0 +1,14 @@ +[Desktop Entry] +_Name=Personal File Sharing +_Comment=Preferences for sharing of files +Exec=mate-file-share-properties +Icon=folder-remote +StartupNotify=true +Terminal=false +Type=Application +Categories=MATE;Settings;X-MATE-NetworkSettings; +OnlyShowIn=MATE; +X-MATE-Bugzilla-Bugzilla=MATE +X-MATE-Bugzilla-Product=mate-user-share +X-MATE-Bugzilla-Component=general + diff --git a/data/mate-user-share.desktop.in.in b/data/mate-user-share.desktop.in.in new file mode 100644 index 0000000..39fe98c --- /dev/null +++ b/data/mate-user-share.desktop.in.in @@ -0,0 +1,9 @@ +[Desktop Entry] +_Name=Personal File Sharing +_Comment=Launch Personal File Sharing if enabled +Icon=folder-remote +Exec=@installdir@/mate-user-share +Terminal=false +Type=Application +Categories= +OnlyShowIn=MATE; -- cgit v1.2.1