Merge lp:~hyuchia/audience/fix-1594598 into lp:~audience-members/audience/trunk

[Diego Islas Ocampo]

Set the right scheme, replacing the org.pantheon for io.elementary and the corresponding paths.

[Jeremy Wootten (jeremywootten)]

Instead of removing and adding files, you should use bzr mv. This will reduce the diff and make it easier to see what has actually changed in the files.

review: Needs Fixing (code)

[Danielle Foré (danrabbit)]

Audience has migrated to GitHub. Please resubmit as a PR here: https://github.com/elementary/videos

Unmerged revisions

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

Use the right reversed elementary Scheme

=== added directory 'build'
=== added directory 'build/data'
=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-08-02 03:30:25 +0000
+++ data/CMakeLists.txt	2017-03-02 02:26:06 +0000
@@ -4,21 +4,21 @@
 
 # We need to create two temporary desktop files in order to have all translations available.
 set (APP_NAME "Videos")
-configure_file(org.pantheon.audience.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.audience.desktop.in)
+configure_file(io.elementary.audience.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.audience.desktop.in)
 set (APP_NAME "Audience")
-configure_file(org.pantheon.audience.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/audience-original.desktop.in)
+configure_file(io.elementary.audience.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/audience-original.desktop.in)
 
 if (BUILD_FOR_ELEMENTARY)
-    configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.audience.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.audience.desktop ${CMAKE_SOURCE_DIR}/po/)
+    configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/io.elementary.audience.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.audience.desktop ${CMAKE_SOURCE_DIR}/po/)
 else ()
-    configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/audience-original.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.audience.desktop ${CMAKE_SOURCE_DIR}/po/)
+    configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/audience-original.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.audience.desktop ${CMAKE_SOURCE_DIR}/po/)
 endif ()
 
-configure_file_translation (org.pantheon.audience.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.audience.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
+configure_file_translation (io.elementary.audience.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.audience.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
 
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.audience.desktop DESTINATION ${DATADIR}/applications/)
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.audience.appdata.xml DESTINATION ${DATADIR}/appdata/)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.audience.desktop DESTINATION ${DATADIR}/applications/)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.audience.appdata.xml DESTINATION ${DATADIR}/appdata/)
 
 include (GSettings)
 
-add_schema (org.pantheon.audience.gschema.xml)
+add_schema (io.elementary.audience.gschema.xml)

=== added file 'data/io.elementary.audience.appdata.xml.in'
--- data/io.elementary.audience.appdata.xml.in	1970-01-01 00:00:00 +0000
+++ data/io.elementary.audience.appdata.xml.in	2017-03-02 02:26:06 +0000
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2015-2016 elementary, LLC <[e-mail]> -->
+<component type="desktop">
+  <id>io.elementary.audience.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_group>elementary</project_group>
+  <project_license>GPL-3.0+</project_license>
+  <_name>Audience</_name>
+  <_summary>Watch videos and movies</_summary>
+  <description>
+    <_p>
+      A modern video player that focuses on displaying video content instead of
+      player controls. It remembers your last played video and playback position
+      so you can pick up from where you left off.
+    </_p>
+    <_p>
+      Additional features include:
+    </_p>
+    <ul>
+      <_li>Subtitle support</_li>
+      <_li>Play queue</_li>
+      <_li>Thumbnail previews on the seek bar</_li>
+    </ul>
+  </description>
+  <provides>
+    <binary>audience</binary>
+  </provides>
+  <releases>
+    <release version="0.2.1.2" date="2017-01-19" urgency="medium">
+      <description>
+        <ul>
+          <_li>Translation updates</_li>
+        </ul>
+      </description>
+    </release>
+    <release version="0.2.1.1" date="2016-10-31" urgency="medium">
+      <description>
+        <ul>
+          <_li>Fix appstream date format</_li>
+        </ul>
+      </description>
+    </release>
+    <release version="0.2.1" date="2016-10-31" urgency="medium">
+      <description>
+        <ul>
+          <_li>Added a library view with search</_li>
+          <_li>Fixed a bug that prevents keyboard navigation</_li>
+          <_li>Translation updates</_li>
+        </ul>
+      </description>
+    </release>
+    <release version="0.2.0.2" date="2016-05-05" urgency="medium">
+      <description>
+        <ul>
+          <_li>Minor bug fixes</_li>
+        </ul>
+      </description>
+    </release>
+  </releases>
+  <developer_name>elementary LLC.</developer_name>
+  <url type="homepage">http://elementary.io/</url>
+  <url type="bugtracker">https://bugs.launchpad.net/audience</url>
+  <url type="donation">https://elementary.io/get-involved#funding</url>
+  <url type="help">https://elementaryos.stackexchange.com/questions/tagged/videos</url>
+  <update_contact>contact_AT_elementary.io</update_contact>
+</component>

=== added file 'data/io.elementary.audience.desktop.in.in'
--- data/io.elementary.audience.desktop.in.in	1970-01-01 00:00:00 +0000
+++ data/io.elementary.audience.desktop.in.in	2017-03-02 02:26:06 +0000
@@ -0,0 +1,19 @@
+[Desktop Entry]
+Version=1.0
+_Name=@APP_NAME@
+_GenericName=Video Player
+_Comment=Watch videos and movies
+Exec=audience %U
+Icon=multimedia-video-player
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=AudioVideo;Video;Player;TV;
+MimeType=application/x-musepack;application/musepack;application/x-ape;application/x-id3;application/ogg;application/x-ogg;application/x-vorbis+ogg;application/x-flac;video/quicktime;video/x-quicktime;application/x-quicktimeplayer;application/smil;application/vnd.rn-realmedia;video/vnd.rn-realvideo;application/asx;video/x-ms-asf-plugin;video/x-msvideo;video/msvideo;application/x-mplayer2;application/x-ms-wmv;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmp;video/x-ms-wvx;application/x-drm-v2;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/3gpp;video/fli;video/x-fli;video/x-flv;video/vnd.vivo;application/x-nsv-vp3-mp3;video/x-matroska;video/matroska;video/x-mng;video/webm;video/x-webm;video/mp2t;video/vnd.mpegurl;video/x-ogm+ogg;
+X-GNOME-Gettext-Domain=audience
+X-PulseAudio-Properties=media.role=video
+Actions=AboutDialog;
+
+[Desktop Action AboutDialog]
+Exec=audience --about
+Name=About @APP_NAME@

=== added file 'data/io.elementary.audience.gschema.xml'
--- data/io.elementary.audience.gschema.xml	1970-01-01 00:00:00 +0000
+++ data/io.elementary.audience.gschema.xml	2017-03-02 02:26:06 +0000
@@ -0,0 +1,63 @@
+<schemalist>
+  <schema path="/io/elementary/audience/" id="io.elementary.audience" gettext-domain="audience">
+        <key name="subtitle-font" type="s">
+            <default>"Open Sans Bold"</default>
+            <summary>Set the default font of video subtitles</summary>
+        </key>
+        <key name="move-window" type="b">
+            <default>true</default>
+            <summary>Move the window</summary>
+            <description>Allow moving the window by dragging on the canvas</description>
+        </key>
+        <key name="keep-aspect" type="b">
+            <default>true</default>
+            <summary>Keep the video's aspect ratio</summary>
+            <description>Lock window resizing to the aspect ration of the current video</description>
+        </key>
+        <key name="resume-videos" type="b">
+            <default>true</default>
+            <summary>Resume videos</summary>
+            <description>Resume video at the point they were stopped when audience was closed</description>
+        </key>
+        <key name="last-played-videos" type="as">
+            <default>[]</default>
+            <summary>List of last played videos</summary>
+            <description>A list of the last played</description>
+        </key>
+        <key name="current-video" type="s">
+            <default>""</default>
+            <summary>last played video</summary>
+            <description></description>
+        </key>
+        <key name="last-stopped" type="d">
+            <default>0</default>
+            <summary>Last stopped time of last played video</summary>
+            <description>Last stopped time of last played video</description>
+        </key>
+        <key name="last-folder" type="s">
+            <default>"-1"</default>
+            <summary>The last visited folder</summary>
+            <description>The last folder you visited</description>
+        </key>
+        <key name="playback-wait" type="b">
+            <default>false</default>
+            <summary>Don't instantly start video playback</summary>
+            <description>Audience doesn't play an opened file instantly, but waits until you explicitely play it, allowing you to seek to some place or do some settings before watching</description>
+        </key>
+        <key name="stay-on-top" type="b">
+            <default>false</default>
+            <summary>Cause the audience window to stay on top by default when it's playing</summary>
+            <description>Set the option to keep the audience window above all other windows by default when audience is currently playing</description>
+        </key>
+        <key name="library-folder" type="s">
+            <default>""</default>
+            <summary>Library folder</summary>
+            <description></description>
+        </key>
+        <key name="poster-names" type="as">
+            <default>['poster.jpg','Poster.jpg','cover.jpg','Cover.jpg']</default>
+            <summary>Poster file names</summary>
+            <description></description>
+        </key>
+    </schema>
+</schemalist>

=== removed file 'data/org.pantheon.audience.appdata.xml.in'
--- data/org.pantheon.audience.appdata.xml.in	2017-01-19 22:20:11 +0000
+++ data/org.pantheon.audience.appdata.xml.in	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2015-2016 elementary, LLC <[e-mail]> -->
-<component type="desktop">
-  <id>org.pantheon.audience.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_group>elementary</project_group>
-  <project_license>GPL-3.0+</project_license>
-  <_name>Audience</_name>
-  <_summary>Watch videos and movies</_summary>
-  <description>
-    <_p>
-      A modern video player that focuses on displaying video content instead of
-      player controls. It remembers your last played video and playback position
-      so you can pick up from where you left off.
-    </_p>
-    <_p>
-      Additional features include:
-    </_p>
-    <ul>
-      <_li>Subtitle support</_li>
-      <_li>Play queue</_li>
-      <_li>Thumbnail previews on the seek bar</_li>
-    </ul>
-  </description>
-  <provides>
-    <binary>audience</binary>
-  </provides>
-  <releases>
-    <release version="0.2.1.2" date="2017-01-19" urgency="medium">
-      <description>
-        <ul>
-          <_li>Translation updates</_li>
-        </ul>
-      </description>
-    </release>
-    <release version="0.2.1.1" date="2016-10-31" urgency="medium">
-      <description>
-        <ul>
-          <_li>Fix appstream date format</_li>
-        </ul>
-      </description>
-    </release>
-    <release version="0.2.1" date="2016-10-31" urgency="medium">
-      <description>
-        <ul>
-          <_li>Added a library view with search</_li>
-          <_li>Fixed a bug that prevents keyboard navigation</_li>
-          <_li>Translation updates</_li>
-        </ul>
-      </description>
-    </release>
-    <release version="0.2.0.2" date="2016-05-05" urgency="medium">
-      <description>
-        <ul>
-          <_li>Minor bug fixes</_li>
-        </ul>
-      </description>
-    </release>
-  </releases>
-  <developer_name>elementary LLC.</developer_name>
-  <url type="homepage">http://elementary.io/</url>
-  <url type="bugtracker">https://bugs.launchpad.net/audience</url>
-  <url type="donation">https://elementary.io/get-involved#funding</url>
-  <url type="help">https://elementaryos.stackexchange.com/questions/tagged/videos</url>
-  <update_contact>contact_AT_elementary.io</update_contact>
-</component>

=== removed file 'data/org.pantheon.audience.desktop.in.in'
--- data/org.pantheon.audience.desktop.in.in	2016-08-02 03:31:45 +0000
+++ data/org.pantheon.audience.desktop.in.in	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Version=1.0
-_Name=@APP_NAME@
-_GenericName=Video Player
-_Comment=Watch videos and movies
-Exec=audience %U
-Icon=multimedia-video-player
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=AudioVideo;Video;Player;TV;
-MimeType=application/x-musepack;application/musepack;application/x-ape;application/x-id3;application/ogg;application/x-ogg;application/x-vorbis+ogg;application/x-flac;video/quicktime;video/x-quicktime;application/x-quicktimeplayer;application/smil;application/vnd.rn-realmedia;video/vnd.rn-realvideo;application/asx;video/x-ms-asf-plugin;video/x-msvideo;video/msvideo;application/x-mplayer2;application/x-ms-wmv;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmp;video/x-ms-wvx;application/x-drm-v2;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/3gpp;video/fli;video/x-fli;video/x-flv;video/vnd.vivo;application/x-nsv-vp3-mp3;video/x-matroska;video/matroska;video/x-mng;video/webm;video/x-webm;video/mp2t;video/vnd.mpegurl;video/x-ogm+ogg;
-X-GNOME-Gettext-Domain=audience
-X-PulseAudio-Properties=media.role=video
-Actions=AboutDialog;
-
-[Desktop Action AboutDialog]
-Exec=audience --about
-Name=About @APP_NAME@

=== removed file 'data/org.pantheon.audience.gschema.xml'
--- data/org.pantheon.audience.gschema.xml	2016-09-18 18:48:48 +0000
+++ data/org.pantheon.audience.gschema.xml	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-<schemalist>
-  <schema path="/org/pantheon/audience/" id="org.pantheon.audience" gettext-domain="audience">
-        <key name="subtitle-font" type="s">
-            <default>"Open Sans Bold"</default>
-            <summary>Set the default font of video subtitles</summary>
-        </key>
-        <key name="move-window" type="b">
-            <default>true</default>
-            <summary>Move the window</summary>
-            <description>Allow moving the window by dragging on the canvas</description>
-        </key>
-        <key name="keep-aspect" type="b">
-            <default>true</default>
-            <summary>Keep the video's aspect ratio</summary>
-            <description>Lock window resizing to the aspect ration of the current video</description>
-        </key>
-        <key name="resume-videos" type="b">
-            <default>true</default>
-            <summary>Resume videos</summary>
-            <description>Resume video at the point they were stopped when audience was closed</description>
-        </key>
-        <key name="last-played-videos" type="as">
-            <default>[]</default>
-            <summary>List of last played videos</summary>
-            <description>A list of the last played</description>
-        </key>
-        <key name="current-video" type="s">
-            <default>""</default>
-            <summary>last played video</summary>
-            <description></description>
-        </key>
-        <key name="last-stopped" type="d">
-            <default>0</default>
-            <summary>Last stopped time of last played video</summary>
-            <description>Last stopped time of last played video</description>
-        </key>
-        <key name="last-folder" type="s">
-            <default>"-1"</default>
-            <summary>The last visited folder</summary>
-            <description>The last folder you visited</description>
-        </key>
-        <key name="playback-wait" type="b">
-            <default>false</default>
-            <summary>Don't instantly start video playback</summary>
-            <description>Audience doesn't play an opened file instantly, but waits until you explicitely play it, allowing you to seek to some place or do some settings before watching</description>
-        </key>
-        <key name="stay-on-top" type="b">
-            <default>false</default>
-            <summary>Cause the audience window to stay on top by default when it's playing</summary>
-            <description>Set the option to keep the audience window above all other windows by default when audience is currently playing</description>
-        </key>
-        <key name="library-folder" type="s">
-            <default>""</default>
-            <summary>Library folder</summary>
-            <description></description>
-        </key>
-        <key name="poster-names" type="as">
-            <default>['poster.jpg','Poster.jpg','cover.jpg','Cover.jpg']</default>
-            <summary>Poster file names</summary>
-            <description></description>
-        </key>
-    </schema>
-</schemalist>

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2016-09-22 17:36:54 +0000
+++ src/Audience.vala	2017-03-02 02:26:06 +0000
@@ -56,8 +56,8 @@
 
             app_years = "2011-2016";
             app_icon = "multimedia-video-player";
-            app_launcher = "org.pantheon.audience.desktop";
-            application_id = "org.pantheon.audience";
+            app_launcher = "io.elementary.audience.desktop";
+            application_id = "io.elementary.audience";
 
             main_url = "https://code.launchpad.net/audience";
             bug_url = "https://bugs.launchpad.net/audience";

=== modified file 'src/Settings.vala'
--- src/Settings.vala	2016-09-19 21:14:24 +0000
+++ src/Settings.vala	2017-03-02 02:26:06 +0000
@@ -33,7 +33,7 @@
     public string[] poster_names {get; set;}
 
     public Settings () {
-        base ("org.pantheon.audience");
+        base ("io.elementary.audience");
     }
 
 }