Files

Merge lp:~mefrio-g/pantheon-files/fix-1005301 into lp:~elementary-apps/pantheon-files/trunk

  1. fix-1005301
  2. Merge into trunk
Proposed by Mario Guerriero
Status: Merged
Merged at revision: 831
Proposed branch: lp:~mefrio-g/pantheon-files/fix-1005301
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 39 lines (+5/-5)
3 files modified
data/CMakeLists.txt (+2/-2)
data/pantheon-files.desktop.in (+1/-1)
src/View/Window.vala (+2/-2)
To merge this branch: bzr merge lp:~mefrio-g/pantheon-files/fix-1005301
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+107634@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) :
review: Approve

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 2011-08-05 20:34:24 +0000
3+++ data/CMakeLists.txt 2012-05-28 14:34:24 +0000
4@@ -1,4 +1,4 @@
5-configure_file(marlin.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/marlin.desktop)
6+configure_file(pantheon-files.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files.desktop)
7 configure_file(marlin.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/marlin.service)
8-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/marlin.desktop DESTINATION share/applications)
9+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files.desktop DESTINATION share/applications)
10 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/marlin.service DESTINATION share/dbus-1/services/)
11
12=== renamed file 'data/marlin.desktop.in' => 'data/pantheon-files.desktop.in'
13--- data/marlin.desktop.in 2012-05-12 01:19:58 +0000
14+++ data/pantheon-files.desktop.in 2012-05-28 14:34:24 +0000
15@@ -122,6 +122,6 @@
16
17 [Root Shortcut Group]
18 Name=New Window as _Administrator
19-Exec=gksu marlin
20+Exec=gksu pantheon-files
21 TargetEnvironment=Unity
22
23
24=== modified file 'src/View/Window.vala'
25--- src/View/Window.vala 2012-05-27 19:40:34 +0000
26+++ src/View/Window.vala 2012-05-28 14:34:24 +0000
27@@ -532,10 +532,10 @@
28 private bool is_marlin_mydefault_fm ()
29 {
30 bool trash_uri_is_default = false;
31- bool foldertype_is_default = "marlin.desktop" == AppInfo.get_default_for_type("inode/directory", false).get_id();
32+ bool foldertype_is_default = "pantheon-files.desktop" == AppInfo.get_default_for_type("inode/directory", false).get_id();
33 AppInfo? app_trash_handler = AppInfo.get_default_for_type("x-scheme-handler/trash", true);
34 if (app_trash_handler != null)
35- trash_uri_is_default = "marlin.desktop" == app_trash_handler.get_id();
36+ trash_uri_is_default = "pantheon-files.desktop" == app_trash_handler.get_id();
37
38 return foldertype_is_default && trash_uri_is_default;
39 }

Subscribers

People subscribed via source and target branches

to all changes: