Contractor

Merge lp:~shnatsel/contractor/contract-file-fixes into lp:contractor/0.3

  1. contract-file-fixes
  2. Merge into trunk
Proposed by Sergey "Shnatsel" Davidoff
Status: Merged
Approved by: Michael Lazarski
Approved revision: 109
Merged at revision: 110
Proposed branch: lp:~shnatsel/contractor/contract-file-fixes
Merge into: lp:contractor/0.3
Diff against target: 37 lines (+6/-5)
3 files modified
data/archive-compress.contract (+1/-1)
data/archive.contract (+2/-2)
data/gnome-wallpaper.contract (+3/-2)
To merge this branch: bzr merge lp:~shnatsel/contractor/contract-file-fixes
Reviewer Review Type Date Requested Status
Michael Lazarski Approve
Review via email: mp+160428@code.launchpad.net

Description of the change

* Fix wallpaper contract to only accept local files, not do weird things like file://http://example.com/image.jpg
* Add OnlyShowIn= key for GNOME wallpaper contract and rename it accordingly
* Migrate to native gettext domain key, these are no .desktop files that have to be gettext-independent
* Add icon to archive-extract contract

To post a comment you must log in.
Revision history for this message
Michael Lazarski (michael.lazarski) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/archive-compress.contract'
2--- data/archive-compress.contract 2013-02-11 00:35:06 +0000
3+++ data/archive-compress.contract 2013-04-23 16:30:37 +0000
4@@ -4,4 +4,4 @@
5 Description=Compress
6 MimeType=!Archives
7 Exec=file-roller --add %U
8-X-GNOME-Gettext-Domain=contractor
9+Gettext-Domain=contractor
10
11=== modified file 'data/archive.contract'
12--- data/archive.contract 2013-02-02 21:07:13 +0000
13+++ data/archive.contract 2013-04-23 16:30:37 +0000
14@@ -1,7 +1,7 @@
15 [Contractor Entry]
16 Name=Archives
17-Icon=
18+Icon=extract-archive
19 Description=Extract here
20 MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;
21 Exec=file-roller --extract-here %U
22-X-GNOME-Gettext-Domain=contractor
23+Gettext-Domain=contractor
24
25=== renamed file 'data/wallpaper.contract' => 'data/gnome-wallpaper.contract'
26--- data/wallpaper.contract 2013-04-23 14:18:35 +0000
27+++ data/gnome-wallpaper.contract 2013-04-23 16:30:37 +0000
28@@ -3,5 +3,6 @@
29 Icon=wallpaper
30 Description=Set as Wallpaper
31 MimeType=image
32-Exec=gsettings set org.gnome.desktop.background picture-uri file://%u
33-X-GNOME-Gettext-Domain=contractor
34+Exec=gsettings set org.gnome.desktop.background picture-uri file://%f
35+Gettext-Domain=contractor
36+OnlyShowIn=GNOME;Unity;Pantheon;
37\ No newline at end of file

Subscribers

People subscribed via source and target branches