Merge lp:~hyuchia/noise/fix-1594598 into lp:~elementary-apps/noise/trunk

[Diego Islas Ocampo]

Removed all references to org.pantheon and replaced them with the io.elementary scheme.

[lp:~hyuchia/noise/fix-1594598]

2049. By Diego Islas Ocampo on 2017-03-01

Remove translation conflicts

2050. By Diego Islas Ocampo on 2017-03-01

Merge with latest trunk

2051. By Diego Islas Ocampo on 2017-03-02

Use right scheme for paths

[Danielle Foré (danrabbit)]

Hey Diego, This branch has a lot of changes in it that aren't related to changing the app ID. Can you open a new PR on GitHub with only those changes? https://github.com/elementary/music

Unmerged revisions

2051. By Diego Islas Ocampo on 2017-03-02

Use right scheme for paths

2050. By Diego Islas Ocampo on 2017-03-01

Merge with latest trunk

2049. By Diego Islas Ocampo on 2017-03-01

Remove translation conflicts

2048. By Diego Islas Ocampo on 2017-02-25

Use the right reversed elementary Scheme

2047. By Diego Islas Ocampo on 2017-02-25

Remove unused variable

=== modified file 'core/Settings.vala'
--- core/Settings.vala	2016-12-31 17:15:12 +0000
+++ core/Settings.vala	2017-03-02 02:52:40 +0000
@@ -52,7 +52,7 @@
         }
 
         private SavedState () {
-            base ("org.pantheon.noise.saved-state");
+            base ("io.elementary.noise.saved-state");
         }
     }
 
@@ -89,7 +89,7 @@
         }
 
         private Main ()  {
-            base ("org.pantheon.noise.settings");
+            base ("io.elementary.noise.settings");
             if (music_folder == "") {
                 music_folder = GLib.Environment.get_user_special_dir (GLib.UserDirectory.MUSIC);
             }
@@ -113,7 +113,7 @@
         }
 
         private Equalizer () {
-            base ("org.pantheon.noise.equalizer");
+            base ("io.elementary.noise.equalizer");
         }
 
         public Gee.Collection<Noise.EqualizerPreset> getPresets () {

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-07-15 17:21:12 +0000
+++ data/CMakeLists.txt	2017-03-02 02:52:40 +0000
@@ -2,16 +2,16 @@
 
 # We need to create two temporary desktop files in order to have all translations available.
 set (APP_NAME "Music")
-configure_file(org.pantheon.noise.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.noise.desktop.in)
+configure_file(io.elementary.noise.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.noise.desktop.in)
 set (APP_NAME "Noise")
-configure_file(org.pantheon.noise.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/noise-original.desktop.in)
+configure_file(io.elementary.noise.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/noise-original.desktop.in)
 if (BUILD_FOR_ELEMENTARY)
-    configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.noise.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.noise.desktop ${CMAKE_SOURCE_DIR}/po/)
+    configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/io.elementary.noise.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.noise.desktop ${CMAKE_SOURCE_DIR}/po/)
 else ()
-    configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/noise-original.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.noise.desktop ${CMAKE_SOURCE_DIR}/po/)
+    configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/noise-original.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.noise.desktop ${CMAKE_SOURCE_DIR}/po/)
 endif ()
 
-configure_file_translation(${CMAKE_CURRENT_SOURCE_DIR}/org.pantheon.noise.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.noise.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
+configure_file_translation(${CMAKE_CURRENT_SOURCE_DIR}/io.elementary.noise.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.noise.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
 
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.noise.appdata.xml DESTINATION share/metainfo)
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.noise.desktop DESTINATION share/applications)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.noise.appdata.xml DESTINATION share/metainfo)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.noise.desktop DESTINATION share/applications)

=== added file 'data/io.elementary.noise.appdata.xml.in'
--- data/io.elementary.noise.appdata.xml.in	1970-01-01 00:00:00 +0000
+++ data/io.elementary.noise.appdata.xml.in	2017-03-02 02:52:40 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2015 elementary, LLC <[e-mail]> -->
+<component type="desktop">
+  <id>io.elementary.noise.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_group>elementary</project_group>
+  <project_license>GPL-3.0+</project_license>
+  <_name>Music</_name>
+  <_summary>The official elementary music player</_summary>
+  <description>
+    <_p>
+      Music is a fast and beautiful audio player with a focus on
+      music and libraries. It handles external devices, CDs, and
+      album art.
+    </_p>
+  </description>
+  <releases>
+    <release timestamp="1480592595" version="0.4.0.2"/>
+    <release timestamp="1427915704" version="0.3.1"/>
+    <release timestamp="1401003480" version="0.3.0"/>
+    <release timestamp="1376719060" version="0.2.4"/>
+    <release timestamp="1374379743" version="0.2.3"/>
+    <release timestamp="1372369509" version="0.2.2"/>
+    <release timestamp="1370825702" version="0.2.1"/>
+    <release timestamp="1355236601" version="0.2.0"/>
+    <release timestamp="1320168563" version="0.1.0"/>
+  </releases>
+  <provides>
+    <binary>noise</binary>
+    <library>libnoise-core.so.0</library>
+  </provides>
+  <developer_name>elementary LLC.</developer_name>
+  <url type="homepage">http://elementary.io/</url>
+  <url type="bugtracker">https://bugs.launchpad.net/noise</url>
+  <url type="donation">https://elementary.io/get-involved#funding</url>
+  <url type="help">https://elementaryos.stackexchange.com/questions/tagged/noise</url>
+  <update_contact>contact_at_elementary.io</update_contact>
+</component>

=== added file 'data/io.elementary.noise.desktop.in.in'
--- data/io.elementary.noise.desktop.in.in	1970-01-01 00:00:00 +0000
+++ data/io.elementary.noise.desktop.in.in	2017-03-02 02:52:40 +0000
@@ -0,0 +1,19 @@
+[Desktop Entry]
+Type=Application
+_Name=@APP_NAME@
+_GenericName=Music Player
+_Comment=Listen to music
+Exec=noise %U
+Icon=multimedia-audio-player
+Terminal=false
+Categories=Audio;Music;Player;AudioVideo;GNOME;GTK;
+MimeType=x-content/audio-player;x-content/audio-cdda;application/ogg;application/x-extension-m4a;application/x-extension-mp4;application/x-flac;application/x-ogg;audio/3gpp;audio/aac;audio/ac3;audio/AMR;audio/AMR-WB;audio/basic;audio/flac;audio/midi;audio/mp2;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-ape;audio/x-flac;audio/x-gsm;audio/x-it;audio/x-m4a;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;audio/x-musepack;audio/x-opus+ogg;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-pn-wav;audio/x-pn-windows-acm;audio/x-realaudio;audio/x-real-audio;audio/x-sbc;audio/x-scpls;audio/x-speex;audio/x-tta;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;audio/x-xm;
+StartupNotify=true
+_Keywords=Noise;Audio;Player;MP3;iPod;Play;Playlist;Media;CD;Phone;Songs;
+X-GNOME-UsesNotifications=true
+X-PulseAudio-Properties=media.role=music
+Actions=AboutDialog;
+
+[Desktop Action AboutDialog]
+Exec=noise --about
+_Name=About @APP_NAME@

=== removed file 'data/org.pantheon.noise.appdata.xml.in'
--- data/org.pantheon.noise.appdata.xml.in	2016-12-01 11:45:45 +0000
+++ data/org.pantheon.noise.appdata.xml.in	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2015 elementary, LLC <[e-mail]> -->
-<component type="desktop">
-  <id>org.pantheon.noise.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_group>elementary</project_group>
-  <project_license>GPL-3.0+</project_license>
-  <_name>Music</_name>
-  <_summary>The official elementary music player</_summary>
-  <description>
-    <_p>
-      Music is a fast and beautiful audio player with a focus on
-      music and libraries. It handles external devices, CDs, and
-      album art.
-    </_p>
-  </description>
-  <releases>
-    <release timestamp="1480592595" version="0.4.0.2"/>
-    <release timestamp="1427915704" version="0.3.1"/>
-    <release timestamp="1401003480" version="0.3.0"/>
-    <release timestamp="1376719060" version="0.2.4"/>
-    <release timestamp="1374379743" version="0.2.3"/>
-    <release timestamp="1372369509" version="0.2.2"/>
-    <release timestamp="1370825702" version="0.2.1"/>
-    <release timestamp="1355236601" version="0.2.0"/>
-    <release timestamp="1320168563" version="0.1.0"/>
-  </releases>
-  <provides>
-    <binary>noise</binary>
-    <library>libnoise-core.so.0</library>
-  </provides>
-  <developer_name>elementary LLC.</developer_name>
-  <url type="homepage">http://elementary.io/</url>
-  <url type="bugtracker">https://bugs.launchpad.net/noise</url>
-  <url type="donation">https://elementary.io/get-involved#funding</url>
-  <url type="help">https://elementaryos.stackexchange.com/questions/tagged/noise</url>
-  <update_contact>contact_at_elementary.io</update_contact>
-</component>

=== removed file 'data/org.pantheon.noise.desktop.in.in'
--- data/org.pantheon.noise.desktop.in.in	2016-08-10 13:20:46 +0000
+++ data/org.pantheon.noise.desktop.in.in	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Type=Application
-_Name=@APP_NAME@
-_GenericName=Music Player
-_Comment=Listen to music
-Exec=noise %U
-Icon=multimedia-audio-player
-Terminal=false
-Categories=Audio;Music;Player;AudioVideo;GNOME;GTK;
-MimeType=x-content/audio-player;x-content/audio-cdda;application/ogg;application/x-extension-m4a;application/x-extension-mp4;application/x-flac;application/x-ogg;audio/3gpp;audio/aac;audio/ac3;audio/AMR;audio/AMR-WB;audio/basic;audio/flac;audio/midi;audio/mp2;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-ape;audio/x-flac;audio/x-gsm;audio/x-it;audio/x-m4a;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;audio/x-musepack;audio/x-opus+ogg;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-pn-wav;audio/x-pn-windows-acm;audio/x-realaudio;audio/x-real-audio;audio/x-sbc;audio/x-scpls;audio/x-speex;audio/x-tta;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;audio/x-xm;
-StartupNotify=true
-_Keywords=Noise;Audio;Player;MP3;iPod;Play;Playlist;Media;CD;Phone;Songs;
-X-GNOME-UsesNotifications=true
-X-PulseAudio-Properties=media.role=music
-Actions=AboutDialog;
-
-[Desktop Action AboutDialog]
-Exec=noise --about
-_Name=About @APP_NAME@

=== modified file 'plugins/LastFM/noise-lastfm.application'
--- plugins/LastFM/noise-lastfm.application	2016-07-15 17:21:12 +0000
+++ plugins/LastFM/noise-lastfm.application	2017-03-02 02:52:40 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <application id="noise-lastfm">
   <description>Music</description>
-  <desktop-entry>org.pantheon.noise.desktop</desktop-entry>
+  <desktop-entry>io.elementary.noise.desktop</desktop-entry>
   <translations>noise</translations>
   <services>
     <service id="lastfm-scrobble">

=== modified file 'plugins/MPRIS/MPRIS.vala'
--- plugins/MPRIS/MPRIS.vala	2016-12-31 17:15:12 +0000
+++ plugins/MPRIS/MPRIS.vala	2017-03-02 02:52:40 +0000
@@ -29,10 +29,10 @@
     public MprisRoot root = null;
     // Uncomment this when the bug on the playlist selection is fixed
     //public MprisPlaylists playlists = null;
-    
+
     private unowned DBusConnection conn;
     private uint owner_id;
-    
+
     public void initialize () {
         owner_id = Bus.own_name(BusType.SESSION,
                                 "org.mpris.MediaPlayer2.Noise",
@@ -49,7 +49,7 @@
             soundMenu.initialize ();
         }
     }
-    
+
     private void on_bus_acquired (DBusConnection connection, string name) {
         this.conn = connection;
         debug ("bus acquired");
@@ -68,7 +68,7 @@
 
     private void on_name_acquired(DBusConnection connection, string name) {
         debug ("name acquired");
-    }    
+    }
 
     private void on_name_lost(DBusConnection connection, string name) {
         debug ("name_lost");
@@ -78,42 +78,42 @@
 [DBus(name = "org.mpris.MediaPlayer2")]
 public class MprisRoot : GLib.Object {
 
-    public bool CanQuit { 
-        get {
-            return true;
-        } 
-    }
-
-    public bool CanRaise { 
-        get {
-            return true;
-        } 
-    }
-    
+    public bool CanQuit {
+        get {
+            return true;
+        }
+    }
+
+    public bool CanRaise {
+        get {
+            return true;
+        }
+    }
+
     public bool HasTrackList {
         get {
             return false;
         }
     }
-    public string DesktopEntry { 
+    public string DesktopEntry {
         owned get {
-            return "org.pantheon.noise";
-        } 
+            return "io.elementary.noise";
+        }
     }
-    
+
     public string Identity {
         owned get {
             return ((Noise.App) GLib.Application.get_default ()).get_name ();
         }
     }
-    
+
     public string[] SupportedUriSchemes {
         owned get {
             string[] sa = {"http", "file", "https", "ftp"};
             return sa;
         }
     }
-    
+
     public string[] SupportedMimeTypes {
         owned get {
             return Noise.MEDIA_CONTENT_TYPES;
@@ -123,7 +123,7 @@
     public void Quit () {
         Noise.App.main_window.destroy ();
     }
-    
+
     public void Raise () {
         Noise.App.main_window.present ();
     }
@@ -145,7 +145,7 @@
         PREVIOUS,
         STOP
     }
-    
+
     public MprisPlayer(DBusConnection conn) {
         this.conn = conn;
         _metadata = new HashTable<string,Variant>(str_hash, str_equal);
@@ -172,7 +172,7 @@
     private void playing_changed() {
         trigger_metadata_update ();
     }
-    
+
     private void trigger_metadata_update() {
         if(update_metadata_source != 0)
             Source.remove(update_metadata_source);
@@ -180,7 +180,7 @@
         update_metadata_source = Timeout.add(300, () => {
             //print("trigger_metadata_update %s\n", global.current_artist);
             Variant variant = this.PlaybackStatus;
-            
+
             queue_property_for_notification("PlaybackStatus", variant);
             queue_property_for_notification("Metadata", _metadata);
             update_metadata_source = 0;
@@ -236,32 +236,32 @@
     }
 
     private ObjectPath get_track_id (Noise.Media m) {
-        return new ObjectPath ("/org/pantheon/noise/Track/%lld".printf (m.rowid));
+        return new ObjectPath ("/io/elementary/noise/Track/%lld".printf (m.rowid));
     }
 
     private bool send_property_change() {
-        
+
         if(changed_properties == null)
             return false;
-        
+
         var builder             = new VariantBuilder(VariantType.ARRAY);
         var invalidated_builder = new VariantBuilder(new VariantType("as"));
-        
+
         foreach(string name in changed_properties.get_keys()) {
             Variant variant = changed_properties.lookup(name);
             builder.add("{sv}", name, variant);
         }
-        
+
         changed_properties = null;
-        
+
         try {
             conn.emit_signal (null,
-                              "/org/mpris/MediaPlayer2", 
-                              "org.freedesktop.DBus.Properties", 
-                              "PropertiesChanged", 
-                              new Variant("(sa{sv}as)", 
-                                         INTERFACE_NAME, 
-                                         builder, 
+                              "/org/mpris/MediaPlayer2",
+                              "org.freedesktop.DBus.Properties",
+                              "PropertiesChanged",
+                              new Variant("(sa{sv}as)",
+                                         INTERFACE_NAME,
+                                         builder,
                                          invalidated_builder)
                              );
         }
@@ -271,20 +271,20 @@
         send_property_source = 0;
         return false;
     }
-    
+
     private void queue_property_for_notification(string property, Variant val) {
         // putting the properties into a hashtable works as akind of event compression
-        
+
         if(changed_properties == null)
             changed_properties = new HashTable<string,Variant>(str_hash, str_equal);
-        
+
         changed_properties.insert(property, val);
-        
+
         if(send_property_source == 0) {
             send_property_source = Idle.add(send_property_change);
         }
     }
-    
+
     public string PlaybackStatus {
         owned get { //TODO signal org.freedesktop.DBus.Properties.PropertiesChanged
             if(Noise.App.player.playing)
@@ -297,7 +297,7 @@
                 return "Stopped";
         }
     }
-    
+
     public string LoopStatus {
         owned get {
             switch(Noise.Settings.Main.get_default ().repeat_mode) {
@@ -310,7 +310,7 @@
                 case(Noise.Settings.Repeat.ALL):
                     return "Playlist";
             }
-            
+
             return "Playlist";
         }
         set {
@@ -328,12 +328,12 @@
                     Noise.App.player.set_repeat_mode (Noise.Settings.Repeat.ALL);
                     break;
             }
-            
+
             Variant variant = value;
             queue_property_for_notification("LoopStatus", variant);
         }
     }
-    
+
     public double Rate {
         get {
             return (double)1.0;
@@ -341,7 +341,7 @@
         set {
         }
     }
-    
+
     public bool Shuffle {
         get {
             if (Noise.Settings.Main.get_default ().shuffle_mode == Noise.Settings.Shuffle.ALL)
@@ -355,19 +355,19 @@
             else {
                 Noise.App.player.set_shuffle_mode (Noise.Settings.Shuffle.OFF);
             }
-            
+
             Variant variant = value;
             queue_property_for_notification ("Shuffle", variant);
         }
     }
-    
+
     public HashTable<string,Variant>? Metadata { //a{sv}
         owned get {
             update_metadata (Noise.App.player.current_media);
             return _metadata;
         }
     }
-    
+
     public double Volume {
         get{
             return Noise.App.player.volume;
@@ -376,13 +376,13 @@
             Noise.App.player.volume = value;
         }
     }
-    
+
     public int64 Position {
         get {
             return (Noise.App.player.player.get_position()/(int64)Noise.TimeUtils.MILI_INV);
         }
     }
-    
+
     /*public double MinimumRate {
         get {
             return (double)1.0;
@@ -400,49 +400,49 @@
             return true;
         }
     }
-    
+
     public bool CanGoPrevious {
         get {
             return true;
         }
     }
-    
+
     public bool CanPlay {
         get {
             return true;
         }
     }
-    
+
     public bool CanPause {
         get {
             return true;
         }
     }
-    
+
     public bool CanSeek {
         get {
             return true;
         }
     }
-    
+
     public bool CanControl {
         get {
             return true;
         }
     }
-    
+
     public signal void Seeked(int64 Position);
 
     public void Next() {
         // inhibit notifications
         Noise.App.main_window.play_next_media(true);
     }
-    
+
     public void Previous() {
         // inhibit notifications
         Noise.App.main_window.play_previous_media(true);
     }
-    
+
     public void Pause() {
         // inhibit notifications
         if(Noise.App.player.playing)
@@ -458,7 +458,7 @@
         if(Noise.App.player.playing)
             Noise.App.player.stop_playback();
     }
-    
+
     public void Play() {
         // inhibit notifications
         if(!Noise.App.player.playing)
@@ -477,16 +477,16 @@
             Next ();
         }
     }
-    
+
     public void SetPosition(string dobj, int64 Position) {
         Noise.App.player.player.set_position(Position * (int64)Noise.TimeUtils.MILI_INV);
     }
-    
+
     public void OpenUri(string Uri) {
-        
+
     }
 }
-    
+
 [DBus(name = "org.mpris.MediaPlayer2.Playlists")]
 public class MprisPlaylists : GLib.Object {
     public struct MprisPlaylist {
@@ -503,7 +503,7 @@
     private unowned DBusConnection conn;
     private MaybePlaylist active_playlist;
     private const string INTERFACE_NAME = "org.mpris.MediaPlayer2.Playlists";
-    const string PLAYLIST_ID = "/org/pantheon/noise/Playlists/%d";
+    const string PLAYLIST_ID = "/io/elementary/noise/Playlists/%d";
 
     private uint send_property_source = 0;
     private HashTable<string,Variant> changed_properties = null;
@@ -556,12 +556,12 @@
 
         try {
             conn.emit_signal(null,
-                             "/org/mpris/MediaPlayer2", 
-                             "org.freedesktop.DBus.Properties", 
-                             "PropertiesChanged", 
-                             new Variant("(sa{sv}as)", 
-                                         INTERFACE_NAME, 
-                                         builder, 
+                             "/org/mpris/MediaPlayer2",
+                             "org.freedesktop.DBus.Properties",
+                             "PropertiesChanged",
+                             new Variant("(sa{sv}as)",
+                                         INTERFACE_NAME,
+                                         builder,
                                          invalidated_builder)
                              );
             message("Sent properties changed signal\n");
@@ -575,7 +575,7 @@
     }
 
     public void ActivatePlaylist(ObjectPath path) {
-        string playlist_id = path.replace ("/org/pantheon/noise/Playlists/", "");
+        string playlist_id = path.replace ("/io/elementary/noise/Playlists/", "");
 
         Noise.Playlist p = Noise.libraries_manager.local_library.playlist_from_id (int.parse (playlist_id));
         if(p == null) {

=== modified file 'schemas/CMakeLists.txt'
--- schemas/CMakeLists.txt	2013-09-16 06:58:34 +0000
+++ schemas/CMakeLists.txt	2017-03-02 02:52:40 +0000
@@ -1,2 +1,2 @@
 include (GSettings)
-add_schema ("org.pantheon.noise.gschema.xml")
+add_schema ("io.elementary.noise.gschema.xml")

=== added file 'schemas/io.elementary.noise.gschema.xml'
--- schemas/io.elementary.noise.gschema.xml	1970-01-01 00:00:00 +0000
+++ schemas/io.elementary.noise.gschema.xml	2017-03-02 02:52:40 +0000
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <enum id="io.elementary.noise.repeat">
+    <value value="0" nick="off"/>
+    <value value="1" nick="media"/>
+    <value value="2" nick="album"/>
+    <value value="3" nick="artist"/>
+    <value value="4" nick="all"/>
+  </enum>
+  <enum id="io.elementary.noise.shuffle">
+    <value value="0" nick="off"/>
+    <value value="1" nick="all"/>
+  </enum>
+  <enum id="io.elementary.noise.windowstate">
+    <value value="0" nick="normal"/>
+    <value value="1" nick="maximized"/>
+  </enum>
+  <schema path="/io/elementary/noise/settings/" id="io.elementary.noise.settings">
+    <key type="s" name="music-folder">
+      <default>''</default>
+      <summary>Path to music folder</summary>
+      <description>Where music is copied to, saved, and managed</description>
+    </key>
+    <key type="s" name="music-mount-name">
+      <default>''</default>
+      <summary>Name of mount volume</summary>
+      <description>Used to attempt to automount the music folder when noise starts if it already isn't.</description>
+    </key>
+    <key type="b" name="update-folder-hierarchy">
+      <default>false</default>
+      <summary>Whether or not to auto-organize folders and rename files</summary>
+      <description>Whether or not to auto-organize folders and rename files</description>
+    </key>
+    <key type="b" name="write-metadata-to-file">
+      <default>false</default>
+      <summary>Whether or not to write metadata to file</summary>
+      <description>Whether or not to write metadata to file</description>
+    </key>
+    <key type="b" name="copy-imported-music">
+      <default>false</default>
+      <summary>Whether or not to copy imported files to music folder</summary>
+      <description>Whether or not to copy imported files to music folder</description>
+    </key>
+    <key type="b" name="close-while-playing">
+      <default>false</default>
+      <summary>Whether to close the player's window instead of hiding/minimizing it when a song is still playing. The window can be brought back by activating its desktop file.</summary>
+      <description>When enabled, the window will be closed even if a song is still being played (i.e. close = quit). Otherwise, if a song is being played, the application will not be closed, but minimized/hidden. The player is minimized or hidden depending on the values of the minimize-while-playing-shells key.</description>
+    </key>
+    <key type="as" name="minimize-while-playing-shells">
+      <default>['GNOME']</default>
+      <summary>List of desktop shells for which the player's window will be minimized instead of hidden when the close-while-playing option is set to false.</summary>
+      <description>For the Pantheon and GNOME desktop shells, the player's window is simply minimized due to the lack of a minimize button; the window is hidden for all the rest of desktop shells, unless they are added to this key. In fact, any dock-based shell should be part of this key, except those that lack a sound menu or in which the dock space is often limited (e.g. Unity). See the description of close-while-playing for more information.</description>
+    </key>
+    <key type="s" name="last-playlist-playing">
+      <default>''</default>
+      <summary>'s' for smart playlist or 'p' for static playlist + ID of last playlist playing</summary>
+      <description>'s' for smart playlist or 'p' for static playlist + ID of last playlist playing</description>
+    </key>
+    <key type="x" name="last-media-playing">
+      <default>0</default>
+      <summary>ID of last media playing</summary>
+      <description>ID of last media playing</description>
+    </key>
+    <key type="i" name="last-media-position">
+      <default>0</default>
+      <summary>Position, in seconds, of media</summary>
+      <description>Position, in seconds, of media when noise last closed</description>
+    </key>
+    <key enum="io.elementary.noise.shuffle" name="shuffle-mode">
+      <default>'off'</default>
+      <summary>An index representing the shuffle mode</summary>
+      <description>An index representing the shuffle mode</description>
+    </key>
+    <key enum="io.elementary.noise.repeat" name="repeat-mode">
+      <default>'off'</default>
+      <summary>An index representing the repeat mode</summary>
+      <description>An index representing the repeat mode</description>
+    </key>
+    <key type="s" name="search-string">
+      <default>''</default>
+      <summary>String of last search</summary>
+      <description>String of last search</description>
+    </key>
+    <key type="s" name="path-string">
+      <default>'$ALBUM_ARTIST/$ALBUM/$TRACK - $TITLE'</default>
+      <summary>String of the destination path to save files</summary>
+      <description>String of the destination path to save files</description>
+    </key>
+    <key type="as" name="plugins-disabled">
+      <default>[]</default>
+      <summary>List of disabled plugins</summary>
+      <description>Plugin modules to not load during startup</description>
+    </key>
+  </schema>
+
+  <schema path="/io/elementary/noise/saved-state/" id="io.elementary.noise.saved-state">
+    <key type="i" name="window-width">
+      <default>1100</default>
+      <summary>Window width</summary>
+      <description>Window width</description>
+    </key>
+    <key type="i" name="window-height">
+      <default>600</default>
+      <summary>Window height</summary>
+      <description>Window height</description>
+    </key>
+    <key enum="io.elementary.noise.windowstate" name="window-state">
+      <default>'normal'</default>
+      <summary>The saved state of the window.</summary>
+      <description>The saved state of the window.</description>
+    </key>
+    <key type="i" name="sidebar-width">
+      <default>200</default>
+      <summary>Sidebar width</summary>
+      <description>Sidebar width</description>
+    </key>
+    <key type="i" name="more-width">
+      <default>150</default>
+      <summary>Right panel width</summary>
+      <description>Right panel width</description>
+    </key>
+    <key type="i" name="view-mode">
+      <default>1</default>
+      <summary>Index of which view type to use</summary>
+      <description>Index of which view type to use</description>
+    </key>
+    <key type="b" name="more-visible">
+      <default>false</default>
+      <summary>Whether or not the right panel is showing</summary>
+      <description>Whether or not the right panel is showing</description>
+    </key>
+    <key type="b" name="column-browser-enabled">
+      <default>false</default>
+      <summary>Whether or not the column browser is enabled</summary>
+      <description>Whether or not the column browser is enabled</description>
+    </key>
+    <key type="b" name="show-album-art-in-list-view">
+      <default>false</default>
+      <summary>Enables/disables album-art showing in the list view</summary>
+      <description>Whether or not to show album art in the list view</description>
+    </key>
+    <key type="i" name="column-browser-width">
+      <default>200</default>
+      <summary>column-browser column width</summary>
+      <description>column-browser column width</description>
+    </key>
+    <key type="i" name="column-browser-height">
+      <default>200</default>
+      <summary>column-browser column height</summary>
+      <description>column-browser column height</description>
+    </key>
+    <key type="i" name="column-browser-position">
+      <default>0</default>
+      <summary>column-browser columns position</summary>
+      <description>column-browser columns position</description>
+    </key>
+    <key type="as" name="column-browser-visible-columns">
+      <default>['3', '5', '6']</default>
+      <summary>Enabled column-browser columns for the music library view</summary>
+      <description>Enabled column-browser columns for the music library view</description>
+    </key>
+  </schema>
+
+  <schema path="/io/elementary/noise/equalizer/" id="io.elementary.noise.equalizer">
+    <key type="b" name="equalizer-enabled">
+      <default>false</default>
+      <summary>Whether or not the equalizer is enabled</summary>
+      <description>Whether or not the equalizer is enabled</description>
+    </key>
+    <key type="s" name="selected-preset">
+      <default>''</default>
+      <summary>Contains the name of the user-selected preset</summary>
+      <description>Contains information regarding the user-selected preset</description>
+    </key>
+    <key type="as" name="custom-presets">
+      <default>[]</default>
+      <summary>Custom Equalizer Presets</summary>
+      <description>Contains the list of presets added by the user. Gain values are between -80 and 80</description>
+    </key>
+    <key type="b" name="auto-switch-preset">
+      <default>true</default>
+      <summary>Whether or not to use the auto preset</summary>
+      <description>Whether or not to use the auto preset</description>
+    </key>
+  </schema>
+</schemalist>

=== removed file 'schemas/org.pantheon.noise.gschema.xml'
--- schemas/org.pantheon.noise.gschema.xml	2015-08-24 16:05:21 +0000
+++ schemas/org.pantheon.noise.gschema.xml	1970-01-01 00:00:00 +0000
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist>
-  <enum id="org.pantheon.noise.repeat">
-    <value value="0" nick="off"/>
-    <value value="1" nick="media"/>
-    <value value="2" nick="album"/>
-    <value value="3" nick="artist"/>
-    <value value="4" nick="all"/>
-  </enum>
-  <enum id="org.pantheon.noise.shuffle">
-    <value value="0" nick="off"/>
-    <value value="1" nick="all"/>
-  </enum>
-  <enum id="org.pantheon.noise.windowstate">
-    <value value="0" nick="normal"/>
-    <value value="1" nick="maximized"/>
-  </enum>
-  <schema path="/org/pantheon/noise/settings/" id="org.pantheon.noise.settings">
-    <key type="s" name="music-folder">
-      <default>''</default>
-      <summary>Path to music folder</summary>
-      <description>Where music is copied to, saved, and managed</description>
-    </key>
-    <key type="s" name="music-mount-name">
-      <default>''</default>
-      <summary>Name of mount volume</summary>
-      <description>Used to attempt to automount the music folder when noise starts if it already isn't.</description>
-    </key>
-    <key type="b" name="update-folder-hierarchy">
-      <default>false</default>
-      <summary>Whether or not to auto-organize folders and rename files</summary>
-      <description>Whether or not to auto-organize folders and rename files</description>
-    </key>
-    <key type="b" name="write-metadata-to-file">
-      <default>false</default>
-      <summary>Whether or not to write metadata to file</summary>
-      <description>Whether or not to write metadata to file</description>
-    </key>
-    <key type="b" name="copy-imported-music">
-      <default>false</default>
-      <summary>Whether or not to copy imported files to music folder</summary>
-      <description>Whether or not to copy imported files to music folder</description>
-    </key>
-    <key type="b" name="close-while-playing">
-      <default>false</default>
-      <summary>Whether to close the player's window instead of hiding/minimizing it when a song is still playing. The window can be brought back by activating its desktop file.</summary>
-      <description>When enabled, the window will be closed even if a song is still being played (i.e. close = quit). Otherwise, if a song is being played, the application will not be closed, but minimized/hidden. The player is minimized or hidden depending on the values of the minimize-while-playing-shells key.</description>
-    </key>
-    <key type="as" name="minimize-while-playing-shells">
-      <default>['GNOME']</default>
-      <summary>List of desktop shells for which the player's window will be minimized instead of hidden when the close-while-playing option is set to false.</summary>
-      <description>For the Pantheon and GNOME desktop shells, the player's window is simply minimized due to the lack of a minimize button; the window is hidden for all the rest of desktop shells, unless they are added to this key. In fact, any dock-based shell should be part of this key, except those that lack a sound menu or in which the dock space is often limited (e.g. Unity). See the description of close-while-playing for more information.</description>
-    </key>
-    <key type="s" name="last-playlist-playing">
-      <default>''</default>
-      <summary>'s' for smart playlist or 'p' for static playlist + ID of last playlist playing</summary>
-      <description>'s' for smart playlist or 'p' for static playlist + ID of last playlist playing</description>
-    </key>
-    <key type="x" name="last-media-playing">
-      <default>0</default>
-      <summary>ID of last media playing</summary>
-      <description>ID of last media playing</description>
-    </key>
-    <key type="i" name="last-media-position">
-      <default>0</default>
-      <summary>Position, in seconds, of media</summary>
-      <description>Position, in seconds, of media when noise last closed</description>
-    </key>
-    <key enum="org.pantheon.noise.shuffle" name="shuffle-mode">
-      <default>'off'</default>
-      <summary>An index representing the shuffle mode</summary>
-      <description>An index representing the shuffle mode</description>
-    </key>
-    <key enum="org.pantheon.noise.repeat" name="repeat-mode">
-      <default>'off'</default>
-      <summary>An index representing the repeat mode</summary>
-      <description>An index representing the repeat mode</description>
-    </key>
-    <key type="s" name="search-string">
-      <default>''</default>
-      <summary>String of last search</summary>
-      <description>String of last search</description>
-    </key>
-    <key type="s" name="path-string">
-      <default>'$ALBUM_ARTIST/$ALBUM/$TRACK - $TITLE'</default>
-      <summary>String of the destination path to save files</summary>
-      <description>String of the destination path to save files</description>
-    </key>
-    <key type="as" name="plugins-disabled">
-      <default>[]</default>
-      <summary>List of disabled plugins</summary>
-      <description>Plugin modules to not load during startup</description>
-    </key>
-  </schema>
-
-  <schema path="/org/pantheon/noise/saved-state/" id="org.pantheon.noise.saved-state">
-    <key type="i" name="window-width">
-      <default>1100</default>
-      <summary>Window width</summary>
-      <description>Window width</description>
-    </key>
-    <key type="i" name="window-height">
-      <default>600</default>
-      <summary>Window height</summary>
-      <description>Window height</description>
-    </key>
-    <key enum="org.pantheon.noise.windowstate" name="window-state">
-      <default>'normal'</default>
-      <summary>The saved state of the window.</summary>
-      <description>The saved state of the window.</description>
-    </key>
-    <key type="i" name="sidebar-width">
-      <default>200</default>
-      <summary>Sidebar width</summary>
-      <description>Sidebar width</description>
-    </key>
-    <key type="i" name="more-width">
-      <default>150</default>
-      <summary>Right panel width</summary>
-      <description>Right panel width</description>
-    </key>
-    <key type="i" name="view-mode">
-      <default>1</default>
-      <summary>Index of which view type to use</summary>
-      <description>Index of which view type to use</description>
-    </key>
-    <key type="b" name="more-visible">
-      <default>false</default>
-      <summary>Whether or not the right panel is showing</summary>
-      <description>Whether or not the right panel is showing</description>
-    </key>
-    <key type="b" name="column-browser-enabled">
-      <default>false</default>
-      <summary>Whether or not the column browser is enabled</summary>
-      <description>Whether or not the column browser is enabled</description>
-    </key>
-    <key type="b" name="show-album-art-in-list-view">
-      <default>false</default>
-      <summary>Enables/disables album-art showing in the list view</summary>
-      <description>Whether or not to show album art in the list view</description>
-    </key>
-    <key type="i" name="column-browser-width">
-      <default>200</default>
-      <summary>column-browser column width</summary>
-      <description>column-browser column width</description>
-    </key>
-    <key type="i" name="column-browser-height">
-      <default>200</default>
-      <summary>column-browser column height</summary>
-      <description>column-browser column height</description>
-    </key>
-    <key type="i" name="column-browser-position">
-      <default>0</default>
-      <summary>column-browser columns position</summary>
-      <description>column-browser columns position</description>
-    </key>
-    <key type="as" name="column-browser-visible-columns">
-      <default>['3', '5', '6']</default>
-      <summary>Enabled column-browser columns for the music library view</summary>
-      <description>Enabled column-browser columns for the music library view</description>
-    </key>
-  </schema>
-
-  <schema path="/org/pantheon/noise/equalizer/" id="org.pantheon.noise.equalizer">
-    <key type="b" name="equalizer-enabled">
-      <default>false</default>
-      <summary>Whether or not the equalizer is enabled</summary>
-      <description>Whether or not the equalizer is enabled</description>
-    </key>
-    <key type="s" name="selected-preset">
-      <default>''</default>
-      <summary>Contains the name of the user-selected preset</summary>
-      <description>Contains information regarding the user-selected preset</description>
-    </key>
-    <key type="as" name="custom-presets">
-      <default>[]</default>
-      <summary>Custom Equalizer Presets</summary>
-      <description>Contains the list of presets added by the user. Gain values are between -80 and 80</description>
-    </key>
-    <key type="b" name="auto-switch-preset">
-      <default>true</default>
-      <summary>Whether or not to use the auto preset</summary>
-      <description>Whether or not to use the auto preset</description>
-    </key>
-  </schema>
-</schemalist>

=== modified file 'src/LocalBackend/LocalLibrary.vala'
--- src/LocalBackend/LocalLibrary.vala	2016-12-31 17:15:12 +0000
+++ src/LocalBackend/LocalLibrary.vala	2017-03-02 02:52:40 +0000
@@ -157,7 +157,7 @@
 
         return false;
     }
-    
+
     public void remove_all_static_playlists () {
         var list = new Gee.TreeSet<int64?> ();
         lock (_playlists) {
@@ -176,7 +176,7 @@
         string m_folder = folder;
         m_folder = m_folder.replace ("/media", "");
         m_folder = m_folder.replace (GLib.Environment.get_home_dir ()+ "/", "");
-        
+
         if (start_file_operations (_("Importing music from %s…").printf ("<b>" + Markup.escape_text (m_folder) + "</b>"))) {
             remove_all_static_playlists ();
 
@@ -263,7 +263,7 @@
         // get a list of the current files
         var music_folder_dir = Settings.Main.get_default ().music_folder;
         FileUtils.count_music_files (File.new_for_path (music_folder_dir), files);
-        
+
         foreach (var m in get_medias ()) {
             if (!m.isTemporary && !m.isPreview && m.uri.contains (music_folder_dir))
 
@@ -518,7 +518,7 @@
 
 
     /******************** Media stuff ******************/
-    
+
     public override void search_medias (string search) {
         if (search == "") {
             lock (_searched_medias) {
@@ -532,7 +532,6 @@
         uint parsed_rating;
         string parsed_search_string;
         String.base_search_method (search, out parsed_rating, out parsed_search_string);
-        bool rating_search = parsed_rating > 0;
         // If we search for a special rating, don't search for something else.
         try {
             if (parsed_rating > 0) {

=== modified file 'src/Noise.vala'
--- src/Noise.vala	2016-12-31 17:15:12 +0000
+++ src/Noise.vala	2017-03-02 02:52:40 +0000
@@ -46,9 +46,9 @@
         exec_name = "noise";
 
         app_copyright = "2012-2016";
-        application_id = "org.pantheon.noise";
+        application_id = "io.elementary.noise";
         app_icon = "multimedia-audio-player";
-        app_launcher = "org.pantheon.noise.desktop";
+        app_launcher = "io.elementary.noise.desktop";
         app_years = "2012-2016";
 
         main_url = "https://launchpad.net/noise";
@@ -61,7 +61,7 @@
 
         about_artists = {"Daniel Foré <[e-mail]>", null};
         about_translators = _("translator-credits");
-        
+
         var present_action = new SimpleAction ("app.present", null);
         present_action.activate.connect (() => {
             if (main_window != null) {

=== modified file 'src/Objects/HistoryPlaylist.vala'
--- src/Objects/HistoryPlaylist.vala	2016-12-31 17:15:12 +0000
+++ src/Objects/HistoryPlaylist.vala	2017-03-02 02:52:40 +0000
@@ -76,7 +76,7 @@
         event.timestamp = time;
         event.interpretation = Zeitgeist.ZG.ACCESS_EVENT;
         event.manifestation = Zeitgeist.ZG.USER_ACTIVITY;
-        event.actor = "application://org.pantheon.noise.desktop";
+        event.actor = "application://io.elementary.noise.desktop";
         event.add_subject (subject);
 
         try {
@@ -270,18 +270,18 @@
             var event = new Zeitgeist.Event ();
             event.manifestation = Zeitgeist.ZG.USER_ACTIVITY;
             event.actor = "application://%s".printf (id);
-            
+
             var events = new GenericArray<Zeitgeist.Event> ();
             events.add (event);
-            
+
             var event2 = new Zeitgeist.Event ();
             event2.manifestation = Zeitgeist.ZG.USER_ACTIVITY;
             var subj = new Zeitgeist.Subject ();
             subj.uri = "application://%s".printf (id);
             event2.add_subject (subj);
-            
+
             events.add (event2);
-            
+
             try {
                 uint32[] results = yield log.find_event_ids (new Zeitgeist.TimeRange.anytime (),
                                                     events,
@@ -289,7 +289,7 @@
                                                     0,
                                                     Zeitgeist.ResultType.MOST_RECENT_EVENTS,
                                                     null);
-                                                    
+
                 var counter = results.length/100;
                 store.set_value (iter, 5, counter);
             } catch (Error e) {