The Sound Menu

Merge lp:~charlesk/indicator-sound/fix-914377 into lp:indicator-sound/fifth

  1. fix-914377
  2. Merge into trunk_5
Proposed by Charles Kerr
Status: Merged
Merged at revision: 289
Proposed branch: lp:~charlesk/indicator-sound/fix-914377
Merge into: lp:indicator-sound/fifth
Diff against target: 150 lines (+16/-16)
11 files modified
data/Makefile.am (+1/-1)
data/com.canonical.indicator.sound.gschema.xml (+1/-1)
data/indicator-sound.service.in (+1/-1)
src/dbus-shared-names.h (+4/-4)
src/familiar-players-db.vala (+1/-1)
src/metadata-menu-item.vala (+1/-1)
src/pulseaudio-mgr.c (+1/-1)
src/settings-manager.vala (+1/-1)
src/sound-service-dbus.c (+2/-2)
src/sound-service.xml (+2/-2)
src/sound-state-manager.c (+1/-1)
To merge this branch: bzr merge lp:~charlesk/indicator-sound/fix-914377
Reviewer Review Type Date Requested Status
Conor Curran (community) Approve
Review via email: mp+88091@code.launchpad.net

Description of the change

Patch to fix the schema id/path issues we talked about this afternoon and are described for LP at https://bugs.launchpad.net/indicator-sound/+bug/914377

This is a minor ticket; however I have patches for other tickes that are going to rely on this one.

To post a comment you must log in.
Revision history for this message
Conor Curran (cjcurran) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/Makefile.am'
2--- data/Makefile.am 2010-12-14 18:00:36 +0000
3+++ data/Makefile.am 2012-01-10 17:44:29 +0000
4@@ -1,7 +1,7 @@
5 SUBDIRS = icons
6
7 gsettings_SCHEMAS = \
8- com.canonical.indicators.sound.gschema.xml
9+ com.canonical.indicator.sound.gschema.xml
10 @GSETTINGS_RULES@
11
12 dbus_servicesdir = $(DBUSSERVICEDIR)
13
14=== renamed file 'data/com.canonical.indicators.sound.gschema.xml' => 'data/com.canonical.indicator.sound.gschema.xml'
15--- data/com.canonical.indicators.sound.gschema.xml 2011-04-04 10:55:31 +0000
16+++ data/com.canonical.indicator.sound.gschema.xml 2012-01-10 17:44:29 +0000
17@@ -1,5 +1,5 @@
18 <schemalist>
19- <schema id="com.canonical.indicators.sound" path="/apps/indicators/sound/" gettext-domain="indicator-sound">
20+ <schema id="com.canonical.indicator.sound" path="/com/canonical/indicator/sound/" gettext-domain="indicator-sound">
21 <key name="blacklisted-media-players" type="as">
22 <summary>A list of applications blacklisted from the sound menu</summary>
23 <default>[]</default>
24
25=== modified file 'data/indicator-sound.service.in'
26--- data/indicator-sound.service.in 2010-12-16 12:36:43 +0000
27+++ data/indicator-sound.service.in 2012-01-10 17:44:29 +0000
28@@ -1,3 +1,3 @@
29 [D-BUS Service]
30-Name=com.canonical.indicators.sound
31+Name=com.canonical.indicator.sound
32 Exec=@libexecdir@/indicator-sound-service
33
34=== modified file 'src/dbus-shared-names.h'
35--- src/dbus-shared-names.h 2011-01-26 03:24:25 +0000
36+++ src/dbus-shared-names.h 2012-01-10 17:44:29 +0000
37@@ -25,10 +25,10 @@
38 #ifndef __DBUS_SHARED_NAMES_H__
39 #define __DBUS_SHARED_NAMES_H__
40
41-#define INDICATOR_SOUND_DBUS_NAME "com.canonical.indicators.sound"
42-#define INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH "/com/canonical/indicators/sound/menu"
43-#define INDICATOR_SOUND_SERVICE_DBUS_OBJECT_PATH "/com/canonical/indicators/sound/service"
44-#define INDICATOR_SOUND_DBUS_INTERFACE "com.canonical.indicators.sound"
45+#define INDICATOR_SOUND_DBUS_NAME "com.canonical.indicator.sound"
46+#define INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH "/com/canonical/indicator/sound/menu"
47+#define INDICATOR_SOUND_SERVICE_DBUS_OBJECT_PATH "/com/canonical/indicator/sound/service"
48+#define INDICATOR_SOUND_DBUS_INTERFACE "com.canonical.indicator.sound"
49 #define INDICATOR_SOUND_DBUS_VERSION 0
50
51 #define INDICATOR_SOUND_SIGNAL_STATE_UPDATE "SoundStateUpdate"
52
53=== modified file 'src/familiar-players-db.vala'
54--- src/familiar-players-db.vala 2010-12-13 17:46:42 +0000
55+++ src/familiar-players-db.vala 2012-01-10 17:44:29 +0000
56@@ -45,7 +45,7 @@
57 this.write_db();
58 }
59
60- this.dir_name = build_filename(get_user_cache_dir(), "indicators", "sound");
61+ this.dir_name = build_filename(get_user_cache_dir(), "indicator", "sound");
62 this.file_name = build_filename(this.dir_name, "familiar-players-db.keyfile");
63 if(create_key_file() && check_for_keys() && load_data_from_key_file()){
64 debug("keyfiles in place and ready for action");
65
66=== modified file 'src/metadata-menu-item.vala'
67--- src/metadata-menu-item.vala 2011-06-14 16:24:46 +0000
68+++ src/metadata-menu-item.vala 2012-01-10 17:44:29 +0000
69@@ -24,7 +24,7 @@
70
71 public class MetadataMenuitem : PlayerItem
72 {
73- public const string ALBUM_ART_DIR_SUFFIX = "indicators/sound/album-art-cache";
74+ public const string ALBUM_ART_DIR_SUFFIX = "indicator/sound/album-art-cache";
75
76 public static string album_art_cache_dir;
77 private static FetchFile fetcher;
78
79=== modified file 'src/pulseaudio-mgr.c'
80--- src/pulseaudio-mgr.c 2011-10-26 15:07:46 +0000
81+++ src/pulseaudio-mgr.c 2012-01-10 17:44:29 +0000
82@@ -138,7 +138,7 @@
83 "Indicator Sound");
84 pa_proplist_sets (proplist,
85 PA_PROP_APPLICATION_ID,
86- "com.canonical.indicators.sound");
87+ "com.canonical.indicator.sound");
88 pa_proplist_sets (proplist,
89 PA_PROP_APPLICATION_ICON_NAME,
90 "multimedia-volume-control");
91
92=== modified file 'src/settings-manager.vala'
93--- src/settings-manager.vala 2011-04-04 10:55:31 +0000
94+++ src/settings-manager.vala 2012-01-10 17:44:29 +0000
95@@ -26,7 +26,7 @@
96 public SettingsManager ( ){
97 }
98 construct{
99- this.settings = new Settings ("com.canonical.indicators.sound");
100+ this.settings = new Settings ("com.canonical.indicator.sound");
101 this.settings.changed["blacklisted-media-players"].connect (on_blacklist_event);
102 }
103
104
105=== modified file 'src/sound-service-dbus.c'
106--- src/sound-service-dbus.c 2011-08-10 16:16:04 +0000
107+++ src/sound-service-dbus.c 2012-01-10 17:44:29 +0000
108@@ -378,7 +378,7 @@
109 gchar *str;
110 GVariantBuilder builder;
111
112- our_settings = g_settings_new ("com.canonical.indicators.sound");
113+ our_settings = g_settings_new ("com.canonical.indicator.sound");
114 the_black_list = g_settings_get_value (our_settings,
115 "blacklisted-media-players");
116 g_variant_iter_init (&iter, the_black_list);
117@@ -459,7 +459,7 @@
118 g_return_val_if_fail (player_name != NULL, FALSE);
119 g_return_val_if_fail (IS_SOUND_SERVICE_DBUS (self), FALSE);
120
121- our_settings = g_settings_new ("com.canonical.indicators.sound");
122+ our_settings = g_settings_new ("com.canonical.indicator.sound");
123 the_black_list = g_settings_get_value (our_settings,
124 "blacklisted-media-players");
125 g_variant_iter_init (&iter, the_black_list);
126
127=== modified file 'src/sound-service.xml'
128--- src/sound-service.xml 2011-06-21 16:26:10 +0000
129+++ src/sound-service.xml 2012-01-10 17:44:29 +0000
130@@ -1,6 +1,6 @@
131 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
132-<node name="/com/canonical/indicators/sound">
133- <interface name="com.canonical.indicators.sound">
134+<node name="/com/canonical/indicator/sound">
135+ <interface name="com.canonical.indicator.sound">
136 <method name = "BlacklistMediaPlayer">
137 <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
138 <arg type='s' name='player_desktop_name' direction="in"/>
139
140=== modified file 'src/sound-state-manager.c'
141--- src/sound-state-manager.c 2011-04-05 03:14:19 +0000
142+++ src/sound-state-manager.c 2012-01-10 17:44:29 +0000
143@@ -78,7 +78,7 @@
144 priv->notification = NULL;
145 priv->settings_manager = NULL;
146
147- priv->settings_manager = g_settings_new("com.canonical.indicators.sound");
148+ priv->settings_manager = g_settings_new("com.canonical.indicator.sound");
149
150 sound_state_manager_notification_init (self);
151

Subscribers

People subscribed via source and target branches