Merge lp:~jeremywootten/pantheon-files/fix-1593926-desktop-file-name into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

* Make app ID and .desktop a resource constant
* rename dbus service as org.pantheon-files.db
* rename app ID and .desktop as org.pantheon.files

The desktop filename is changed to org.pantheon.files.desktop and this is made a Resource constant in the code instead of being hard coded in several places. The application id "org.pantheon.files" is also made a Resource constant.

The dbus service name used by the ctags plug in is also changed to org.pantheon.files.db for consistency.

The appdata file renamed to org.pantheon.files.appdata.xml.

A number of other consequential changes were made.

To test the branch needs to be installed, the old files removed or renamed and the session restarted. Files will need to be reset as the default file manager.

[Cody Garver (codygarver)]

Conflicts with trunk

[lp:~jeremywootten/pantheon-files/fix-1593926-desktop-file-name]

2203. By Jeremy Wootten on 2016-06-25

Merge trunk to r2210 and resolve conflict

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2015-12-12 18:50:54 +0000
+++ data/CMakeLists.txt	2016-06-25 12:23:12 +0000
@@ -1,9 +1,9 @@
-configure_file(pantheon-files.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files.desktop)
+configure_file(pantheon-files.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.files.desktop)
 configure_file(pantheon-files.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files.service)
 configure_file(pantheon-files-pkexec.cmake ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files-pkexec)
 configure_file(net.launchpad.pantheon-files.policy.cmake ${CMAKE_CURRENT_BINARY_DIR}/net.launchpad.pantheon-files.policy)
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/pantheon-files.appdata.xml DESTINATION share/appdata)
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files.desktop DESTINATION share/applications)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.pantheon.files.appdata.xml DESTINATION share/appdata)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.files.desktop DESTINATION share/applications)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files.service DESTINATION share/dbus-1/services/)
 install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files-pkexec DESTINATION bin)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/net.launchpad.pantheon-files.policy DESTINATION share/polkit-1/actions/)
 
=== renamed file 'data/pantheon-files.appdata.xml' => 'data/org.pantheon.files.appdata.xml'
=== modified file 'data/pantheon-files.service.cmake'
--- data/pantheon-files.service.cmake	2014-08-05 20:46:06 +0000
+++ data/pantheon-files.service.cmake	2016-06-25 12:23:12 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.elementary.pantheonfiles.db
+Name=org.pantheon.files.db
 Exec=@CMAKE_INSTALL_PREFIX@/bin/pantheon-files-daemon
 
=== modified file 'libwidgets/Resources.vala'
--- libwidgets/Resources.vala	2016-05-06 10:36:16 +0000
+++ libwidgets/Resources.vala	2016-06-25 12:23:12 +0000
@@ -17,6 +17,8 @@
 ***/
 
 namespace Marlin {
+    public const string APP_ID = "org.pantheon.files";
+    public const string APP_DESKTOP = APP_ID + ".desktop";
     public const string APP_TITLE = "Files";
     public const string COPYRIGHT = APP_YEARS + " elementary LLC (http://launchpad.net/elementary)";
     public const string APP_YEARS = "2013-2016";
 
=== modified file 'pantheon-files-daemon/client.vala'
--- pantheon-files-daemon/client.vala	2014-08-05 20:46:06 +0000
+++ pantheon-files-daemon/client.vala	2016-06-25 12:23:12 +0000
@@ -1,4 +1,4 @@
-[DBus (name = "org.elementary.pantheonfiles.db")]
+[DBus (name = "org.pantheon.files.db")]
 interface Demo : Object {
     public abstract bool   	showTable	(string table) 	throws IOError;
     public abstract int 	getColor 	(string uri) 	throws IOError;
@@ -9,8 +9,8 @@
 
 void main () {
     try {
-        Demo demo = Bus.get_proxy_sync (BusType.SESSION, "org.elementary.pantheonfiles.db",
-                                        "/org/elementary/pantheonfiles/db");
+        Demo demo = Bus.get_proxy_sync (BusType.SESSION, "org.pantheon.files.db",
+                                        "/org/pantheon/files/db");
         
 		demo.showTable ("tags");
 
 
=== modified file 'pantheon-files-daemon/marlind-tagging.vala'
--- pantheon-files-daemon/marlind-tagging.vala	2016-05-06 10:36:16 +0000
+++ pantheon-files-daemon/marlind-tagging.vala	2016-06-25 12:23:12 +0000
@@ -33,7 +33,7 @@
 
 */
 
-[DBus (name = "org.elementary.pantheonfiles.db")]
+[DBus (name = "org.pantheon.files.db")]
 public class MarlinTags : Object {
 
     protected static Sqlite.Database db;
@@ -355,7 +355,7 @@
 
 void on_bus_aquired (DBusConnection conn) {
     try {
-        conn.register_object ("/org/elementary/pantheonfiles/db", new MarlinTags ());
+        conn.register_object ("/org/pantheon/files/db", new MarlinTags ());
     } catch (IOError e) {
         error ("Could not register service");
     }
@@ -370,7 +370,7 @@
 }
 
 void main () {
-    Bus.own_name (BusType.SESSION, "org.elementary.pantheonfiles.db", BusNameOwnerFlags.NONE,
+    Bus.own_name (BusType.SESSION, "org.pantheon.files.db", BusNameOwnerFlags.NONE,
                   on_bus_aquired,
                   () => {},
                   on_bus_lost);
 
=== modified file 'pantheon-files-daemon/miner.vala'
--- pantheon-files-daemon/miner.vala	2014-08-05 20:46:06 +0000
+++ pantheon-files-daemon/miner.vala	2016-06-25 12:23:12 +0000
@@ -1,4 +1,4 @@
-[DBus (name = "org.elementary.pantheonfiles.db")]
+[DBus (name = "org.pantheon.files.db")]
 interface Tags : Object {
     public abstract bool   	showTable	(string table) 	throws IOError;
     public abstract bool 	record_uris	(Variant[] entries, string directory) 	throws IOError;
@@ -23,8 +23,8 @@
         cancellable = new Cancellable ();
 
         try {
-            tags = Bus.get_proxy_sync (BusType.SESSION, "org.elementary.pantheonfiles.db",
-                                       "/org/elementary/pantheonfiles/db");
+            tags = Bus.get_proxy_sync (BusType.SESSION, "org.pantheon.files.db",
+                                       "/org/pantheon/files/db");
         } catch (IOError e) {
             stderr.printf ("%s\n", e.message);
         }
 
=== modified file 'plugins/pantheon-files-ctags/plugin.vala'
--- plugins/pantheon-files-ctags/plugin.vala	2016-06-05 10:53:33 +0000
+++ plugins/pantheon-files-ctags/plugin.vala	2016-06-25 12:23:12 +0000
@@ -15,7 +15,7 @@
     with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-[DBus (name = "org.elementary.pantheonfiles.db")]
+[DBus (name = "org.pantheon.files.db")]
 interface MarlinDaemon : Object {
     public abstract async Variant get_uri_infos (string raw_uri) throws IOError;
     public abstract async bool record_uris (Variant[] entries, string directory)    throws IOError;
@@ -40,8 +40,8 @@
         cancellable = new Cancellable ();
 
         try {
-            daemon = Bus.get_proxy_sync (BusType.SESSION, "org.elementary.pantheonfiles.db",
-                                         "/org/elementary/pantheonfiles/db");
+            daemon = Bus.get_proxy_sync (BusType.SESSION, "org.pantheon.files.db",
+                                         "/org/pantheon/files/db");
         } catch (IOError e) {
             stderr.printf ("%s\n", e.message);
         }
 
=== modified file 'src/Application.vala'
--- src/Application.vala	2016-05-10 23:20:00 +0000
+++ src/Application.vala	2016-06-25 12:23:12 +0000
@@ -40,7 +40,7 @@
 
     construct {
         /* Needed by Glib.Application */
-        this.application_id = "org.pantheon.files";  //Ensures an unique instance.
+        this.application_id = Marlin.APP_ID;  //Ensures an unique instance.
         this.flags = ApplicationFlags.HANDLES_COMMAND_LINE;
 
         /* Needed by Granite.Application */
 
=== modified file 'src/QuicklistHandler.vala'
--- src/QuicklistHandler.vala	2016-05-06 10:36:16 +0000
+++ src/QuicklistHandler.vala	2016-06-25 12:23:12 +0000
@@ -30,7 +30,7 @@
         public List<Marlin.LauncherEntry> launcher_entries = null;
 
         private QuicklistHandler () {
-            this.entry_add ("pantheon-files.desktop");
+            this.entry_add (Marlin.APP_DESKTOP);
 
             if (this.launcher_entries.length () == 0) {
                 error ("Couldn't find a valid Unity launcher entry.");
 
=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2016-06-17 14:06:01 +0000
+++ src/View/Window.vala	2016-06-25 12:23:12 +0000
@@ -800,19 +800,19 @@
         }
 
         private bool is_marlin_mydefault_fm () {
-            bool foldertype_is_default = ("pantheon-files.desktop" == AppInfo.get_default_for_type("inode/directory", false).get_id());
+            bool foldertype_is_default = (Marlin.APP_DESKTOP == AppInfo.get_default_for_type("inode/directory", false).get_id());
 
             bool trash_uri_is_default = false;
             AppInfo? app_trash_handler = AppInfo.get_default_for_type("x-scheme-handler/trash", true);
             if (app_trash_handler != null)
-                trash_uri_is_default = ("pantheon-files.desktop" == app_trash_handler.get_id());
+                trash_uri_is_default = (Marlin.APP_DESKTOP == app_trash_handler.get_id());
 
             return foldertype_is_default && trash_uri_is_default;
         }
 
         private void make_marlin_default_fm (bool active) {
             if (active) {
-                AppInfo marlin_app = (AppInfo) new DesktopAppInfo ("pantheon-files.desktop");
+                AppInfo marlin_app = (AppInfo) new DesktopAppInfo (Marlin.APP_DESKTOP);
 
                 if (marlin_app != null) {
                     try {
 
=== modified file 'src/ZeitgeistManager.vala'
--- src/ZeitgeistManager.vala	2016-05-06 10:36:16 +0000
+++ src/ZeitgeistManager.vala	2016-06-25 12:23:12 +0000
@@ -17,7 +17,7 @@
 ***/
 namespace Marlin {
     public class ZeitgeistManager : Object {
-        const string FILES_ACTOR = "application://pantheon-files.desktop";
+        const string FILES_ACTOR = "application://" + Marlin.APP_DESKTOP;
         const string ATTRS = FileAttribute.STANDARD_DISPLAY_NAME + "," + FileAttribute.STANDARD_CONTENT_TYPE;
 
         public static void report_event (string uri, string interpretation) {