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
=== modified file 'data/Makefile.am'
--- data/Makefile.am 2010-12-14 18:00:36 +0000
+++ data/Makefile.am 2012-01-10 17:44:29 +0000
@@ -1,7 +1,7 @@
1SUBDIRS = icons1SUBDIRS = icons
22
3gsettings_SCHEMAS = \3gsettings_SCHEMAS = \
4 com.canonical.indicators.sound.gschema.xml4 com.canonical.indicator.sound.gschema.xml
5@GSETTINGS_RULES@5@GSETTINGS_RULES@
66
7dbus_servicesdir = $(DBUSSERVICEDIR)7dbus_servicesdir = $(DBUSSERVICEDIR)
88
=== renamed file 'data/com.canonical.indicators.sound.gschema.xml' => 'data/com.canonical.indicator.sound.gschema.xml'
--- data/com.canonical.indicators.sound.gschema.xml 2011-04-04 10:55:31 +0000
+++ data/com.canonical.indicator.sound.gschema.xml 2012-01-10 17:44:29 +0000
@@ -1,5 +1,5 @@
1<schemalist>1<schemalist>
2 <schema id="com.canonical.indicators.sound" path="/apps/indicators/sound/" gettext-domain="indicator-sound">2 <schema id="com.canonical.indicator.sound" path="/com/canonical/indicator/sound/" gettext-domain="indicator-sound">
3 <key name="blacklisted-media-players" type="as">3 <key name="blacklisted-media-players" type="as">
4 <summary>A list of applications blacklisted from the sound menu</summary>4 <summary>A list of applications blacklisted from the sound menu</summary>
5 <default>[]</default>5 <default>[]</default>
66
=== modified file 'data/indicator-sound.service.in'
--- data/indicator-sound.service.in 2010-12-16 12:36:43 +0000
+++ data/indicator-sound.service.in 2012-01-10 17:44:29 +0000
@@ -1,3 +1,3 @@
1[D-BUS Service]1[D-BUS Service]
2Name=com.canonical.indicators.sound2Name=com.canonical.indicator.sound
3Exec=@libexecdir@/indicator-sound-service3Exec=@libexecdir@/indicator-sound-service
44
=== modified file 'src/dbus-shared-names.h'
--- src/dbus-shared-names.h 2011-01-26 03:24:25 +0000
+++ src/dbus-shared-names.h 2012-01-10 17:44:29 +0000
@@ -25,10 +25,10 @@
25#ifndef __DBUS_SHARED_NAMES_H__25#ifndef __DBUS_SHARED_NAMES_H__
26#define __DBUS_SHARED_NAMES_H__26#define __DBUS_SHARED_NAMES_H__
2727
28#define INDICATOR_SOUND_DBUS_NAME "com.canonical.indicators.sound"28#define INDICATOR_SOUND_DBUS_NAME "com.canonical.indicator.sound"
29#define INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH "/com/canonical/indicators/sound/menu"29#define INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH "/com/canonical/indicator/sound/menu"
30#define INDICATOR_SOUND_SERVICE_DBUS_OBJECT_PATH "/com/canonical/indicators/sound/service"30#define INDICATOR_SOUND_SERVICE_DBUS_OBJECT_PATH "/com/canonical/indicator/sound/service"
31#define INDICATOR_SOUND_DBUS_INTERFACE "com.canonical.indicators.sound"31#define INDICATOR_SOUND_DBUS_INTERFACE "com.canonical.indicator.sound"
32#define INDICATOR_SOUND_DBUS_VERSION 032#define INDICATOR_SOUND_DBUS_VERSION 0
3333
34#define INDICATOR_SOUND_SIGNAL_STATE_UPDATE "SoundStateUpdate"34#define INDICATOR_SOUND_SIGNAL_STATE_UPDATE "SoundStateUpdate"
3535
=== modified file 'src/familiar-players-db.vala'
--- src/familiar-players-db.vala 2010-12-13 17:46:42 +0000
+++ src/familiar-players-db.vala 2012-01-10 17:44:29 +0000
@@ -45,7 +45,7 @@
45 this.write_db();45 this.write_db();
46 }46 }
47 47
48 this.dir_name = build_filename(get_user_cache_dir(), "indicators", "sound");48 this.dir_name = build_filename(get_user_cache_dir(), "indicator", "sound");
49 this.file_name = build_filename(this.dir_name, "familiar-players-db.keyfile");49 this.file_name = build_filename(this.dir_name, "familiar-players-db.keyfile");
50 if(create_key_file() && check_for_keys() && load_data_from_key_file()){50 if(create_key_file() && check_for_keys() && load_data_from_key_file()){
51 debug("keyfiles in place and ready for action"); 51 debug("keyfiles in place and ready for action");
5252
=== modified file 'src/metadata-menu-item.vala'
--- src/metadata-menu-item.vala 2011-06-14 16:24:46 +0000
+++ src/metadata-menu-item.vala 2012-01-10 17:44:29 +0000
@@ -24,7 +24,7 @@
2424
25public class MetadataMenuitem : PlayerItem25public class MetadataMenuitem : PlayerItem
26{26{
27 public const string ALBUM_ART_DIR_SUFFIX = "indicators/sound/album-art-cache"; 27 public const string ALBUM_ART_DIR_SUFFIX = "indicator/sound/album-art-cache";
28 28
29 public static string album_art_cache_dir;29 public static string album_art_cache_dir;
30 private static FetchFile fetcher;30 private static FetchFile fetcher;
3131
=== modified file 'src/pulseaudio-mgr.c'
--- src/pulseaudio-mgr.c 2011-10-26 15:07:46 +0000
+++ src/pulseaudio-mgr.c 2012-01-10 17:44:29 +0000
@@ -138,7 +138,7 @@
138 "Indicator Sound");138 "Indicator Sound");
139 pa_proplist_sets (proplist,139 pa_proplist_sets (proplist,
140 PA_PROP_APPLICATION_ID,140 PA_PROP_APPLICATION_ID,
141 "com.canonical.indicators.sound");141 "com.canonical.indicator.sound");
142 pa_proplist_sets (proplist,142 pa_proplist_sets (proplist,
143 PA_PROP_APPLICATION_ICON_NAME,143 PA_PROP_APPLICATION_ICON_NAME,
144 "multimedia-volume-control");144 "multimedia-volume-control");
145145
=== modified file 'src/settings-manager.vala'
--- src/settings-manager.vala 2011-04-04 10:55:31 +0000
+++ src/settings-manager.vala 2012-01-10 17:44:29 +0000
@@ -26,7 +26,7 @@
26 public SettingsManager ( ){26 public SettingsManager ( ){
27 }27 }
28 construct{28 construct{
29 this.settings = new Settings ("com.canonical.indicators.sound");29 this.settings = new Settings ("com.canonical.indicator.sound");
30 this.settings.changed["blacklisted-media-players"].connect (on_blacklist_event); 30 this.settings.changed["blacklisted-media-players"].connect (on_blacklist_event);
31 }31 }
32 32
3333
=== modified file 'src/sound-service-dbus.c'
--- src/sound-service-dbus.c 2011-08-10 16:16:04 +0000
+++ src/sound-service-dbus.c 2012-01-10 17:44:29 +0000
@@ -378,7 +378,7 @@
378 gchar *str;378 gchar *str;
379 GVariantBuilder builder;379 GVariantBuilder builder;
380380
381 our_settings = g_settings_new ("com.canonical.indicators.sound");381 our_settings = g_settings_new ("com.canonical.indicator.sound");
382 the_black_list = g_settings_get_value (our_settings,382 the_black_list = g_settings_get_value (our_settings,
383 "blacklisted-media-players"); 383 "blacklisted-media-players");
384 g_variant_iter_init (&iter, the_black_list);384 g_variant_iter_init (&iter, the_black_list);
@@ -459,7 +459,7 @@
459 g_return_val_if_fail (player_name != NULL, FALSE);459 g_return_val_if_fail (player_name != NULL, FALSE);
460 g_return_val_if_fail (IS_SOUND_SERVICE_DBUS (self), FALSE);460 g_return_val_if_fail (IS_SOUND_SERVICE_DBUS (self), FALSE);
461461
462 our_settings = g_settings_new ("com.canonical.indicators.sound");462 our_settings = g_settings_new ("com.canonical.indicator.sound");
463 the_black_list = g_settings_get_value (our_settings,463 the_black_list = g_settings_get_value (our_settings,
464 "blacklisted-media-players");464 "blacklisted-media-players");
465 g_variant_iter_init (&iter, the_black_list);465 g_variant_iter_init (&iter, the_black_list);
466466
=== modified file 'src/sound-service.xml'
--- src/sound-service.xml 2011-06-21 16:26:10 +0000
+++ src/sound-service.xml 2012-01-10 17:44:29 +0000
@@ -1,6 +1,6 @@
1<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">1<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
2<node name="/com/canonical/indicators/sound">2<node name="/com/canonical/indicator/sound">
3 <interface name="com.canonical.indicators.sound">3 <interface name="com.canonical.indicator.sound">
4 <method name = "BlacklistMediaPlayer">4 <method name = "BlacklistMediaPlayer">
5 <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>5 <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
6 <arg type='s' name='player_desktop_name' direction="in"/>6 <arg type='s' name='player_desktop_name' direction="in"/>
77
=== modified file 'src/sound-state-manager.c'
--- src/sound-state-manager.c 2011-04-05 03:14:19 +0000
+++ src/sound-state-manager.c 2012-01-10 17:44:29 +0000
@@ -78,7 +78,7 @@
78 priv->notification = NULL; 78 priv->notification = NULL;
79 priv->settings_manager = NULL;79 priv->settings_manager = NULL;
8080
81 priv->settings_manager = g_settings_new("com.canonical.indicators.sound");81 priv->settings_manager = g_settings_new("com.canonical.indicator.sound");
8282
83 sound_state_manager_notification_init (self);83 sound_state_manager_notification_init (self);
84 84

Subscribers

People subscribed via source and target branches