Merge lp:~philip.scott/pantheon-terminal/corrected-.desktop-name into lp:~elementary-apps/pantheon-terminal/trunk

[Felipe Escoto]

Changed .desktop name to it's app id

Corrected it's .desktop name to the app's App_ID.

This will later fix not being able to control Notifications from the switchboard plug.

This branch alone won't fix it. Gala and the notifications indicator still need work

[Danielle Foré (danrabbit)]

Why is this at net.launchpad.pantheon-terminal when the gsettings schema is at org.pantheon.terminal? Seems like these should match

[Felipe Escoto (philip.scott)]

I tried changing it to org.pantheon.terminal and dbus broke for it... net.launchpad.pantheon-terminal worked

[lp:~philip.scott/pantheon-terminal/corrected-.desktop-name]

843. By Felipe Escoto on 2016-07-09

No more net.launchpad

[Felipe Escoto (philip.scott)]

Alright, everything now is org.pantheon.terminal. Branch good for merging now

[Danielle Foré (danrabbit)]

works for me!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-01-12 19:58:53 +0000
+++ CMakeLists.txt	2016-07-09 21:00:16 +0000
@@ -104,7 +104,7 @@
 target_link_libraries (pantheon-terminal ${M_LIB})
 
 install (TARGETS pantheon-terminal RUNTIME DESTINATION bin)
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-terminal.desktop DESTINATION share/applications)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/org.pantheon.terminal.desktop DESTINATION share/applications)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-terminal.appdata.xml DESTINATION share/appdata)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/open-pantheon-terminal-here.desktop DESTINATION share/applications)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/enable-zsh-completion-notifications DESTINATION share/pantheon-terminal)

=== modified file 'data/enable-fish-completion-notifications'
--- data/enable-fish-completion-notifications	2015-08-19 12:23:24 +0000
+++ data/enable-fish-completion-notifications	2016-07-09 21:00:16 +0000
@@ -9,7 +9,7 @@
 
 function pantheon-terminal-process-completion-callback --on-event fish_postexec --description "Notify Pantheon Terminal about task completion"
     if status --is-interactive; and set --query PANTHEON_TERMINAL_ID
-        dbus-send --type=method_call --session --dest=net.launchpad.pantheon-terminal /net/launchpad/pantheon_terminal org.pantheon.terminal.ProcessFinished string:$PANTHEON_TERMINAL_ID string:"$argv[1]";
+        dbus-send --type=method_call --session --dest=org.pantheon.terminal /org/pantheon/terminal org.pantheon.terminal.ProcessFinished string:$PANTHEON_TERMINAL_ID string:"$argv[1]";
     end
 end
 

=== modified file 'data/enable-zsh-completion-notifications'
--- data/enable-zsh-completion-notifications	2015-08-19 12:23:24 +0000
+++ data/enable-zsh-completion-notifications	2016-07-09 21:00:16 +0000
@@ -14,8 +14,8 @@
         dbus-send \
             --type=method_call \
             --session \
-            --dest=net.launchpad.pantheon-terminal \
-            /net/launchpad/pantheon_terminal \
+            --dest=org.pantheon.terminal \
+            /org/pantheon/terminal \
             org.pantheon.terminal.ProcessFinished \
             string:$PANTHEON_TERMINAL_ID \
             string:"$(fc -ln -1)"
@@ -37,8 +37,8 @@
     dbus-send \
         --type=method_call \
         --session \
-        --dest=net.launchpad.pantheon-terminal \
-        /net/launchpad/pantheon_terminal \
+        --dest=org.pantheon.terminal \
+        /org/pantheon/terminal \
         org.pantheon.terminal.ProcessFinished \
         string:$PANTHEON_TERMINAL_ID \
         string:"You should not have seen this, please report the incident to Pantheon Terminal developers."

=== renamed file 'data/pantheon-terminal.desktop' => 'data/org.pantheon.terminal.desktop'
=== modified file 'src/PantheonTerminal.vala'
--- src/PantheonTerminal.vala	2016-01-16 04:15:52 +0000
+++ src/PantheonTerminal.vala	2016-07-09 21:00:16 +0000
@@ -47,8 +47,8 @@
             exec_name = "pantheon-terminal";
             app_years = "2011-2015";
             app_icon = "utilities-terminal";
-            app_launcher = "pantheon-terminal.desktop";
-            application_id = "net.launchpad.pantheon-terminal";
+            app_launcher = "org.pantheon.terminal.desktop";
+            application_id = "org.pantheon.terminal";
             main_url = "https://launchpad.net/pantheon-terminal";
             bug_url = "https://bugs.launchpad.net/pantheon-terminal";
             help_url = "https://elementary.io/help/terminal";
@@ -105,7 +105,7 @@
             base.dbus_register (connection, object_path);
 
             var dbus = new DBus ();
-            connection.register_object ("/net/launchpad/pantheon_terminal", dbus);
+            connection.register_object ("/org/pantheon/terminal", dbus);
 
             dbus.finished_process.connect ((id, process) => {
                 foreach (var window in windows) {

=== modified file 'src/TerminalWidget.vala'
--- src/TerminalWidget.vala	2016-06-03 17:58:14 +0000
+++ src/TerminalWidget.vala	2016-07-09 21:00:16 +0000
@@ -56,7 +56,7 @@
         public int default_size;
         public double zoom_factor = 1.0;
 
-        const string SEND_PROCESS_FINISHED_BASH = "dbus-send --type=method_call --session --dest=net.launchpad.pantheon-terminal /net/launchpad/pantheon_terminal org.pantheon.terminal.ProcessFinished string:$PANTHEON_TERMINAL_ID string:\"$(history 1 | cut -c 8-)\" >/dev/null 2>&1; ";
+        const string SEND_PROCESS_FINISHED_BASH = "dbus-send --type=method_call --session --dest=org.pantheon.terminal /org/pantheon/terminal org.pantheon.terminal.ProcessFinished string:$PANTHEON_TERMINAL_ID string:\"$(history 1 | cut -c 8-)\" >/dev/null 2>&1; ";
 
         /* Following strings are used to build RegEx for matching URIs */
         const string USERCHARS = "-[:alnum:]";