GNOME.org
 

[shotwell/wip/phako/move-gsettings-prefix: 19/20] Try to move gsettings hierarchy

commit 03ed3917d382bf0ceb7fc88375cd14a3f50a544c
Author: Jens Georg <mail jensge org>
Date:   Sun Jan 5 15:36:49 2020 +0100

    Try to move gsettings hierarchy

 data/gsettings/meson.build                         |  4 +-
 ...a.xml => org.gnome.shotwell-extras.gschema.xml} |  6 +-
 ....gschema.xml => org.gnome.shotwell.gschema.xml} | 92 +++++++++++-----------
 .../GalleryConnector.vala                          |  2 +-
 .../RajcePublishing.vala                           |  2 +-
 .../YandexPublishing.vala                          |  2 +-
 .../shotwell-publishing-extras.vala                |  2 +-
 plugins/shotwell-publishing/FlickrPublishing.vala  |  2 +-
 plugins/shotwell-publishing/PiwigoPublishing.vala  |  2 +-
 plugins/shotwell-publishing/TumblrPublishing.vala  |  2 +-
 plugins/shotwell-publishing/YouTubePublishing.vala |  2 +-
 .../shotwell-publishing/shotwell-publishing.vala   |  2 +-
 plugins/shotwell-transitions/BlindsEffect.vala     |  2 +-
 plugins/shotwell-transitions/ChessEffect.vala      |  2 +-
 plugins/shotwell-transitions/CircleEffect.vala     |  2 +-
 plugins/shotwell-transitions/CirclesEffect.vala    |  2 +-
 plugins/shotwell-transitions/ClockEffect.vala      |  2 +-
 plugins/shotwell-transitions/CrumbleEffect.vala    |  2 +-
 plugins/shotwell-transitions/FadeEffect.vala       |  2 +-
 plugins/shotwell-transitions/SlideEffect.vala      |  2 +-
 plugins/shotwell-transitions/SquaresEffect.vala    |  2 +-
 plugins/shotwell-transitions/StripesEffect.vala    |  2 +-
 .../shotwell-transitions/shotwell-transitions.vala |  2 +-
 settings-migrator/shotwell-settings-migrator-v2    | 35 ++++++++
 src/AppDirs.vala                                   | 29 ++++++-
 src/config/GSettingsEngine.vala                    | 23 +++++-
 src/data_imports/DataImports.vala                  |  2 +-
 src/db/DatabaseTable.vala                          |  2 +-
 src/db/Db.vala                                     |  8 ++
 src/plugins/StandardHostInterface.vala             |  4 +-
 src/publishing/Publishing.vala                     |  6 +-
 src/slideshow/Slideshow.vala                       | 20 ++---
 src/slideshow/TransitionEffects.vala               |  4 +-
 33 files changed, 180 insertions(+), 95 deletions(-)
---
diff --git a/data/gsettings/meson.build b/data/gsettings/meson.build
index d70ff503..0d777982 100644
--- a/data/gsettings/meson.build
+++ b/data/gsettings/meson.build
@@ -1,6 +1,6 @@
 schema_xml = files(
-    'org.yorba.shotwell-extras.gschema.xml',
-    'org.yorba.shotwell.gschema.xml'
+    'org.gnome.shotwell-extras.gschema.xml',
+    'org.gnome.shotwell.gschema.xml'
 )
 
 install_data(schema_xml,
diff --git a/data/gsettings/org.yorba.shotwell-extras.gschema.xml 
b/data/gsettings/org.gnome.shotwell-extras.gschema.xml
similarity index 93%
rename from data/gsettings/org.yorba.shotwell-extras.gschema.xml
rename to data/gsettings/org.gnome.shotwell-extras.gschema.xml
index a4558538..3f5b26c1 100644
--- a/data/gsettings/org.yorba.shotwell-extras.gschema.xml
+++ b/data/gsettings/org.gnome.shotwell-extras.gschema.xml
@@ -1,6 +1,6 @@
 <schemalist gettext-domain="shotwell">
 
-<schema id="org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-yandex-fotki">
+<schema id="org.gnome.shotwell.sharing.org-yorba-shotwell-publishing-yandex-fotki">
     <key name="auth-token" type="s">
         <default>""</default>
         <summary>authentication token</summary>
@@ -8,7 +8,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-tumblr">
+<schema id="org.gnome.shotwell.sharing.org-yorba-shotwell-publishing-tumblr">
     <key name="token" type="s">
         <default>""</default>
         <summary>Token</summary>
@@ -34,7 +34,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-rajce">
+<schema id="org.gnome.shotwell.sharing.org-yorba-shotwell-publishing-rajce">
     <key name="url" type="s">
         <default>"http://rajce.net/";</default>
         <summary>Rajce URL</summary>
diff --git a/data/gsettings/org.yorba.shotwell.gschema.xml b/data/gsettings/org.gnome.shotwell.gschema.xml
similarity index 92%
rename from data/gsettings/org.yorba.shotwell.gschema.xml
rename to data/gsettings/org.gnome.shotwell.gschema.xml
index d45af6c7..646ec179 100644
--- a/data/gsettings/org.yorba.shotwell.gschema.xml
+++ b/data/gsettings/org.gnome.shotwell.gschema.xml
@@ -1,23 +1,23 @@
 <schemalist gettext-domain="shotwell">
 
-  <schema id="org.yorba.shotwell" path="/org/yorba/shotwell/">
-    <child name="preferences" schema="org.yorba.shotwell.preferences" />
-    <child name="sharing" schema="org.yorba.shotwell.sharing" />
-    <child name="video" schema="org.yorba.shotwell.video" />
-    <child name="printing" schema="org.yorba.shotwell.printing" />
-    <child name="plugins" schema="org.yorba.shotwell.plugins" />
+  <schema id="org.gnome.shotwell" path="/org/gnome/shotwell/">
+    <child name="preferences" schema="org.gnome.shotwell.preferences" />
+    <child name="sharing" schema="org.gnome.shotwell.sharing" />
+    <child name="video" schema="org.gnome.shotwell.video" />
+    <child name="printing" schema="org.gnome.shotwell.printing" />
+    <child name="plugins" schema="org.gnome.shotwell.plugins" />
 </schema>
 
-<schema id="org.yorba.shotwell.preferences" path="/org/yorba/shotwell/preferences/">
-    <child name="ui" schema="org.yorba.shotwell.preferences.ui" />
-    <child name="slideshow" schema="org.yorba.shotwell.preferences.slideshow" />
-    <child name="window" schema="org.yorba.shotwell.preferences.window" />
-    <child name="files" schema="org.yorba.shotwell.preferences.files" />
-    <child name="editing" schema="org.yorba.shotwell.preferences.editing" />
-    <child name="export" schema="org.yorba.shotwell.preferences.export" />
+<schema id="org.gnome.shotwell.preferences" path="/org/gnome/shotwell/preferences/">
+    <child name="ui" schema="org.gnome.shotwell.preferences.ui" />
+    <child name="slideshow" schema="org.gnome.shotwell.preferences.slideshow" />
+    <child name="window" schema="org.gnome.shotwell.preferences.window" />
+    <child name="files" schema="org.gnome.shotwell.preferences.files" />
+    <child name="editing" schema="org.gnome.shotwell.preferences.editing" />
+    <child name="export" schema="org.gnome.shotwell.preferences.export" />
 </schema>
 
-<schema id="org.yorba.shotwell.preferences.ui">
+<schema id="org.gnome.shotwell.preferences.ui">
     <key name="display-basic-properties" type="b">
         <default>true</default>
         <summary>display basic properties</summary>
@@ -187,7 +187,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.preferences.slideshow">
+<schema id="org.gnome.shotwell.preferences.slideshow">
     <key name="delay" type="d">
         <default>3.0</default>
         <summary>delay</summary>
@@ -213,7 +213,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.preferences.window">
+<schema id="org.gnome.shotwell.preferences.window">
     <key name="library-maximize" type="b">
         <default>false</default>
         <summary>maximize library window</summary>
@@ -257,7 +257,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.preferences.files">
+<schema id="org.gnome.shotwell.preferences.files">
     <key name="import-dir" type="s">
         <default>""</default>
         <summary>import directory</summary>
@@ -301,7 +301,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.crop-settings">
+<schema id="org.gnome.shotwell.crop-settings">
     <key name="last-crop-menu-choice" type="i">
         <default>1</default>
         <summary>Most-recently-used crop aspect ratio menu choice.</summary>
@@ -319,7 +319,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.preferences.editing">
+<schema id="org.gnome.shotwell.preferences.editing">
     <key name="external-photo-editor" type="s">
         <default>""</default>
         <summary>external photo editor</summary>
@@ -333,7 +333,7 @@
     </key>
 </schema>
 
-<enum id="org.yorba.shotwell.ScaleConstraint">
+<enum id="org.gnome.shotwell.ScaleConstraint">
     <value value="0" nick="ORIGINAL" />
     <value value="1" nick="DIMENSIONS" />
     <value value="2" nick="WIDTH" />
@@ -341,14 +341,14 @@
     <value value="4" nick="FILL_VIEWPORT" />
 </enum>
 
-<enum id="org.yorba.shotwell.ExportFormatMode">
+<enum id="org.gnome.shotwell.ExportFormatMode">
     <value value="0" nick="UNMODIFIED" />
     <value value="1" nick="CURRENT" />
     <value value="2" nick="SPECIFIED" />
     <value value="3" nick="LAST" />
 </enum>
 
-<enum id="org.yorba.shotwell.PhotoFileFormat">
+<enum id="org.gnome.shotwell.PhotoFileFormat">
     <value value="0" nick="JFIF" />
     <value value="1" nick="RAW" />
     <value value="2" nick="PNG" />
@@ -357,15 +357,15 @@
     <value value="5" nick="UNKNOWN" />
 </enum>
 
-<enum id="org.yorba.shotwell.JpegQuality">
+<enum id="org.gnome.shotwell.JpegQuality">
     <value value="50" nick="LOW" />
     <value value="75" nick="MEDIUM" />
     <value value="90" nick="HIGH" />
     <value value="100" nick="MAXIMUM" />
 </enum>
 
-<schema id="org.yorba.shotwell.preferences.export">
-    <key name="constraint" enum="org.yorba.shotwell.ScaleConstraint">
+<schema id="org.gnome.shotwell.preferences.export">
+    <key name="constraint" enum="org.gnome.shotwell.ScaleConstraint">
         <default>'ORIGINAL'</default>
         <summary>Setting in export dialog: how to trim images</summary>
         <description>Setting in export dialog: how to trim images</description>
@@ -377,19 +377,19 @@
         <description>Setting in export dialog: option to export metadata</description>
     </key>
 
-    <key name="export-format-mode" enum="org.yorba.shotwell.ExportFormatMode">
+    <key name="export-format-mode" enum="org.gnome.shotwell.ExportFormatMode">
         <default>'CURRENT'</default>
         <summary>format setting, special value</summary>
         <description>Setting in export dialog: format setting, special value</description>
     </key>
 
-    <key name="photo-file-format" enum="org.yorba.shotwell.PhotoFileFormat">
+    <key name="photo-file-format" enum="org.gnome.shotwell.PhotoFileFormat">
         <default>'JFIF'</default>
         <summary>format setting, type value</summary>
         <description>Setting in export dialog: format setting, type value</description>
     </key>
 
-    <key name="quality" enum="org.yorba.shotwell.JpegQuality">
+    <key name="quality" enum="org.gnome.shotwell.JpegQuality">
         <default>'HIGH'</default>
         <summary>JPEG quality option</summary>
         <description>Setting in export dialog: jpeg quality option</description>
@@ -402,7 +402,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing">
+<schema id="org.gnome.shotwell.sharing">
     <key name="last-used-service" type="s">
         <default>""</default>
         <summary>last used publishing service</summary>
@@ -415,14 +415,14 @@
         <description>A numeric code representing the last service to which photos were 
published</description>
     </key>
 
-    <child name="facebook" schema="org.yorba.shotwell.sharing.facebook" />
-    <child name="flickr" schema="org.yorba.shotwell.sharing.flickr" />
-    <child name="gallery3" schema="org.yorba.shotwell.sharing.publishing-gallery3" />
-    <child name="org-gnome-shotwell-publishing-google-photos" 
schema="org.yorba.shotwell.sharing.org-gnome-shotwell-publishing-google-photos" />
-    <child name="youtube" schema="org.yorba.shotwell.sharing.youtube" />
+    <child name="facebook" schema="org.gnome.shotwell.sharing.facebook" />
+    <child name="flickr" schema="org.gnome.shotwell.sharing.flickr" />
+    <child name="gallery3" schema="org.gnome.shotwell.sharing.publishing-gallery3" />
+    <child name="org-gnome-shotwell-publishing-google-photos" 
schema="org.gnome.shotwell.sharing.org-gnome-shotwell-publishing-google-photos" />
+    <child name="youtube" schema="org.gnome.shotwell.sharing.youtube" />
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.facebook">
+<schema id="org.gnome.shotwell.sharing.facebook">
     <key name="access-token" type="s">
         <default>""</default>
         <summary>access token</summary>
@@ -454,7 +454,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.flickr">
+<schema id="org.gnome.shotwell.sharing.flickr">
     <key name="access-phase-token" type="s">
         <default>""</default>
         <summary>OAuth Access Phase Token</summary>
@@ -492,7 +492,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.org-gnome-shotwell-publishing-google-photos">
+<schema id="org.gnome.shotwell.sharing.org-gnome-shotwell-publishing-google-photos">
     <key name="refresh-token" type="s">
         <default>""</default>
         <summary>refresh token</summary>
@@ -518,7 +518,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-piwigo">
+<schema id="org.gnome.shotwell.sharing.org-yorba-shotwell-publishing-piwigo">
     <key name="url" type="s">
         <default>""</default>
         <summary>Piwigo URL</summary>
@@ -586,7 +586,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.publishing-gallery3">
+<schema id="org.gnome.shotwell.sharing.publishing-gallery3">
     <key name="username" type="s">
         <default>""</default>
         <summary>username</summary>
@@ -630,7 +630,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.sharing.youtube">
+<schema id="org.gnome.shotwell.sharing.youtube">
     <key name="refresh-token" type="s">
         <default>""</default>
         <summary>refresh token</summary>
@@ -638,7 +638,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.dataimports">
+<schema id="org.gnome.shotwell.dataimports">
     <key name="last-used-dataimports-service" type="s">
         <default>""</default>
         <summary>last used import service</summary>
@@ -646,7 +646,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.video">
+<schema id="org.gnome.shotwell.video">
     <key name="interpreter-state-cookie" type="i">
         <default>-1</default>
         <summary>interpreter state cookie</summary>
@@ -654,7 +654,7 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.printing">
+<schema id="org.gnome.shotwell.printing">
     <key name="content-layout" type="i">
         <default>3</default>
         <summary>content layout mode</summary>
@@ -716,11 +716,11 @@
     </key>
 </schema>
 
-<schema id="org.yorba.shotwell.plugins" path="/org/yorba/shotwell/plugins/" >
-    <child name="enable-state" schema="org.yorba.shotwell.plugins.enable-state" />
+<schema id="org.gnome.shotwell.plugins" path="/org/gnome/shotwell/plugins/" >
+    <child name="enable-state" schema="org.gnome.shotwell.plugins.enable-state" />
 </schema>
 
-<schema id="org.yorba.shotwell.plugins.enable-state">
+<schema id="org.gnome.shotwell.plugins.enable-state">
     <key name="publishing-facebook" type="b">
         <default>true</default>
         <summary>enable facebook publishing plugin</summary>
diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.vala 
b/plugins/shotwell-publishing-extras/GalleryConnector.vala
index 9932862a..a6aca5da 100644
--- a/plugins/shotwell-publishing-extras/GalleryConnector.vala
+++ b/plugins/shotwell-publishing-extras/GalleryConnector.vala
@@ -46,7 +46,7 @@ private class ShotwellPublishingGallery3 : Object, Spit.Module {
     }
 
     public unowned string get_id() {
-        return "org.yorba.shotwell.sharing.gallery3";
+        return "org.gnome.shotwell.sharing.gallery3";
     }
 
     public unowned Spit.Pluggable[]? get_pluggables() {
diff --git a/plugins/shotwell-publishing-extras/RajcePublishing.vala 
b/plugins/shotwell-publishing-extras/RajcePublishing.vala
index a0882747..f57f3e8a 100644
--- a/plugins/shotwell-publishing-extras/RajcePublishing.vala
+++ b/plugins/shotwell-publishing-extras/RajcePublishing.vala
@@ -26,7 +26,7 @@ public class RajceService : Object, Spit.Pluggable, Spit.Publishing.Service
     
     public unowned string get_id()
        {
-        return "org.yorba.shotwell.publishing.rajce";
+        return "org.gnome.shotwell.publishing.rajce";
     }
     
     public unowned string get_pluggable_name()
diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.vala 
b/plugins/shotwell-publishing-extras/YandexPublishing.vala
index 2680df07..6ba0829c 100644
--- a/plugins/shotwell-publishing-extras/YandexPublishing.vala
+++ b/plugins/shotwell-publishing-extras/YandexPublishing.vala
@@ -10,7 +10,7 @@ public class YandexService : Object, Spit.Pluggable, Spit.Publishing.Service {
     }
     
     public unowned string get_id() {
-        return "org.yorba.shotwell.publishing.yandex-fotki";
+        return "org.gnome.shotwell.publishing.yandex-fotki";
     }
     
     public unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala 
b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
index fb622fab..fa8c5e28 100644
--- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
+++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
@@ -32,7 +32,7 @@ private class ShotwellPublishingExtraServices : Object, Spit.Module {
     }
     
     public unowned string get_id() {
-        return "org.yorba.shotwell.publishing.extras";
+        return "org.gnome.shotwell.publishing.extras";
     }
     
     public unowned Spit.Pluggable[]? get_pluggables() {
diff --git a/plugins/shotwell-publishing/FlickrPublishing.vala 
b/plugins/shotwell-publishing/FlickrPublishing.vala
index 53b6003c..35734269 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.vala
+++ b/plugins/shotwell-publishing/FlickrPublishing.vala
@@ -21,7 +21,7 @@ public class FlickrService : Object, Spit.Pluggable, Spit.Publishing.Service {
     }
     
     public unowned string get_id() {
-        return "org.yorba.shotwell.publishing.flickr";
+        return "org.gnome.shotwell.publishing.flickr";
     }
     
     public unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala 
b/plugins/shotwell-publishing/PiwigoPublishing.vala
index 58d638e7..ec99f31b 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.vala
+++ b/plugins/shotwell-publishing/PiwigoPublishing.vala
@@ -21,7 +21,7 @@ public class PiwigoService : Object, Spit.Pluggable, Spit.Publishing.Service {
     }
     
     public unowned string get_id() {
-        return "org.yorba.shotwell.publishing.piwigo";
+        return "org.gnome.shotwell.publishing.piwigo";
     }
     
     public unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-publishing/TumblrPublishing.vala 
b/plugins/shotwell-publishing/TumblrPublishing.vala
index 7061d6db..bb3dd2e7 100644
--- a/plugins/shotwell-publishing/TumblrPublishing.vala
+++ b/plugins/shotwell-publishing/TumblrPublishing.vala
@@ -23,7 +23,7 @@ public class TumblrService : Object, Spit.Pluggable, Spit.Publishing.Service {
     }
 
     public unowned string get_id() {
-        return "org.yorba.shotwell.publishing.tumblr";
+        return "org.gnome.shotwell.publishing.tumblr";
     }
 
     public unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-publishing/YouTubePublishing.vala 
b/plugins/shotwell-publishing/YouTubePublishing.vala
index 87f19599..9a8cffb4 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.vala
+++ b/plugins/shotwell-publishing/YouTubePublishing.vala
@@ -21,7 +21,7 @@ public class YouTubeService : Object, Spit.Pluggable, Spit.Publishing.Service {
     }
 
     public unowned string get_id() {
-        return "org.yorba.shotwell.publishing.youtube";
+        return "org.gnome.shotwell.publishing.youtube";
     }
 
     public unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-publishing/shotwell-publishing.vala 
b/plugins/shotwell-publishing/shotwell-publishing.vala
index 896d527d..5cebf0e3 100644
--- a/plugins/shotwell-publishing/shotwell-publishing.vala
+++ b/plugins/shotwell-publishing/shotwell-publishing.vala
@@ -58,7 +58,7 @@ private class ShotwellPublishingCoreServices : Object, Spit.Module {
     }
     
     public unowned string get_id() {
-        return "org.yorba.shotwell.publishing.core_services";
+        return "org.gnome.shotwell.publishing.core_services";
     }
     
     public unowned Spit.Pluggable[]? get_pluggables() {
diff --git a/plugins/shotwell-transitions/BlindsEffect.vala b/plugins/shotwell-transitions/BlindsEffect.vala
index 19af7b3f..b199fdc5 100644
--- a/plugins/shotwell-transitions/BlindsEffect.vala
+++ b/plugins/shotwell-transitions/BlindsEffect.vala
@@ -13,7 +13,7 @@ private class BlindsEffectDescriptor : ShotwellTransitionDescriptor {
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.blinds";
+        return "org.gnome.shotwell.transitions.blinds";
     }
 
     public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/ChessEffect.vala b/plugins/shotwell-transitions/ChessEffect.vala
index 9daa670b..b1b4efce 100644
--- a/plugins/shotwell-transitions/ChessEffect.vala
+++ b/plugins/shotwell-transitions/ChessEffect.vala
@@ -13,7 +13,7 @@ private class ChessEffectDescriptor : ShotwellTransitionDescriptor {
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.chess";
+        return "org.gnome.shotwell.transitions.chess";
     }
 
     public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/CircleEffect.vala b/plugins/shotwell-transitions/CircleEffect.vala
index b03d8fb5..cfa85015 100644
--- a/plugins/shotwell-transitions/CircleEffect.vala
+++ b/plugins/shotwell-transitions/CircleEffect.vala
@@ -13,7 +13,7 @@ private class CircleEffectDescriptor : ShotwellTransitionDescriptor {
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.circle";
+        return "org.gnome.shotwell.transitions.circle";
     }
 
     public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/CirclesEffect.vala b/plugins/shotwell-transitions/CirclesEffect.vala
index 259d8012..39a9cc3d 100644
--- a/plugins/shotwell-transitions/CirclesEffect.vala
+++ b/plugins/shotwell-transitions/CirclesEffect.vala
@@ -13,7 +13,7 @@ private class CirclesEffectDescriptor : ShotwellTransitionDescriptor {
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.circles";
+        return "org.gnome.shotwell.transitions.circles";
     }
 
     public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/ClockEffect.vala b/plugins/shotwell-transitions/ClockEffect.vala
index 2b7a56a3..b21d6086 100644
--- a/plugins/shotwell-transitions/ClockEffect.vala
+++ b/plugins/shotwell-transitions/ClockEffect.vala
@@ -13,7 +13,7 @@ private class ClockEffectDescriptor : ShotwellTransitionDescriptor {
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.clock";
+        return "org.gnome.shotwell.transitions.clock";
     }
 
     public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/CrumbleEffect.vala b/plugins/shotwell-transitions/CrumbleEffect.vala
index f707babb..fbf7678d 100644
--- a/plugins/shotwell-transitions/CrumbleEffect.vala
+++ b/plugins/shotwell-transitions/CrumbleEffect.vala
@@ -13,7 +13,7 @@ private class CrumbleEffectDescriptor : ShotwellTransitionDescriptor {
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.crumble";
+        return "org.gnome.shotwell.transitions.crumble";
     }
     
     public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/FadeEffect.vala b/plugins/shotwell-transitions/FadeEffect.vala
index 63300014..e7fda151 100644
--- a/plugins/shotwell-transitions/FadeEffect.vala
+++ b/plugins/shotwell-transitions/FadeEffect.vala
@@ -13,7 +13,7 @@ private class FadeEffectDescriptor : ShotwellTransitionDescriptor {
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.fade";
+        return "org.gnome.shotwell.transitions.fade";
     }
     
     public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/SlideEffect.vala b/plugins/shotwell-transitions/SlideEffect.vala
index 2b2aca04..8fe3347d 100644
--- a/plugins/shotwell-transitions/SlideEffect.vala
+++ b/plugins/shotwell-transitions/SlideEffect.vala
@@ -13,7 +13,7 @@ private class SlideEffectDescriptor : ShotwellTransitionDescriptor {
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.slide";
+        return "org.gnome.shotwell.transitions.slide";
     }
     
     public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/SquaresEffect.vala b/plugins/shotwell-transitions/SquaresEffect.vala
index b397419d..3b832307 100644
--- a/plugins/shotwell-transitions/SquaresEffect.vala
+++ b/plugins/shotwell-transitions/SquaresEffect.vala
@@ -13,7 +13,7 @@ private class SquaresEffectDescriptor : ShotwellTransitionDescriptor {
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.squares";
+        return "org.gnome.shotwell.transitions.squares";
     }
 
     public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/StripesEffect.vala b/plugins/shotwell-transitions/StripesEffect.vala
index 55d8bd80..6962ef8b 100644
--- a/plugins/shotwell-transitions/StripesEffect.vala
+++ b/plugins/shotwell-transitions/StripesEffect.vala
@@ -13,7 +13,7 @@ private class StripesEffectDescriptor : ShotwellTransitionDescriptor {
     }
 
     public override unowned string get_id() {
-        return "org.yorba.shotwell.transitions.stripes";
+        return "org.gnome.shotwell.transitions.stripes";
     }
 
     public override unowned string get_pluggable_name() {
diff --git a/plugins/shotwell-transitions/shotwell-transitions.vala 
b/plugins/shotwell-transitions/shotwell-transitions.vala
index 1d2344ff..6f2ccb99 100644
--- a/plugins/shotwell-transitions/shotwell-transitions.vala
+++ b/plugins/shotwell-transitions/shotwell-transitions.vala
@@ -33,7 +33,7 @@ private class ShotwellTransitions : Object, Spit.Module {
     }
     
     public unowned string get_id() {
-        return "org.yorba.shotwell.transitions";
+        return "org.gnome.shotwell.transitions";
     }
     
     public unowned Spit.Pluggable[]? get_pluggables() {
diff --git a/settings-migrator/shotwell-settings-migrator-v2 b/settings-migrator/shotwell-settings-migrator-v2
new file mode 100644
index 00000000..d3ac9b1c
--- /dev/null
+++ b/settings-migrator/shotwell-settings-migrator-v2
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+################################################################################
+#
+# Copyright 2016 Software Freedom Conservancy Inc.
+#
+# This software is licensed under the GNU LGPL (version 2.1 or later).
+# See the COPYING file in this distribution.
+#
+# Helper script to copy settings data from /apps/shotwell/ to
+#   /org/yorba/shotwell/
+#
+# NOTE: this should only be run ONCE as part of the upgrade process; otherwise,
+#   any stale data in the old location may be inadvertently copied over again,
+#   overwriting newer data.
+#
+################################################################################
+
+sec_since_epoch=`date +%s`
+temp_file_path_prefix=/tmp/shotwell-migrate-settings-path-
+temp_file_path=$temp_file_path_prefix$sec_since_epoch
+
+# Copy from deprecated path...
+dconf dump /org/yorba/shotwell/ > $temp_file_path
+
+# ...and into officially-blessed one.
+dconf load /org/gnome/shotwell/ < $temp_file_path
+
+echo "$temp_file_path 
=00000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+
+# Clean out the stale paths...
+# dconf reset -f /org/yorba/shotwell/
+
+# temp file not needed anymore, zap it.
+# rm -f $temp_file_path
diff --git a/src/AppDirs.vala b/src/AppDirs.vala
index 4d236d71..ba1a14ce 100644
--- a/src/AppDirs.vala
+++ b/src/AppDirs.vala
@@ -316,16 +316,43 @@ class AppDirs {
             f = AppDirs.get_libexec_dir().get_parent().get_child("thumbnailer").get_child(filename);
         }
 
+        warning("==============> %s", f.get_path());
+
         return f;
     }
 
     public static File get_settings_migrator_bin() {
         const string filename = "shotwell-settings-migrator";
-        File f = AppDirs.get_libexec_dir().get_child ("settings-migrator").get_child (filename);
+        File f = AppDirs.get_libexec_dir().get_child("settings-migrator").get_child (filename);
+        if (!f.query_exists()) {
+            // If we're running installed.
+            f = AppDirs.get_libexec_dir () .get_child ("shotwell").get_child (filename);
+        }
+
+        if (!f.query_exists()) {
+            f = AppDirs.get_libexec_dir().get_parent().get_child("settings-migrator").get_child(filename);
+        }
+
+        return f;
+    }
+
+    public static File get_settings_migrator_v2_bin() {
+        const string filename = "shotwell-settings-migrator-v2";
+        File f = AppDirs.get_libexec_dir().get_child("settings-migrator").get_child (filename);
         if (!f.query_exists()) {
             // If we're running installed.
             f = AppDirs.get_libexec_dir () .get_child ("shotwell").get_child (filename);
         }
+
+        if (!f.query_exists()) {
+            f = AppDirs.get_libexec_dir().get_parent().get_child("settings-migrator").get_child(filename);
+        }
+
+        if (!f.query_exists()) {
+            f = 
AppDirs.get_libexec_dir().get_parent().get_parent().get_child("settings-migrator").get_child(filename);
+        }
+
+
         return f;
     }
 
diff --git a/src/config/GSettingsEngine.vala b/src/config/GSettingsEngine.vala
index 8541f853..d19425e6 100644
--- a/src/config/GSettingsEngine.vala
+++ b/src/config/GSettingsEngine.vala
@@ -5,7 +5,7 @@
  */
 
 public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
-    private const string ROOT_SCHEMA_NAME = "org.yorba.shotwell";
+    private const string ROOT_SCHEMA_NAME = "org.gnome.shotwell";
     private const string PREFS_SCHEMA_NAME = ROOT_SCHEMA_NAME + ".preferences";
     private const string UI_PREFS_SCHEMA_NAME = PREFS_SCHEMA_NAME + ".ui";
     private const string SLIDESHOW_PREFS_SCHEMA_NAME = PREFS_SCHEMA_NAME + ".slideshow";
@@ -186,7 +186,7 @@ public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
         if (!this.settings_cache.has_key(schema)) {
             if (schema.has_prefix (ROOT_SCHEMA_NAME)) {
                 var path = schema.replace(ROOT_SCHEMA_NAME, "");
-                path = "/org/yorba/shotwell/%s%s/".printf(profile == null ? "" : "profiles/" + profile, 
path.replace(".", "/"));
+                path = "/org/gnome/shotwell/%s%s/".printf(profile == null ? "" : "profiles/" + profile, 
path.replace(".", "/"));
                 path = path.replace("//", "/");
                 this.settings_cache[schema] = new Settings.with_path (schema, path);
             } else {
@@ -307,7 +307,7 @@ public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
         if (cleaned_id == null)
             cleaned_id = "default";
 
-        cleaned_id = cleaned_id.replace("org.yorba.shotwell.", "");
+        cleaned_id = cleaned_id.replace("org.gnome.shotwell.", "");
         cleaned_id = cleaned_id.replace(".", "-");
         
         return cleaned_id;
@@ -319,7 +319,7 @@ public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
             cleaned_id = "default";
         cleaned_id = cleaned_id.replace(".", "-");
         
-        return "org.yorba.shotwell.%s.%s".printf(domain, cleaned_id);
+        return "org.gnome.shotwell.%s.%s".printf(domain, cleaned_id);
     }
     
     private static string make_gsettings_key(string gconf_key) {
@@ -521,4 +521,19 @@ public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
         }
     }
 
+    /*! @brief Migrates settings data over from old-style /org/yorba/ paths to /org/gnome/ ones.
+     *  Should only be called ONCE, during DB upgrading; otherwise, stale data may be copied
+     *  over newer data by accident.
+     */
+    public static void run_gsettings_migrator_v2() {
+        string cmd_line = "sh " + AppDirs.get_settings_migrator_v2_bin().get_path();
+
+        try {
+            Process.spawn_command_line_sync(cmd_line);
+        } catch (Error err) {
+            message("Error running shotwell-settings-migrator: %s", err.message);
+        }
+    }
+
+
 }
diff --git a/src/data_imports/DataImports.vala b/src/data_imports/DataImports.vala
index a98c91be..258a6530 100644
--- a/src/data_imports/DataImports.vala
+++ b/src/data_imports/DataImports.vala
@@ -17,7 +17,7 @@ namespace DataImports {
 
 public void init() throws Error {
     string[] core_ids = new string[0];
-    core_ids += "org.yorba.shotwell.dataimports.fspot";
+    core_ids += "org.gnome.shotwell.dataimports.fspot";
     
     Plugins.register_extension_point(typeof(Spit.DataImports.Service), _("Data Imports"),
         Resources.IMPORT, core_ids);
diff --git a/src/db/DatabaseTable.vala b/src/db/DatabaseTable.vala
index 6e1a5b2f..5a046ad5 100644
--- a/src/db/DatabaseTable.vala
+++ b/src/db/DatabaseTable.vala
@@ -21,7 +21,7 @@ public abstract class DatabaseTable {
      * tables are created on demand and tables and columns are easily ignored when already present.
      * However, the change should be noted in upgrade_database() as a comment.
      ***/
-    public const int SCHEMA_VERSION = 22;
+    public const int SCHEMA_VERSION = 23;
 
     protected static Sqlite.Database db;
 
diff --git a/src/db/Db.vala b/src/db/Db.vala
index e56c7298..547ee71a 100644
--- a/src/db/Db.vala
+++ b/src/db/Db.vala
@@ -396,6 +396,14 @@ private VerifyResult upgrade_database(int input_version) {
     // Finalize the upgrade process
     //
 
+    if (input_version < 23) {
+        // Run the settings migrator to copy settings data from /org/yorba/shotwell to /org/gnome/shotwell
+        GSettingsConfigurationEngine.run_gsettings_migrator_v2();
+    }
+
+    version = 23;
+
+
     assert(version == DatabaseTable.SCHEMA_VERSION);
     VersionTable.get_instance().update_version(version, Resources.APP_VERSION);
     
diff --git a/src/plugins/StandardHostInterface.vala b/src/plugins/StandardHostInterface.vala
index ba53a074..95de834e 100644
--- a/src/plugins/StandardHostInterface.vala
+++ b/src/plugins/StandardHostInterface.vala
@@ -23,10 +23,10 @@ public class StandardHostInterface : Object, Spit.HostInterface {
         // special case: legacy plugins (Web publishers moved into SPIT) have special names
         // new plugins will use their full ID
         switch (id) {
-            case "org.yorba.shotwell.publishing.flickr":
+            case "org.gnome.shotwell.publishing.flickr":
                 return "flickr";
                 
-            case "org.yorba.shotwell.publishing.youtube":
+            case "org.gnome.shotwell.publishing.youtube":
                 return "youtube";
 
             default:
diff --git a/src/publishing/Publishing.vala b/src/publishing/Publishing.vala
index 5fb80987..c41e121b 100644
--- a/src/publishing/Publishing.vala
+++ b/src/publishing/Publishing.vala
@@ -8,9 +8,9 @@ namespace Publishing {
 
 public void init() throws Error {
     string[] core_ids = new string[0];
-    core_ids += "org.yorba.shotwell.publishing.flickr";
-    core_ids += "org.yorba.shotwell.publishing.youtube";
-    core_ids += "org.yorba.shotwell.publishing.gnome-photos";
+    core_ids += "org.gnome.shotwell.publishing.flickr";
+    core_ids += "org.gnome.shotwell.publishing.youtube";
+    core_ids += "org.gnome.shotwell.publishing.gnome-photos";
     
     Plugins.register_extension_point(typeof(Spit.Publishing.Service), _("Publishing"),
         Resources.PUBLISH, core_ids);
diff --git a/src/slideshow/Slideshow.vala b/src/slideshow/Slideshow.vala
index 5d14b64d..0ee93920 100644
--- a/src/slideshow/Slideshow.vala
+++ b/src/slideshow/Slideshow.vala
@@ -8,16 +8,16 @@ namespace Slideshow {
 
 public void init() throws Error {
     string[] core_ids = new string[0];
-    core_ids += "org.yorba.shotwell.transitions.crumble";
-    core_ids += "org.yorba.shotwell.transitions.fade";
-    core_ids += "org.yorba.shotwell.transitions.slide";
-    core_ids += "org.yorba.shotwell.transitions.blinds";
-    core_ids += "org.yorba.shotwell.transitions.circle";
-    core_ids += "org.yorba.shotwell.transitions.circles";
-    core_ids += "org.yorba.shotwell.transitions.clock";
-    core_ids += "org.yorba.shotwell.transitions.stripes";
-    core_ids += "org.yorba.shotwell.transitions.squares";
-    core_ids += "org.yorba.shotwell.transitions.chess";
+    core_ids += "org.gnome.shotwell.transitions.crumble";
+    core_ids += "org.gnome.shotwell.transitions.fade";
+    core_ids += "org.gnome.shotwell.transitions.slide";
+    core_ids += "org.gnome.shotwell.transitions.blinds";
+    core_ids += "org.gnome.shotwell.transitions.circle";
+    core_ids += "org.gnome.shotwell.transitions.circles";
+    core_ids += "org.gnome.shotwell.transitions.clock";
+    core_ids += "org.gnome.shotwell.transitions.stripes";
+    core_ids += "org.gnome.shotwell.transitions.squares";
+    core_ids += "org.gnome.shotwell.transitions.chess";
     
     Plugins.register_extension_point(typeof(Spit.Transitions.Descriptor), _("Slideshow Transitions"),
         Resources.ICON_SLIDESHOW_EXTENSION_POINT, core_ids);
diff --git a/src/slideshow/TransitionEffects.vala b/src/slideshow/TransitionEffects.vala
index 5f7dc88f..635fd79b 100644
--- a/src/slideshow/TransitionEffects.vala
+++ b/src/slideshow/TransitionEffects.vala
@@ -273,7 +273,7 @@ public class TransitionClock {
 }
 
 public class NullTransitionDescriptor : Object, Spit.Pluggable, Spit.Transitions.Descriptor {
-    public const string EFFECT_ID = "org.yorba.shotwell.transitions.null";
+    public const string EFFECT_ID = "org.gnome.shotwell.transitions.null";
     
     public int get_pluggable_interface(int min_host_version, int max_host_version) {
         return Spit.Transitions.CURRENT_INTERFACE;
@@ -325,7 +325,7 @@ public class NullEffect : Object, Spit.Transitions.Effect {
     }
 }
 public class RandomEffectDescriptor : Object, Spit.Pluggable, Spit.Transitions.Descriptor {
-    public const string EFFECT_ID = "org.yorba.shotwell.transitions.random";
+    public const string EFFECT_ID = "org.gnome.shotwell.transitions.random";
 
     public int get_pluggable_interface(int min_host_version, int max_host_version) {
         return Spit.Transitions.CURRENT_INTERFACE;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]