Merge lp:~elementary-os/contractor/gtfo.contract into lp:contractor/0.3

Proposed by Sergey "Shnatsel" Davidoff
Status: Merged
Approved by: Sergey "Shnatsel" Davidoff
Approved revision: 136
Merged at revision: 136
Proposed branch: lp:~elementary-os/contractor/gtfo.contract
Merge into: lp:contractor/0.3
Diff against target: 71 lines (+1/-36)
6 files modified
data/CMakeLists.txt (+1/-1)
data/contracts/CMakeLists.txt (+0/-7)
data/contracts/archive-compress.contract (+0/-7)
data/contracts/archive.contract (+0/-7)
data/contracts/gnome-bluetooth.contract (+0/-7)
data/contracts/gnome-wallpaper.contract (+0/-7)
To merge this branch: bzr merge lp:~elementary-os/contractor/gtfo.contract
Reviewer Review Type Date Requested Status
Victor Martinez (community) Approve
Review via email: mp+220891@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Victor Martinez (victored) wrote :

Well done.

review: Approve
Revision history for this message
Danielle Foré (danrabbit) wrote :

We should probably have branches of where these contracts are going to live before we just erase them completely. Though I am pro-not-living-in-lp-contractor ;)

Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote :

The .contract files for GNOME stuff have been moved to OS patch branches of file-roller and gnome-bluetooth. "Set as wallpaper" contract is moved to pantheon-photos deb-packaging branch since it requires shotwell for localization anyway. Proceeding.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2013-05-22 19:06:20 +0000
3+++ data/CMakeLists.txt 2014-05-25 22:35:46 +0000
4@@ -1,3 +1,3 @@
5 configure_file(org.elementary.contractor.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.elementary.contractor.service)
6 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.elementary.contractor.service DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/services)
7-add_subdirectory (contracts)
8\ No newline at end of file
9+
10
11=== removed directory 'data/contracts'
12=== removed file 'data/contracts/CMakeLists.txt'
13--- data/contracts/CMakeLists.txt 2013-05-22 19:06:20 +0000
14+++ data/contracts/CMakeLists.txt 1970-01-01 00:00:00 +0000
15@@ -1,7 +0,0 @@
16-install(FILES
17- archive.contract
18- gnome-wallpaper.contract
19- gnome-bluetooth.contract
20- archive-compress.contract
21-DESTINATION
22- ${CMAKE_INSTALL_PREFIX}/share/contractor)
23
24=== removed file 'data/contracts/archive-compress.contract'
25--- data/contracts/archive-compress.contract 2013-12-13 07:24:54 +0000
26+++ data/contracts/archive-compress.contract 1970-01-01 00:00:00 +0000
27@@ -1,7 +0,0 @@
28-[Contractor Entry]
29-Name=Compress...
30-Icon=add-files-to-archive
31-Description=Create a compressed archive with the selected objects
32-MimeType=!archive;inode/blockdevice;inode/chardevice;inode/fifo;inode/socket;
33-Exec=file-roller --add %U
34-Gettext-Domain=file-roller
35
36=== removed file 'data/contracts/archive.contract'
37--- data/contracts/archive.contract 2013-05-22 19:06:20 +0000
38+++ data/contracts/archive.contract 1970-01-01 00:00:00 +0000
39@@ -1,7 +0,0 @@
40-[Contractor Entry]
41-Name=Extract Here
42-Icon=extract-archive
43-Description=Extract the contents of the archives in the archive folder and quit the program
44-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;
45-Exec=file-roller --extract-here %U
46-Gettext-Domain=file-roller
47\ No newline at end of file
48
49=== removed file 'data/contracts/gnome-bluetooth.contract'
50--- data/contracts/gnome-bluetooth.contract 2013-05-22 19:06:20 +0000
51+++ data/contracts/gnome-bluetooth.contract 1970-01-01 00:00:00 +0000
52@@ -1,7 +0,0 @@
53-[Contractor Entry]
54-Name=Send files via Bluetooth
55-Icon=bluetooth
56-Description=Send files to device...
57-MimeType=!inode;
58-Exec=bluetooth-sendto %F
59-Gettext-Domain=gnome-bluetooth2
60
61=== removed file 'data/contracts/gnome-wallpaper.contract'
62--- data/contracts/gnome-wallpaper.contract 2013-05-22 19:06:20 +0000
63+++ data/contracts/gnome-wallpaper.contract 1970-01-01 00:00:00 +0000
64@@ -1,7 +0,0 @@
65-[Contractor Entry]
66-Name=Set as _Desktop Background
67-Icon=preferences-desktop-wallpaper
68-Description=Set selected image to be the new desktop background
69-MimeType=image
70-Exec=gsettings set org.gnome.desktop.background picture-uri file://%f
71-Gettext-Domain=shotwell

Subscribers

People subscribed via source and target branches