From 537e5b2988815287e6bb3da35189e5c65c5ac4b2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 12 Feb 2014 16:49:31 -0600 Subject: Move the player list outside of the service creation --- src/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index f8635c8..0a893b3 100644 --- a/src/main.c +++ b/src/main.c @@ -21,9 +21,12 @@ main (int argc, char ** argv) { /* Initialize libnotify */ notify_init ("indicator-sound"); + MediaPlayerList * playerlist = MEDIA_PLAYER_LIST(media_player_list_mpris_new()); - service = indicator_sound_service_new (); + service = indicator_sound_service_new (playerlist); result = indicator_sound_service_run (service); + + g_object_unref(playerlist); g_object_unref(service); return result; -- cgit v1.2.3 From 0b76536b27f57db75a101e8ce7e3f75b7cddf57c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 12 Feb 2014 17:07:33 -0600 Subject: Detect which player list we need at startup --- src/main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 0a893b3..a14bdea 100644 --- a/src/main.c +++ b/src/main.c @@ -21,7 +21,13 @@ main (int argc, char ** argv) { /* Initialize libnotify */ notify_init ("indicator-sound"); - MediaPlayerList * playerlist = MEDIA_PLAYER_LIST(media_player_list_mpris_new()); + MediaPlayerList * playerlist = NULL; + + if (g_strcmp0("lightdm", g_get_user_name())) { + playerlist = MEDIA_PLAYER_LIST(media_player_list_greeter_new()); + } else { + playerlist = MEDIA_PLAYER_LIST(media_player_list_mpris_new()); + } service = indicator_sound_service_new (playerlist); result = indicator_sound_service_run (service); -- cgit v1.2.3 From e9216681e8644d91d8efc2aff76810d9172e48a6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 25 Feb 2014 16:47:45 -0600 Subject: Truth is difficult --- src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index a14bdea..e9a148e 100644 --- a/src/main.c +++ b/src/main.c @@ -23,7 +23,7 @@ main (int argc, char ** argv) { MediaPlayerList * playerlist = NULL; - if (g_strcmp0("lightdm", g_get_user_name())) { + if (g_strcmp0("lightdm", g_get_user_name()) == 0) { playerlist = MEDIA_PLAYER_LIST(media_player_list_greeter_new()); } else { playerlist = MEDIA_PLAYER_LIST(media_player_list_mpris_new()); -- cgit v1.2.3