aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2012-01-17 10:09:27 +0000
committerConor Curran <conor.curran@canonical.com>2012-01-17 10:09:27 +0000
commitb59c4a873d3955cb7efbf3d93ede9446ac4cea9e (patch)
treef30f187831e4cc587361aa57243cbc4f6fe4edff
parent9be5ce8beb52b3e4b1fa820dfaca5dea8f2db80e (diff)
parent3a1bf21052b1f9939ef574a4dfa6d4c1fe74df5d (diff)
downloadayatana-indicator-sound-b59c4a873d3955cb7efbf3d93ede9446ac4cea9e.tar.gz
ayatana-indicator-sound-b59c4a873d3955cb7efbf3d93ede9446ac4cea9e.tar.bz2
ayatana-indicator-sound-b59c4a873d3955cb7efbf3d93ede9446ac4cea9e.zip
merged indicator address format to bring inline with other indicators
-rw-r--r--data/Makefile.am2
-rw-r--r--data/com.canonical.indicator.sound.gschema.xml (renamed from data/com.canonical.indicators.sound.gschema.xml)2
-rw-r--r--data/indicator-sound.service.in2
-rw-r--r--src/dbus-shared-names.h8
-rw-r--r--src/familiar-players-db.vala2
-rw-r--r--src/metadata-menu-item.vala2
-rw-r--r--src/pulseaudio-mgr.c2
-rw-r--r--src/settings-manager.vala2
-rw-r--r--src/sound-service-dbus.c4
-rw-r--r--src/sound-service.xml4
-rw-r--r--src/sound-state-manager.c2
11 files changed, 16 insertions, 16 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index f33b470..2891606 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = icons
gsettings_SCHEMAS = \
- com.canonical.indicators.sound.gschema.xml
+ com.canonical.indicator.sound.gschema.xml
@GSETTINGS_RULES@
dbus_servicesdir = $(DBUSSERVICEDIR)
diff --git a/data/com.canonical.indicators.sound.gschema.xml b/data/com.canonical.indicator.sound.gschema.xml
index f853367..ae0cc8d 100644
--- a/data/com.canonical.indicators.sound.gschema.xml
+++ b/data/com.canonical.indicator.sound.gschema.xml
@@ -1,5 +1,5 @@
<schemalist>
- <schema id="com.canonical.indicators.sound" path="/apps/indicators/sound/" gettext-domain="indicator-sound">
+ <schema id="com.canonical.indicator.sound" path="/com/canonical/indicator/sound/" gettext-domain="indicator-sound">
<key name="blacklisted-media-players" type="as">
<summary>A list of applications blacklisted from the sound menu</summary>
<default>[]</default>
diff --git a/data/indicator-sound.service.in b/data/indicator-sound.service.in
index a80cd03..4cee062 100644
--- a/data/indicator-sound.service.in
+++ b/data/indicator-sound.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=com.canonical.indicators.sound
+Name=com.canonical.indicator.sound
Exec=@libexecdir@/indicator-sound-service
diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h
index 346a031..2517eb9 100644
--- a/src/dbus-shared-names.h
+++ b/src/dbus-shared-names.h
@@ -25,10 +25,10 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef __DBUS_SHARED_NAMES_H__
#define __DBUS_SHARED_NAMES_H__
-#define INDICATOR_SOUND_DBUS_NAME "com.canonical.indicators.sound"
-#define INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH "/com/canonical/indicators/sound/menu"
-#define INDICATOR_SOUND_SERVICE_DBUS_OBJECT_PATH "/com/canonical/indicators/sound/service"
-#define INDICATOR_SOUND_DBUS_INTERFACE "com.canonical.indicators.sound"
+#define INDICATOR_SOUND_DBUS_NAME "com.canonical.indicator.sound"
+#define INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH "/com/canonical/indicator/sound/menu"
+#define INDICATOR_SOUND_SERVICE_DBUS_OBJECT_PATH "/com/canonical/indicator/sound/service"
+#define INDICATOR_SOUND_DBUS_INTERFACE "com.canonical.indicator.sound"
#define INDICATOR_SOUND_DBUS_VERSION 0
#define INDICATOR_SOUND_SIGNAL_STATE_UPDATE "SoundStateUpdate"
diff --git a/src/familiar-players-db.vala b/src/familiar-players-db.vala
index 96d690a..c47a35d 100644
--- a/src/familiar-players-db.vala
+++ b/src/familiar-players-db.vala
@@ -45,7 +45,7 @@ public class FamiliarPlayersDB : GLib.Object
this.write_db();
}
- this.dir_name = build_filename(get_user_cache_dir(), "indicators", "sound");
+ this.dir_name = build_filename(get_user_cache_dir(), "indicator", "sound");
this.file_name = build_filename(this.dir_name, "familiar-players-db.keyfile");
if(create_key_file() && check_for_keys() && load_data_from_key_file()){
debug("keyfiles in place and ready for action");
diff --git a/src/metadata-menu-item.vala b/src/metadata-menu-item.vala
index 995d248..623aaf5 100644
--- a/src/metadata-menu-item.vala
+++ b/src/metadata-menu-item.vala
@@ -24,7 +24,7 @@ using Gdk;
public class MetadataMenuitem : PlayerItem
{
- public const string ALBUM_ART_DIR_SUFFIX = "indicators/sound/album-art-cache";
+ public const string ALBUM_ART_DIR_SUFFIX = "indicator/sound/album-art-cache";
public static string album_art_cache_dir;
private static FetchFile fetcher;
diff --git a/src/pulseaudio-mgr.c b/src/pulseaudio-mgr.c
index ad6d34f..ba83c71 100644
--- a/src/pulseaudio-mgr.c
+++ b/src/pulseaudio-mgr.c
@@ -138,7 +138,7 @@ reconnect_to_pulse (gpointer user_data)
"Indicator Sound");
pa_proplist_sets (proplist,
PA_PROP_APPLICATION_ID,
- "com.canonical.indicators.sound");
+ "com.canonical.indicator.sound");
pa_proplist_sets (proplist,
PA_PROP_APPLICATION_ICON_NAME,
"multimedia-volume-control");
diff --git a/src/settings-manager.vala b/src/settings-manager.vala
index 1b99cbc..a2be080 100644
--- a/src/settings-manager.vala
+++ b/src/settings-manager.vala
@@ -26,7 +26,7 @@ public class SettingsManager : GLib.Object
public SettingsManager ( ){
}
construct{
- this.settings = new Settings ("com.canonical.indicators.sound");
+ this.settings = new Settings ("com.canonical.indicator.sound");
this.settings.changed["blacklisted-media-players"].connect (on_blacklist_event);
}
diff --git a/src/sound-service-dbus.c b/src/sound-service-dbus.c
index b69f081..5650002 100644
--- a/src/sound-service-dbus.c
+++ b/src/sound-service-dbus.c
@@ -378,7 +378,7 @@ static gboolean sound_service_dbus_blacklist_player (SoundServiceDbus* self,
gchar *str;
GVariantBuilder builder;
- our_settings = g_settings_new ("com.canonical.indicators.sound");
+ our_settings = g_settings_new ("com.canonical.indicator.sound");
the_black_list = g_settings_get_value (our_settings,
"blacklisted-media-players");
g_variant_iter_init (&iter, the_black_list);
@@ -459,7 +459,7 @@ static gboolean sound_service_dbus_is_blacklisted (SoundServiceDbus *self,
g_return_val_if_fail (player_name != NULL, FALSE);
g_return_val_if_fail (IS_SOUND_SERVICE_DBUS (self), FALSE);
- our_settings = g_settings_new ("com.canonical.indicators.sound");
+ our_settings = g_settings_new ("com.canonical.indicator.sound");
the_black_list = g_settings_get_value (our_settings,
"blacklisted-media-players");
g_variant_iter_init (&iter, the_black_list);
diff --git a/src/sound-service.xml b/src/sound-service.xml
index 796fa22..cb1d928 100644
--- a/src/sound-service.xml
+++ b/src/sound-service.xml
@@ -1,6 +1,6 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node name="/com/canonical/indicators/sound">
- <interface name="com.canonical.indicators.sound">
+<node name="/com/canonical/indicator/sound">
+ <interface name="com.canonical.indicator.sound">
<method name = "BlacklistMediaPlayer">
<annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
<arg type='s' name='player_desktop_name' direction="in"/>
diff --git a/src/sound-state-manager.c b/src/sound-state-manager.c
index ac03add..c6b14ca 100644
--- a/src/sound-state-manager.c
+++ b/src/sound-state-manager.c
@@ -78,7 +78,7 @@ sound_state_manager_init (SoundStateManager* self)
priv->notification = NULL;
priv->settings_manager = NULL;
- priv->settings_manager = g_settings_new("com.canonical.indicators.sound");
+ priv->settings_manager = g_settings_new("com.canonical.indicator.sound");
sound_state_manager_prepare_state_image_names (self);
sound_state_manager_prepare_blocked_animation (self);