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
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-03-09 10:02:50 +0000
+++ CMakeLists.txt 2013-10-02 20:39:27 +0000
@@ -69,25 +69,14 @@
69 gio-2.069 gio-2.0
70 )70 )
7171
72vala_precompile(VALA_C_SAVE
73 src/savedialog.vala
74PACKAGES
75 gtk+-3.0
76 )
77
78
79add_subdirectory (po)72add_subdirectory (po)
8073
81add_executable(eidete ${VALA_C} src/keycapture.c)74add_executable(eidete ${VALA_C} src/keycapture.c)
82add_executable(videobin-uploader ${VALA_C_VIDEOBIN})75add_executable(videobin-uploader ${VALA_C_VIDEOBIN})
83add_executable(savedialog ${VALA_C_SAVE})
8476
85install(TARGETS videobin-uploader RUNTIME DESTINATION bin)77install(TARGETS videobin-uploader RUNTIME DESTINATION bin)
86install(TARGETS savedialog RUNTIME DESTINATION bin)
87install(TARGETS eidete RUNTIME DESTINATION bin)78install(TARGETS eidete RUNTIME DESTINATION bin)
88install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/eidete.desktop DESTINATION share/applications)79install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/eidete.desktop DESTINATION share/applications)
89install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/eidete.svg DESTINATION share/icons/hicolor/48x48/apps)80install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/eidete.svg DESTINATION share/icons/hicolor/48x48/apps)
90install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/videobin.svg DESTINATION share/icons/hicolor/48x48/apps)81install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/videobin.svg DESTINATION share/icons/hicolor/48x48/apps)
91install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/videobin.contract DESTINATION ${CMAKE_INSTALL_PREFIX}/share/contractor)82install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/videobin.contract DESTINATION ${CMAKE_INSTALL_PREFIX}/share/contractor)
92install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/savedialog.contract DESTINATION ${CMAKE_INSTALL_PREFIX}/share/contractor)
93
9483
=== removed file 'data/savedialog.contract'
--- data/savedialog.contract 2012-07-16 15:36:08 +0000
+++ data/savedialog.contract 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1[Contractor Entry]
2Name=Save
3Icon=document-save
4Description=Save as a file
5MimeType=!inode
6Exec=savedialog %u
70
=== removed file 'src/savedialog.vala'
--- src/savedialog.vala 2012-01-03 02:12:24 +0000
+++ src/savedialog.vala 1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
1using Gtk;
2
3public static void main (string [] args){
4 Gtk.init (ref args);
5
6 var source = File.new_for_uri (args[1]);
7
8 var file = new FileChooserDialog (_("Save"), null, FileChooserAction.SAVE, Stock.OK, ResponseType.OK);
9 file.set_current_name (source.get_basename ());
10 file.do_overwrite_confirmation = true;
11 var res = file.run ();
12 if (res == ResponseType.OK){
13 var destination = File.new_for_path (file.get_filename ());
14 try{
15 source.copy (destination, FileCopyFlags.OVERWRITE);
16 }catch (GLib.Error e){stderr.printf ("Error: %s\n", e.message);}
17
18 file.destroy ();
19 Gtk.main_quit ();
20 }else{
21 file.destroy ();
22 }
23
24 Gtk.main ();
25}
26

Subscribers

People subscribed via source and target branches