[banshee] [MultimediaKeys] Use a different app name when debugging
- From: Alexander Kojevnikov <alexk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] [MultimediaKeys] Use a different app name when debugging
- Date: Sun, 14 Mar 2010 03:19:10 +0000 (UTC)
commit a76aaf43e629495fdc778471e705e1f65f8e6697
Author: Alexander Kojevnikov <alexander kojevnikov com>
Date: Sun Mar 14 14:13:05 2010 +1100
[MultimediaKeys] Use a different app name when debugging
Fixes an annoying issue when `make run` grabs multimedia keys
from the installed version of Banshee happily running in the
background and doesn't return them back to it on exit.
.../MultimediaKeysService.cs | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys/MultimediaKeysService.cs b/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys/MultimediaKeysService.cs
index b11d190..4cb0d81 100644
--- a/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys/MultimediaKeysService.cs
+++ b/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys/MultimediaKeysService.cs
@@ -67,8 +67,14 @@ namespace Banshee.MultimediaKeys
private ISettingsDaemon222 settings_daemon_222;
private ISettingsDaemon220 settings_daemon_220;
+ private readonly string app_name;
+
public MultimediaKeysService ()
{
+ app_name = Application.InternalName;
+ if (ApplicationContext.Debugging) {
+ app_name += "-debug";
+ }
}
void IExtensionService.Initialize ()
@@ -98,7 +104,7 @@ namespace Banshee.MultimediaKeys
try {
settings_daemon_222 = Bus.Session.GetObject<ISettingsDaemon222> (BusName,
new ObjectPath (ObjectPath + "/MediaKeys"));
- settings_daemon_222.GrabMediaPlayerKeys (Application.InternalName, 0);
+ settings_daemon_222.GrabMediaPlayerKeys (app_name, 0);
settings_daemon_222.MediaPlayerKeyPressed += OnMediaPlayerKeyPressed;
Log.Debug ("Using GNOME 2.22 API for Multimedia Keys");
@@ -108,7 +114,7 @@ namespace Banshee.MultimediaKeys
try {
settings_daemon_220 = Bus.Session.GetObject<ISettingsDaemon220> (BusName,
new ObjectPath (ObjectPath));
- settings_daemon_220.GrabMediaPlayerKeys (Application.InternalName, 0);
+ settings_daemon_220.GrabMediaPlayerKeys (app_name, 0);
settings_daemon_220.MediaPlayerKeyPressed += OnMediaPlayerKeyPressed;
Log.Debug ("Using GNOME 2.20 API for Multimedia keys");
@@ -123,20 +129,20 @@ namespace Banshee.MultimediaKeys
{
if (settings_daemon_222 != null) {
settings_daemon_222.MediaPlayerKeyPressed -= OnMediaPlayerKeyPressed;
- settings_daemon_222.ReleaseMediaPlayerKeys (Application.InternalName);
+ settings_daemon_222.ReleaseMediaPlayerKeys (app_name);
settings_daemon_222 = null;
}
if (settings_daemon_220 != null) {
settings_daemon_220.MediaPlayerKeyPressed -= OnMediaPlayerKeyPressed;
- settings_daemon_220.ReleaseMediaPlayerKeys (Application.InternalName);
+ settings_daemon_220.ReleaseMediaPlayerKeys (app_name);
settings_daemon_220 = null;
}
}
private void OnMediaPlayerKeyPressed (string application, string key)
{
- if (application != Application.InternalName) {
+ if (application != app_name) {
return;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]