Forked gnome-user-share. Work in progress.

21 files changed, 1263 insertions, 0 deletions

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}
+<Directory "${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
+
+
+  <IfDefine RequirePasswordAlways>
+    Require user guest
+  </IfDefine>
+
+  <IfDefine RequirePasswordOnWrite>
+    <LimitExcept GET OPTIONS PROPFIND>
+      Require user guest
+    </LimitExcept>
+  </IfDefine>
+</Directory>
+
+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
+
+<VirtualHost *>
+  DocumentRoot ${XDG_PUBLICSHARE_DIR}
+
+  <Location />
+    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
+
+    <IfDefine RequirePasswordAlways>
+      Require user guest
+      Require group guest
+    </IfDefine>
+
+    <IfDefine RequirePasswordOnWrite>
+      <LimitExcept GET OPTIONS PROPFIND>
+        Require user guest
+        Require group guest
+      </LimitExcept>
+    </IfDefine>
+
+    DNSSDServiceName "${GUS_SHARE_NAME}"
+    DNSSDServiceTypes _webdav._tcp
+    DNSSDServiceTxtRecord u=guest
+  </Location>
+</VirtualHost>
+
+StartServers 1
+MaxClients 3
+
+<IfModule mpm_prefork_module>
+  MinSpareServers 1
+  MaxSpareServers 1
+</IfModule>
+
+<IfModule mpm_worker_module>
+  MinSpareThreads 1
+  MaxSpareThreads 1
+  ThreadsPerChild 3
+</IfModule>
+
+<IfModule mpm_event_module>
+  MinSpareThreads 1
+  MaxSpareThreads 1
+  ThreadsPerChild 3
+</IfModule>
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 @@
+<?xml version="1.0"?>
+<gconfschemafile>
+  <schemalist>
+    <schema>
+      <key>/schemas/desktop/mate/file_sharing/enabled</key>
+      <applyto>/desktop/mate/file_sharing/enabled</applyto>
+      <owner>mate-user-share</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Share Public directory over the network</short>
+        <long>If this is true, the Public directory in the users home directory will be shared over the network when the user is logged in.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/mate/file_sharing/require_password</key>
+      <applyto>/desktop/mate/file_sharing/require_password</applyto>
+      <owner>mate-user-share</owner>
+      <type>string</type>
+      <default>never</default>
+      <locale name="C">
+        <short>When to require passwords</short>
+	<long>When to ask for passwords. Possible values are "never", "on_write", and "always".</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/mate/file_sharing/bluetooth_enabled</key>
+      <applyto>/desktop/mate/file_sharing/bluetooth_enabled</applyto>
+      <owner>mate-user-share</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Share Public directory over Bluetooth</short>
+        <long>If this is true, the Public directory in the users home directory will be shared over Bluetooth when the user is logged in.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/mate/file_sharing/bluetooth_allow_write</key>
+      <applyto>/desktop/mate/file_sharing/bluetooth_allow_write</applyto>
+      <owner>mate-user-share</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Whether to allow Bluetooth clients to write files.</short>
+        <long>Whether to allow Bluetooth clients to write files, or share the files read-only.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/mate/file_sharing/bluetooth_require_pairing</key>
+      <applyto>/desktop/mate/file_sharing/bluetooth_require_pairing</applyto>
+      <owner>mate-user-share</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Whether Bluetooth clients need to pair with the computer to send files.</short>
+        <long>Whether Bluetooth clients need to pair with the computer to send files.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/mate/file_sharing/bluetooth_obexpush_enabled</key>
+      <applyto>/desktop/mate/file_sharing/bluetooth_obexpush_enabled</applyto>
+      <owner>mate-user-share</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Whether Bluetooth clients can send files using ObexPush.</short>
+        <long>If this is true, Bluetooth devices can send files to the user's Downloads directory when logged in.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/mate/file_sharing/bluetooth_accept_files</key>
+      <applyto>/desktop/mate/file_sharing/bluetooth_accept_files</applyto>
+      <owner>mate-user-share</owner>
+      <type>string</type>
+      <default>bonded</default>
+      <locale name="C">
+        <short>When to accept files sent over Bluetooth</short>
+	<long>When to accept files sent over Bluetooth. Possible values are "always", "bonded" and "ask".</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/mate/file_sharing/bluetooth_notify</key>
+      <applyto>/desktop/mate/file_sharing/bluetooth_notify</applyto>
+      <owner>mate-user-share</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Whether to notify about newly received files.</short>
+        <long>Whether to notify about newly received files.</long>
+      </locale>
+    </schema>
+  </schemalist>
+</gconfschemafile>
+
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 @@
+<?xml version="1.0"?>
+<interface>
+  <requires lib="gtk+" version="2.14"/>
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkDialog" id="user_share_dialog">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Personal File Sharing Preferences</property>
+    <property name="resizable">False</property>
+    <property name="icon_name">folder-remote</property>
+    <property name="type_hint">dialog</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkVBox" id="vbox2">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="spacing">18</property>
+            <child>
+              <object class="GtkVBox" id="vbox3">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label6">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Share Files over the Network&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkAlignment" id="alignment2">
+                    <property name="visible">True</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkTable" id="table2">
+                        <property name="visible">True</property>
+                        <property name="n_rows">3</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
+                        <child>
+                          <object class="GtkComboBox" id="password_combo">
+                            <property name="visible">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="password_entry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="visibility">False</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="enable_check">
+                            <property name="label" translatable="yes">_Share public files on network</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="right_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label5">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Password:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">password_entry</property>
+                          </object>
+                          <packing>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label4">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">_Require password:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">password_combo</property>
+                          </object>
+                          <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox4">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label7">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Share Files over Bluetooth&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkAlignment" id="alignment3">
+                    <property name="visible">True</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkVBox" id="vbox1">
+                        <property name="visible">True</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkCheckButton" id="enable_bluetooth_check">
+                            <property name="label" translatable="yes">Share public files over _Bluetooth</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="allow_write_bluetooth_check">
+                            <property name="label" translatable="yes">Allo_w remote devices to delete files</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="require_pairing_check">
+                            <property name="label" translatable="yes">Require re_mote devices to bond with this computer</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox5">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label8">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Receive Files over Bluetooth&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkAlignment" id="alignment4">
+                    <property name="visible">True</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkTable" id="table3">
+                        <property name="visible">True</property>
+                        <property name="n_rows">3</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
+                        <child>
+                          <object class="GtkCheckButton" id="enable_obexpush_check">
+                            <property name="label" translatable="yes">Receive files in _Downloads folder over Bluetooth</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="right_attach">2</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkComboBox" id="accept_obexpush_combo">
+                            <property name="visible">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label9">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Accept files: </property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">accept_obexpush_combo</property>
+                          </object>
+                          <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="notify_received_obexpush_check">
+                            <property name="label" translatable="yes">_Notify about received files</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="close_button">
+                <property name="label">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="help_button">
+                <property name="label">gtk-help</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="pack_type">end</property>
+                <property name="position">1</property>
+                <property name="secondary">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-7">close_button</action-widget>
+      <action-widget response="0">help_button</action-widget>
+    </action-widgets>
+  </object>
+</interface>
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
--- /dev/null
+++ b/data/icons/16x16/mate-obex-server.png
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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg4908"
+   sodipodi:version="0.32"
+   inkscape:version="0.45+devel"
+   version="1.0"
+   sodipodi:docname="gnome-obex-server.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/andreas/project/application icons/16x16/gnome-obex-server.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4910">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5671">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop5673" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop5675" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5671"
+       id="linearGradient5677"
+       x1="10.915961"
+       y1="14.618162"
+       x2="10.915961"
+       y2="17.804298"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.817014,0,0,0.7715344,-0.9874811,-0.2616832)" />
+    <filter
+       inkscape:collect="always"
+       id="filter5761"
+       x="-0.077635549"
+       width="1.1552711"
+       y="-0.41717416"
+       height="1.8343483">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.45085227"
+         id="feGaussianBlur5763" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="6.2469959"
+     inkscape:cy="10.785095"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     width="16px"
+     height="16px"
+     inkscape:window-width="1680"
+     inkscape:window-height="948"
+     inkscape:window-x="0"
+     inkscape:window-y="51">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5068" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4913">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:url(#linearGradient5677);fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 3.5361624,15.575215 L 8.0061974,7.5481055 L 12.479657,15.581363 L 3.5361624,15.575215 z"
+       id="path5070" />
+    <path
+       style="opacity:0.18055558;fill:none;fill-rule:evenodd;stroke:#eeeeec;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 5.2563684,14.556116 L 7.9617908,9.5516601 L 10.64818,14.559949 L 5.2563684,14.556116 z"
+       id="path5665"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="opacity:0.19444442;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 19.364029,5.0685124 C 19.364029,5.0685124 21.238628,3.1466987 24.099857,3.1405722 C 26.985751,3.1343929 28.934348,5.142664 28.934348,5.142664"
+       id="path5667"
+       sodipodi:nodetypes="czc" />
+    <path
+       style="opacity:0.18981479;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 21.287959,7.7379681 C 21.287959,7.7379681 22.219094,6.3597453 24.149189,6.3785231 C 26.05462,6.397061 26.862422,7.7379681 26.862422,7.7379681"
+       id="path5669"
+       sodipodi:nodetypes="czc" />
+    <path
+       style="opacity:1;fill:#5886bd;fill-opacity:1;stroke:#193a6b;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 7.9843748,0.5 C 3.8478795,0.50000002 0.49999999,3.8528187 0.49999999,8 C 0.49999999,9.8391013 1.136016,11.540198 2.2295824,12.84375 L 3.9591648,10.15625 C 3.6171141,9.5186062 3.4245666,8.8051787 3.4245666,8.03125 C 3.4245666,5.5307441 5.4489373,3.5 7.9529279,3.5 C 10.456919,3.4999999 12.481289,5.5307438 12.481289,8.03125 C 12.481289,8.7555782 12.280321,9.4236996 11.978138,10.03125 L 13.739167,12.78125 C 14.806464,11.485196 15.46875,9.8143917 15.46875,8 C 15.46875,3.8528189 12.120869,0.5 7.9843748,0.5 z"
+       id="path5801" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.32407407"
+       d="M 2.46875,11.34375 C 1.4166667,10.1875 1.3958333,8.875 1.46875,7.1875 C 1.46875,7.1875 2.3657907,1.53125 8.03125,1.53125 C 13.759201,1.53125 14.5,7.09375 14.5,7.09375 C 14.5625,8.7604167 14.3125,10.239583 13.5625,11.3125"
+       id="path5816"
+       sodipodi:nodetypes="cczcc" />
+  </g>
+</svg>
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
--- /dev/null
+++ b/data/icons/22x22/mate-obex-server.png
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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg4908"
+   sodipodi:version="0.32"
+   inkscape:version="0.45+devel"
+   version="1.0"
+   sodipodi:docname="gnome-obex-server.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/andreas/project/application icons/22x22/gnome-obex-server.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4910">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5671">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop5673" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop5675" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5671"
+       id="linearGradient5677"
+       x1="10.915961"
+       y1="14.618162"
+       x2="10.915961"
+       y2="17.804298"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter5761"
+       x="-0.077635548"
+       width="1.1552711"
+       y="-0.41717415"
+       height="1.8343483">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.45085227"
+         id="feGaussianBlur5763" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="16.885608"
+     inkscape:cy="10.548677"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     width="22px"
+     height="22px"
+     inkscape:window-width="1680"
+     inkscape:window-height="948"
+     inkscape:window-x="0"
+     inkscape:window-y="51">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5068" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4913">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="opacity:0.24074074;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5761)"
+       id="rect5679"
+       width="13.9375"
+       height="2.59375"
+       x="4.03125"
+       y="18.96875"
+       rx="0.93768394"
+       ry="1.0517266"
+       transform="matrix(1,0,0,0.8915663,0,2.3381024)" />
+    <path
+       style="opacity:1;fill:#8aafd7;fill-opacity:1;stroke:#193a6b;stroke-width:0.99999987999999995;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 11 4.53125 C 7.9806577 4.53125 5.5312502 6.9995834 5.53125 10.03125 C 5.53125 11.547083 6.1352302 12.910208 7.125 13.90625 L 8.1875 12.03125 C 7.7804347 11.469355 7.53125 10.804529 7.53125 10.0625 C 7.5312502 8.1646277 9.0964062 6.625 11.03125 6.625 C 12.966094 6.6250002 14.5625 8.1646277 14.5625 10.0625 C 14.5625 10.774202 14.351401 11.420104 13.96875 11.96875 L 15 13.78125 C 15.915059 12.797398 16.46875 11.481302 16.46875 10.03125 C 16.46875 6.9995838 14.019343 4.5312501 11 4.53125 z "
+       id="path5654" />
+    <path
+       style="opacity:1;fill:#82aad5;fill-opacity:1;stroke:#1d437b;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 10.96875 0.46875 C 5.7434389 0.46875 1.53125 4.7121889 1.53125 9.9375 C 1.53125 12.933829 2.9268598 15.60811 5.09375 17.34375 L 6.09375 15.59375 C 4.512494 14.223454 3.5 12.235262 3.5 10 C 3.5 5.8838358 6.8847157 2.5625 11.0625 2.5625 C 15.240284 2.5625 18.625 5.8838354 18.625 10 C 18.625001 12.194721 17.656675 14.163154 16.125 15.53125 L 17.0625 17.1875 C 19.128107 15.449882 20.4375 12.844895 20.4375 9.9375 C 20.4375 4.7121889 16.194061 0.46874999 10.96875 0.46875 z "
+       id="path5072" />
+    <path
+       style="fill:url(#linearGradient5677);fill-rule:evenodd;stroke:#204a87;stroke-width:0.99999994000000003px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 5.5368005,20.526497 L 11.007986,10.122412 L 16.483364,20.534467 L 5.5368005,20.526497 z"
+       id="path5070" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#eeeeec;stroke-width:0.99999994000000003px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.18055556"
+       d="M 7.1618005,19.497759 L 11.007986,12.372412 L 14.827114,19.503217 L 7.1618005,19.497759 z"
+       id="path5665"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;opacity:0.19444444"
+       d="M 5.03125,3.9375 C 5.03125,3.9375 7.4062499,1.5077456 11.03125,1.4999999 C 14.6875,1.4921874 17.15625,4.03125 17.15625,4.03125"
+       id="path5667"
+       sodipodi:nodetypes="czc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;opacity:0.18981481"
+       d="M 7.46875,7.3125 C 7.46875,7.3125 8.6484404,5.5700091 11.09375,5.59375 C 13.507813,5.6171875 14.53125,7.3125 14.53125,7.3125"
+       id="path5669"
+       sodipodi:nodetypes="czc" />
+  </g>
+</svg>
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
--- /dev/null
+++ b/data/icons/32x32/mate-obex-server.png
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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg4908"
+   sodipodi:version="0.32"
+   inkscape:version="0.45+devel"
+   version="1.0"
+   sodipodi:docname="gnome-obex-server.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/andreas/project/application icons/32x32/gnome-obex-server.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4910">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5671">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop5673" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop5675" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5671"
+       id="linearGradient5677"
+       x1="10.915961"
+       y1="14.010388"
+       x2="10.915961"
+       y2="18.908218"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5571915,0,0,1.388736,-1.1436972,1.0476737)" />
+    <filter
+       inkscape:collect="always"
+       id="filter5761"
+       x="-0.077635549"
+       width="1.1552711"
+       y="-0.41717416"
+       height="1.8343483">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.45085227"
+         id="feGaussianBlur5763" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="19.269619"
+     inkscape:cy="15.886843"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     width="32px"
+     height="32px"
+     inkscape:window-width="1680"
+     inkscape:window-height="948"
+     inkscape:window-x="0"
+     inkscape:window-y="51">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5068" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4913">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="opacity:0.24074073;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5761)"
+       id="rect5679"
+       width="13.9375"
+       height="2.59375"
+       x="4.03125"
+       y="18.96875"
+       rx="0.66293061"
+       ry="0.74445522"
+       transform="matrix(1.4144526,0,0,1.2595572,0.4278694,4.1077744)" />
+    <path
+       style="opacity:0.19444442;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 7.544334,6.367318 C 7.544334,6.367318 10.903659,2.9346907 16.03105,2.923748 C 21.202642,2.9127109 24.694572,6.499763 24.694572,6.499763"
+       id="path5667"
+       sodipodi:nodetypes="czc" />
+    <path
+       style="opacity:0.18981479;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 10.992062,11.135338 C 10.992062,11.135338 12.660678,8.6736397 16.119453,8.7071795 C 19.534031,8.7402908 20.981634,11.135338 20.981634,11.135338"
+       id="path5669"
+       sodipodi:nodetypes="czc" />
+    <path
+       style="opacity:1;fill:#5886bd;fill-opacity:1;stroke:#204a87;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 16 1.5 C 8.5350733 1.5 2.46875 7.5663245 2.46875 15.03125 C 2.46875 19.277634 4.4332486 23.080432 7.5 25.5625 L 8.59375 23.8125 C 6.1177395 21.697291 4.5625 18.540934 4.5625 15.03125 C 4.5625001 8.6641071 9.7388038 3.5 16.09375 3.5 C 22.448696 3.5 27.59375 8.6641071 27.59375 15.03125 C 27.59375 18.556827 26.018124 21.728338 23.53125 23.84375 L 24.5625 25.5 C 27.590107 23.017072 29.531251 19.246059 29.53125 15.03125 C 29.53125 7.5663241 23.464927 1.5 16 1.5 z "
+       id="path5064" />
+    <path
+       style="opacity:1;fill:#5886bd;fill-opacity:1;stroke:#204a87;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 16.03125 6.5 C 11.310781 6.5 7.5 10.303927 7.5 15 C 7.5 17.435445 8.5422697 19.60686 10.1875 21.15625 L 11.28125 19.40625 C 10.206455 18.251079 9.5625 16.704332 9.5625 15 C 9.5624997 11.426105 12.445158 8.5 16.03125 8.5 C 19.617342 8.5 22.53125 11.426105 22.53125 15 C 22.53125 16.737378 21.838457 18.306877 20.71875 19.46875 L 21.84375 21.21875 C 23.531083 19.666581 24.59375 17.463979 24.59375 15 C 24.59375 10.303927 20.751718 6.5000001 16.03125 6.5 z "
+       id="path5655" />
+    <path
+       style="opacity:1;fill:#5886bd;fill-opacity:1;stroke:#204a87;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 16 11.5 C 14.07278 11.5 12.5 13.079635 12.5 15.03125 C 12.5 16.982865 14.07278 18.593749 16 18.59375 C 17.92722 18.59375 19.5 16.982865 19.5 15.03125 C 19.5 13.079635 17.92722 11.5 16 11.5 z M 16.03125 13.5 C 16.860688 13.5 17.53125 14.170564 17.53125 15 C 17.53125 15.829436 16.860687 16.53125 16.03125 16.53125 C 15.201814 16.531249 14.53125 15.829436 14.53125 15 C 14.53125 14.170564 15.201813 13.5 16.03125 13.5 z "
+       id="path5659" />
+    <path
+       style="fill:url(#linearGradient5677);fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:0.99999987999999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 7.4781612,29.553558 L 15.997845,15.105031 L 24.524055,29.564626 L 7.4781612,29.553558 z"
+       id="path5070" />
+    <path
+       style="opacity:0.18055558;fill:none;fill-rule:evenodd;stroke:#eeeeec;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 9.3078964,28.505338 L 16.018236,17.22121 L 22.681368,28.513981 L 9.3078964,28.505338 z"
+       id="path5665"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;opacity:0.32407407"
+       d="M 7.2036503,6.1022141 C 7.2036503,6.1022141 10.848917,2.4782918 16.042485,2.4782918 C 21.280241,2.4782918 24.837126,6.1022141 24.837126,6.1022141"
+       id="path5689"
+       sodipodi:nodetypes="czc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;opacity:0.32407407"
+       d="M 11.081475,9.339651 C 11.081475,9.339651 13.00182,7.4834956 15.89864,7.4834956 C 18.751286,7.4834956 20.715805,9.1628743 20.715805,9.1628743"
+       id="path5691"
+       sodipodi:nodetypes="czc" />
+  </g>
+</svg>
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
--- /dev/null
+++ b/data/icons/48x48/mate-obex-server.png
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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg4908"
+   sodipodi:version="0.32"
+   inkscape:version="0.45+devel"
+   version="1.0"
+   sodipodi:docname="gnome-obex-server.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/andreas/project/application icons/48x48/gnome-obex-server.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4910">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5671">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop5673" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop5675" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5671"
+       id="linearGradient5677"
+       x1="10.915961"
+       y1="14.010388"
+       x2="10.915961"
+       y2="18.908218"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.3340955,0,0,2.0797356,-1.8209963,2.8226078)" />
+    <filter
+       inkscape:collect="always"
+       id="filter5761"
+       x="-0.077635549"
+       width="1.1552711"
+       y="-0.41717416"
+       height="1.8343483">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.45085227"
+         id="feGaussianBlur5763" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="27.236135"
+     inkscape:cy="18.964041"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     width="48px"
+     height="48px"
+     inkscape:window-width="1680"
+     inkscape:window-height="948"
+     inkscape:window-x="0"
+     inkscape:window-y="51">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5068" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4913">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="opacity:0.24074073;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5761)"
+       id="rect5679"
+       width="13.9375"
+       height="2.59375"
+       x="4.03125"
+       y="18.96875"
+       rx="0.4498865"
+       ry="0.63501096"
+       transform="matrix(2.0842678,0,0,1.4766422,0.6792651,15.488168)" />
+    <path
+       style="opacity:0.19444442;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 11.201612,10.789171 C 11.201612,10.789171 16.23695,5.6485564 23.922466,5.6321688 C 31.674235,5.61564 36.908337,10.987518 36.908337,10.987518"
+       id="path5667"
+       sodipodi:nodetypes="czc" />
+    <path
+       style="opacity:0.18981479;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 16.369458,17.929637 C 16.369458,17.929637 18.870569,14.24306 24.054974,14.293288 C 29.173132,14.342875 31.342964,17.929637 31.342964,17.929637"
+       id="path5669"
+       sodipodi:nodetypes="czc" />
+    <path
+       style="opacity:1;fill:#5886bd;fill-opacity:1;stroke:#204a87;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 24.063425,18.475748 C 21.071443,18.475748 18.629727,20.910956 18.629727,23.919619 C 18.629727,26.928283 21.071443,29.411666 24.063425,29.411667 C 27.055404,29.411667 29.497123,26.928283 29.497123,23.919619 C 29.497123,20.910956 27.055404,18.475748 24.063425,18.475748 z M 24.111941,21.559001 C 25.39963,21.559001 26.440667,22.592762 26.440667,23.871444 C 26.440667,25.150125 25.399628,26.23206 24.111941,26.23206 C 22.824252,26.232058 21.783212,25.150125 21.783212,23.871444 C 21.783212,22.592762 22.82425,21.559001 24.111941,21.559001 z"
+       id="path5659" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.33333333;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.88196582000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5685"
+       sodipodi:cx="23.968752"
+       sodipodi:cy="24.156248"
+       sodipodi:rx="3.9687502"
+       sodipodi:ry="3.9687502"
+       d="M 27.937502,24.156248 A 3.9687502,3.9687502 0 1 1 20.000002,24.156248 A 3.9687502,3.9687502 0 1 1 27.937502,24.156248 z"
+       transform="matrix(1.1259842,0,0,1.1417322,-2.9571854,-3.4862202)" />
+    <path
+       style="fill:url(#linearGradient5677);fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 11.102425,45.512293 L 23.872694,23.874548 L 36.652747,45.528868 L 11.102425,45.512293 z"
+       id="path5070" />
+    <path
+       style="opacity:0.18055558;fill:none;fill-rule:evenodd;stroke:#eeeeec;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 12.907539,44.503764 L 23.875207,25.981184 L 34.765717,44.51795 L 12.907539,44.503764 z"
+       id="path5665"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="opacity:0.32407406;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 10.690956,10.392159 C 10.690956,10.392159 16.154896,4.965065 23.939606,4.965065 C 31.79055,4.965065 37.122013,10.392159 37.122013,10.392159"
+       id="path5689"
+       sodipodi:nodetypes="czc" />
+    <path
+       style="opacity:0.32407406;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 16.503481,15.240462 C 16.503481,15.240462 19.381912,12.460731 23.723995,12.460731 C 27.999865,12.460731 30.944509,14.975725 30.944509,14.975725"
+       id="path5691"
+       sodipodi:nodetypes="czc" />
+    <path
+       style="opacity:1;fill:#6694c7;fill-opacity:1;stroke:#204a87;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 24 3.5625 C 12.683999 3.5625 3.5 12.732501 3.5 24.03125 C 3.5 30.555462 6.5771446 36.344721 11.34375 40.09375 L 12.96875 37.53125 C 9.0539883 34.332748 6.5625 29.445753 6.5625 24 C 6.5624999 14.374501 14.3745 6.5625 24 6.5625 C 33.6255 6.5625002 41.4375 14.3745 41.4375 24 C 41.4375 29.430049 38.95783 34.301145 35.0625 37.5 L 36.6875 40.0625 C 41.434373 36.312581 44.5 30.539706 44.5 24.03125 C 44.5 12.7325 35.316001 3.5625 24 3.5625 z "
+       id="path5067" />
+    <path
+       style="opacity:1;fill:#729fcf;fill-opacity:1;stroke:#204a87;stroke-width:0.99999987999999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 24.03125 11.5 C 17.114 11.5 11.5 17.114001 11.5 24.03125 C 11.5 27.714001 13.092947 31.019097 15.625 33.3125 L 17.28125 30.65625 C 15.593863 28.947748 14.5625 26.612039 14.5625 24.03125 C 14.5625 18.804501 18.8325 14.5625 24.09375 14.5625 C 29.355001 14.5625 33.625 18.804501 33.625 24.03125 C 33.625001 26.660145 32.555745 29.033799 30.8125 30.75 L 32.4375 33.3125 C 34.969554 31.019097 36.562501 27.714001 36.5625 24.03125 C 36.5625 17.114 30.9485 11.5 24.03125 11.5 z "
+       id="path5648" />
+    <path
+       style="opacity:0.33333333;fill:none;fill-opacity:1;stroke:#eeeeec;stroke-width:1.00000011999999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 36.875,38.500446 C 40.946766,34.939899 43.4375,30.173923 43.4375,24.047266 C 43.4375,13.326175 34.715501,4.6249996 23.96875,4.6249998 C 13.222,4.6249998 4.5,13.326175 4.5,24.047266 C 4.5,30.205192 7.0141711,34.878371 11.1875,38.499998"
+       id="path5664"
+       sodipodi:nodetypes="cscsc" />
+    <path
+       style="opacity:0.33333333;fill:none;fill-opacity:1;stroke:#eeeeec;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 32.65625,31.71875 C 34.554756,29.554337 35.499999,27.387589 35.5,24.09375 C 35.5,17.7285 30.348,12.5625 24,12.5625 C 17.652,12.5625 12.5,17.7285 12.5,24.09375 C 12.5,27.403477 13.707783,29.646402 15.625,31.75"
+       id="path5677"
+       sodipodi:nodetypes="cscsc" />
+  </g>
+</svg>
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;