[sound-juicer/wip/gsettings] Make schema name and dbus name match.

[Phillip Wood <pwood src gnome org>]

commit 2fc6e057efee0e9713ca629588b2f93f9cbabb51
Author: Phillip Wood <phillip wood dunelm org uk>
Date:   Sun Sep 22 18:37:42 2013 +0100

    Make schema name and dbus name match.
    
    The gsettings documentation recommends that the two names should
    match. As changing an existing dbus name in probably a bad idea change
    the schema name instead.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=625897

 data/Makefile.am                                   |    2 +-
 ...hema.xml => org.gnome.sound-juicer.gschema.xml} |   10 +++++-----
 data/sound-juicer.convert                          |    2 +-
 po/POTFILES.in                                     |    2 +-
 src/sj-main.c                                      |    2 +-
 src/sj-window-prefs.c                              |    2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 18e03d1..ed146d7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,7 +6,7 @@ desktop_in_files = sound-juicer.desktop.in.in
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-gsettings_SCHEMAS = org.gnome.SoundJuicer.gschema.xml
+gsettings_SCHEMAS = org.gnome.sound-juicer.gschema.xml
 
 @GSETTINGS_RULES@
 
diff --git a/data/org.gnome.SoundJuicer.gschema.xml b/data/org.gnome.sound-juicer.gschema.xml
similarity index 90%
rename from data/org.gnome.SoundJuicer.gschema.xml
rename to data/org.gnome.sound-juicer.gschema.xml
index 4426f1e..83d0e0f 100644
--- a/data/org.gnome.SoundJuicer.gschema.xml
+++ b/data/org.gnome.sound-juicer.gschema.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <schemalist>
 
-  <enum id="org.gnome.SoundJuicer.paranoia">
+  <enum id="org.gnome.sound-juicer.paranoia">
     <value nick="disable" value="0"/>
     <value nick="fragment" value="2"/>
     <value nick="overlap" value="4"/>
@@ -10,15 +10,15 @@
     <value nick="full" value="255"/>
   </enum>
 
-  <schema gettext-domain="sound-juicer" id="org.gnome.SoundJuicer" path="/org/gnome/SoundJuicer/">
+  <schema gettext-domain="sound-juicer" id="org.gnome.sound-juicer" path="/org/gnome/sound-juicer/">
 
     <!-- Please note: There is no default value for the 'device' key
-                      because SoundJuicer does not handle symlinks like
+                      because sound-juicer does not handle symlinks like
                       e.g. /dev/cdrom -->
     <key name="device" type="s">
       <default>''</default>
       <summary>The CD to extract from.</summary>
-      <description>Please note: SoundJuicer currently only handles real device names, no symlinks like e.g. 
/dev/cdrom. An empty key implicates that the system's default cdrom drive will be used.</description>
+      <description>Please note: sound-juicer currently only handles real device names, no symlinks like e.g. 
/dev/cdrom. An empty key implicates that the system's default cdrom drive will be used.</description>
     </key>
 
     <key name="eject" type="b">
@@ -48,7 +48,7 @@
       <description>Do not specify an extension. Format specifiers: %at - album title; %aT - album title 
(lowercase); %aa - album artist; %aA - album artist (lowercase); %as - album artist (sortable); %aS - album 
artist (sortable lowercase); %ac - album composer; %aC - album composer (lowercase); %ap - album composer 
(sortable); %aP - album composer (sortable lowercase); %tn - track number (i.e 8); %tN - track number, zero 
padded (i.e 08); %tt - track title; %tT - track title (lowercase); %ta - track artist; %tA - track artist 
(lowercase); %ts - track artist (sortable); %tS - track artist (sortable lowercase); %tc - track composer; 
%tC - track composer (lowercase); %tp - track composer (sortable); %tP - track composer (sortable lowercase); 
%dn - disc and track number (i.e Disk 2 - 6, or 6); %dN - disc number, zero padded (i.e d02t06, or 
06)</description>
     </key>
 
-    <key name="paranoia" enum="org.gnome.SoundJuicer.paranoia">
+    <key name="paranoia" enum="org.gnome.sound-juicer.paranoia">
       <default>'scratch'</default>
       <summary>The paranoia mode to use</summary>
       <description>Paranoia mode: 0) disable; 2) fragment; 4) overlap; 8) scratch; 16) repair; 255) 
full</description>
diff --git a/data/sound-juicer.convert b/data/sound-juicer.convert
index e922f80..978905c 100644
--- a/data/sound-juicer.convert
+++ b/data/sound-juicer.convert
@@ -1,4 +1,4 @@
-[org.gnome.SoundJuicer]
+[org.gnome.sound-juicer]
 audio-profile = /apps/sound-juicer/audio_profile
 base-uri = /apps/sound-juicer/base_uri
 eject = /apps/sound-juicer/eject
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 86a6885..4312b44 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
-[type: gettext/gsettings]data/org.gnome.SoundJuicer.gschema.xml
+[type: gettext/gsettings]data/org.gnome.sound-juicer.gschema.xml
 data/sound-juicer.desktop.in.in
 [type: gettext/glade]data/sound-juicer.ui
 [type: gettext/glade]data/sound-juicer-menu.ui
diff --git a/src/sj-main.c b/src/sj-main.c
index 4c2dec6..ca5910d 100644
--- a/src/sj-main.c
+++ b/src/sj-main.c
@@ -2009,7 +2009,7 @@ startup_cb (GApplication *app, gpointer user_data)
   metadata = sj_metadata_getter_new ();
   g_signal_connect (metadata, "metadata", G_CALLBACK (metadata_cb), NULL);
 
-  sj_settings = g_settings_new ("org.gnome.SoundJuicer");
+  sj_settings = g_settings_new ("org.gnome.sound-juicer");
 
   g_signal_connect (sj_settings, "changed::"SJ_SETTINGS_DEVICE,
                     (GCallback)device_changed_cb, NULL);
diff --git a/src/sj-window-prefs.c b/src/sj-window-prefs.c
index 886aebf..432d06d 100644
--- a/src/sj-window-prefs.c
+++ b/src/sj-window-prefs.c
@@ -326,7 +326,7 @@ sj_window_prefs_get (void)
 
         prefs = g_new (SJWindowPrefs, 1);
 
-        prefs->settings = g_settings_new ("org.gnome.SoundJuicer");
+        prefs->settings = g_settings_new ("org.gnome.sound-juicer");
         prefs->bindings = g_hash_table_new_full (NULL, NULL, NULL,
                                                 (GDestroyNotify) window_binding_unbind);