diff options
| author | raveit65 <[email protected]> | 2013-08-21 22:41:35 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2013-08-21 22:41:35 +0200 |
| commit | cf632626d056a8a221c0295c62aa5509d3484172 (patch) | |
| tree | 84de93603a8982d59b6aee076b62881cd36e99ff | |
| parent | 5f09ce6843a1d1a96db95a1d9fe487d4a2afb4d7 (diff) | |
| download | mate-user-share-cf632626d056a8a221c0295c62aa5509d3484172.tar.bz2 mate-user-share-cf632626d056a8a221c0295c62aa5509d3484172.tar.xz | |
Fix turning on sharing not starting mate-user-share
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | data/Makefile.am | 6 | ||||
| -rw-r--r-- | data/mate-user-share.desktop.in.in | 9 | ||||
| -rw-r--r-- | po/POTFILES.in | 4 | ||||
| -rw-r--r-- | po/POTFILES.skip | 4 |
5 files changed, 13 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 5450ed6..93c00a9 100644 --- a/configure.ac +++ b/configure.ac @@ -199,7 +199,9 @@ data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile -data/mate-user-share.desktop.in +data/mate-user-share-webdav.desktop.in +data/mate-user-share-obexftp.desktop.in +data/mate-user-share-obexpush.desktop.in po/Makefile.in src/Makefile man/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 85367cb..665cf93 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -7,7 +7,7 @@ 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 +autostart_in_files = mate-user-share-obexftp.desktop.in mate-user-share-obexpush.desktop.in mate-user-share-webdav.desktop.in appdir = $(datadir)/mate-user-share app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_user_2.4.conf dav_groupfile file-share-properties.ui @@ -21,7 +21,9 @@ convert_DATA = mate-user-share.convert EXTRA_DIST = $(gsettings_SCHEMAS) \ $(app_DATA) \ $(desktop_in_files) \ - mate-user-share.desktop.in.in \ + mate-user-share-obexftp.desktop.in.in \ + mate-user-share-obexpush.desktop.in.in \ + mate-user-share-webdav.desktop.in.in \ file-share-properties.ui CLEANFILES = $(desktop_DATA) $(autostart_DATA) diff --git a/data/mate-user-share.desktop.in.in b/data/mate-user-share.desktop.in.in deleted file mode 100644 index 39fe98c..0000000 --- a/data/mate-user-share.desktop.in.in +++ /dev/null @@ -1,9 +0,0 @@ -[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; diff --git a/po/POTFILES.in b/po/POTFILES.in index 32c02d6..fc6d9b6 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,7 +3,9 @@ data/desktop_mate_file_sharing.schemas.in [type: gettext/glade]data/file-share-properties.ui data/mate-user-share-properties.desktop.in -data/mate-user-share.desktop.in.in +data/mate-user-share-obexftp.desktop.in.in +data/mate-user-share-obexpush.desktop.in.in +data/mate-user-share-webdav.desktop.in.in src/caja-share-bar.c src/share-extension.c src/file-share-properties.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 3b9469f..a315670 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1,4 +1,6 @@ # List of source files that should NOT be translated. # Please keep this file sorted alphabetically. data/file-share-properties.ui -data/mate-user-share.desktop.in +data/mate-user-share-obexftp.desktop.in.in +data/mate-user-share-obexpush.desktop.in.in +data/mate-user-share-webdav.desktop.in.in |