Merge lp:~elementary-os/eidete/remove-save-contract into lp:eidete

Proposed by Sergey "Shnatsel" Davidoff
Status: Merged
Approved by: Tom Beckmann
Approved revision: 145
Merged at revision: 163
Proposed branch: lp:~elementary-os/eidete/remove-save-contract
Merge into: lp:eidete
Diff against target: 71 lines (+0/-43)
3 files modified
CMakeLists.txt (+0/-11)
data/savedialog.contract (+0/-6)
src/savedialog.vala (+0/-26)
To merge this branch: bzr merge lp:~elementary-os/eidete/remove-save-contract
Reviewer Review Type Date Requested Status
Tom Beckmann (community) Approve
Review via email: mp+188925@code.launchpad.net

Commit message

Remove built-in 'save' contract, because it shows up in lots of places where it doesn't make any sense, e.g. right-click menu in Files, Noise, etc.

Description of the change

Remove built-in 'save' contract, because it shows up in lots of places where it doesn't make any sense, e.g. right-click menu in Files, Noise, etc.

Eidete currently does not lose anything from this because it doesn't support the Luna Contractor anyway and has a regular "save" button.

To post a comment you must log in.
Revision history for this message
Tom Beckmann (tombeckmann) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-03-09 10:02:50 +0000
3+++ CMakeLists.txt 2013-10-02 20:39:27 +0000
4@@ -69,25 +69,14 @@
5 gio-2.0
6 )
7
8-vala_precompile(VALA_C_SAVE
9- src/savedialog.vala
10-PACKAGES
11- gtk+-3.0
12- )
13-
14-
15 add_subdirectory (po)
16
17 add_executable(eidete ${VALA_C} src/keycapture.c)
18 add_executable(videobin-uploader ${VALA_C_VIDEOBIN})
19-add_executable(savedialog ${VALA_C_SAVE})
20
21 install(TARGETS videobin-uploader RUNTIME DESTINATION bin)
22-install(TARGETS savedialog RUNTIME DESTINATION bin)
23 install(TARGETS eidete RUNTIME DESTINATION bin)
24 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/eidete.desktop DESTINATION share/applications)
25 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/eidete.svg DESTINATION share/icons/hicolor/48x48/apps)
26 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/videobin.svg DESTINATION share/icons/hicolor/48x48/apps)
27 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/videobin.contract DESTINATION ${CMAKE_INSTALL_PREFIX}/share/contractor)
28-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/savedialog.contract DESTINATION ${CMAKE_INSTALL_PREFIX}/share/contractor)
29-
30
31=== removed file 'data/savedialog.contract'
32--- data/savedialog.contract 2012-07-16 15:36:08 +0000
33+++ data/savedialog.contract 1970-01-01 00:00:00 +0000
34@@ -1,6 +0,0 @@
35-[Contractor Entry]
36-Name=Save
37-Icon=document-save
38-Description=Save as a file
39-MimeType=!inode
40-Exec=savedialog %u
41
42=== removed file 'src/savedialog.vala'
43--- src/savedialog.vala 2012-01-03 02:12:24 +0000
44+++ src/savedialog.vala 1970-01-01 00:00:00 +0000
45@@ -1,26 +0,0 @@
46-using Gtk;
47-
48-public static void main (string [] args){
49- Gtk.init (ref args);
50-
51- var source = File.new_for_uri (args[1]);
52-
53- var file = new FileChooserDialog (_("Save"), null, FileChooserAction.SAVE, Stock.OK, ResponseType.OK);
54- file.set_current_name (source.get_basename ());
55- file.do_overwrite_confirmation = true;
56- var res = file.run ();
57- if (res == ResponseType.OK){
58- var destination = File.new_for_path (file.get_filename ());
59- try{
60- source.copy (destination, FileCopyFlags.OVERWRITE);
61- }catch (GLib.Error e){stderr.printf ("Error: %s\n", e.message);}
62-
63- file.destroy ();
64- Gtk.main_quit ();
65- }else{
66- file.destroy ();
67- }
68-
69- Gtk.main ();
70-}
71-

Subscribers

People subscribed via source and target branches