bluetooth: Release MediaEnpoint if card profile is set to Off

[pulseaudio] / src / modules / module-console-kit.c

diff --git a/src/modules/module-console-kit.c b/src/modules/module-console-kit.c
index e1933c282326737a6507c1592aa7edfcfd6c2b68..4c5857cf28f3e084c5b86d6930b608eb0dcfc280 100644 (file)
--- a/src/modules/module-console-kit.c
+++ b/src/modules/module-console-kit.c
@@ -5,7 +5,7 @@
 
     PulseAudio is free software; you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published
 
     PulseAudio is free software; you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published

-    by the Free Software Foundation; either version 2 of the License,
+    by the Free Software Foundation; either version 2.1 of the License,

     or (at your option) any later version.
 
     PulseAudio is distributed in the hope that it will be useful, but
     or (at your option) any later version.
 
     PulseAudio is distributed in the hope that it will be useful, but


@@ -25,27 +25,20 @@
 
 #include <stdio.h>
 #include <unistd.h>
 
 #include <stdio.h>
 #include <unistd.h>

-#include <string.h>

 #include <stdlib.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/types.h>

-#include <sys/stat.h>

 
 #include <pulse/xmalloc.h>
 
 #include <pulse/xmalloc.h>

-#include <pulse/timeval.h>

 
 

-#include <pulsecore/core-error.h>

 #include <pulsecore/module.h>
 #include <pulsecore/log.h>
 #include <pulsecore/hashmap.h>
 #include <pulsecore/idxset.h>
 #include <pulsecore/module.h>
 #include <pulsecore/log.h>
 #include <pulsecore/hashmap.h>
 #include <pulsecore/idxset.h>

-#include <pulsecore/core-util.h>
-#include <pulsecore/namereg.h>
-#include <pulsecore/core-scache.h>

 #include <pulsecore/modargs.h>
 #include <pulsecore/modargs.h>

+#include <pulsecore/dbus-shared.h>

 
 

-#include "dbus-util.h"

 #include "module-console-kit-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering");
 #include "module-console-kit-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering");


@@ -63,9 +56,11 @@ struct session {
 };
 
 struct userdata {
 };
 
 struct userdata {

+    pa_module *module;

     pa_core *core;
     pa_dbus_connection *connection;
     pa_hashmap *sessions;
     pa_core *core;
     pa_dbus_connection *connection;
     pa_hashmap *sessions;

+    pa_bool_t filter_added;

 };
 
 static void add_session(struct userdata *u, const char *id) {
 };
 
 static void add_session(struct userdata *u, const char *id) {


@@ -73,9 +68,9 @@ static void add_session(struct userdata *u, const char *id) {
     DBusMessage *m = NULL, *reply = NULL;
     uint32_t uid;
     struct session *session;
     DBusMessage *m = NULL, *reply = NULL;
     uint32_t uid;
     struct session *session;

-    char *t;
+    pa_client_new_data data;

 
 

-    dbus_error_init (&error);
+    dbus_error_init(&error);

 
     if (pa_hashmap_get(u->sessions, id)) {
         pa_log_warn("Duplicate session %s, ignoring.", id);
 
     if (pa_hashmap_get(u->sessions, id)) {
         pa_log_warn("Duplicate session %s, ignoring.", id);


@@ -109,11 +104,19 @@ static void add_session(struct userdata *u, const char *id) {
     session = pa_xnew(struct session, 1);
     session->id = pa_xstrdup(id);
 
     session = pa_xnew(struct session, 1);
     session->id = pa_xstrdup(id);
 

-    t = pa_sprintf_malloc("ConsoleKit Session %s", id);
-    session->client = pa_client_new(u->core, __FILE__, t);
-    pa_xfree(t);
-
-    pa_proplist_sets(session->client->proplist, "console-kit.session", id);
+    pa_client_new_data_init(&data);
+    data.module = u->module;
+    data.driver = __FILE__;
+    pa_proplist_setf(data.proplist, PA_PROP_APPLICATION_NAME, "ConsoleKit Session %s", id);
+    pa_proplist_sets(data.proplist, "console-kit.session", id);
+    session->client = pa_client_new(u->core, &data);
+    pa_client_new_data_done(&data);
+
+    if (!session->client) {
+        pa_xfree(session->id);
+        pa_xfree(session);
+        goto fail;
+    }

 
     pa_hashmap_put(u->sessions, session->id, session);
 
 
     pa_hashmap_put(u->sessions, session->id, session);
 


@@ -178,7 +181,6 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo
         }
 
         add_session(u, path);
         }
 
         add_session(u, path);

-        return DBUS_HANDLER_RESULT_HANDLED;

 
     } else if (dbus_message_is_signal(message, "org.freedesktop.ConsoleKit.Seat", "SessionRemoved")) {
 
 
     } else if (dbus_message_is_signal(message, "org.freedesktop.ConsoleKit.Seat", "SessionRemoved")) {
 


@@ -193,7 +195,6 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo
         }
 
         remove_session(u, path);
         }
 
         remove_session(u, path);

-        return DBUS_HANDLER_RESULT_HANDLED;

     }
 
 finish:
     }
 
 finish:


@@ -293,8 +294,9 @@ int pa__init(pa_module*m) {
         goto fail;
     }
 
         goto fail;
     }
 

-    m->userdata = u = pa_xnew(struct userdata, 1);
+    m->userdata = u = pa_xnew0(struct userdata, 1);

     u->core = m->core;
     u->core = m->core;

+    u->module = m;

     u->connection = connection;
     u->sessions = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
 
     u->connection = connection;
     u->sessions = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
 


@@ -303,8 +305,12 @@ int pa__init(pa_module*m) {
         goto fail;
     }
 
         goto fail;
     }
 

-    dbus_bus_add_match(pa_dbus_connection_get(connection), "type='signal',sender='org.freedesktop.ConsoleKit', interface='org.freedesktop.ConsoleKit.Seat'", &error);
-    if (dbus_error_is_set(&error)) {
+    u->filter_added = TRUE;
+
+    if (pa_dbus_add_matches(
+                pa_dbus_connection_get(connection), &error,
+                "type='signal',sender='org.freedesktop.ConsoleKit',interface='org.freedesktop.ConsoleKit.Seat',member='SessionAdded'",
+                "type='signal',sender='org.freedesktop.ConsoleKit',interface='org.freedesktop.ConsoleKit.Seat',member='SessionRemoved'", NULL) < 0) {

         pa_log_error("Unable to subscribe to ConsoleKit signals: %s: %s", error.name, error.message);
         goto fail;
     }
         pa_log_error("Unable to subscribe to ConsoleKit signals: %s: %s", error.name, error.message);
         goto fail;
     }


@@ -344,13 +350,13 @@ void pa__done(pa_module *m) {
     }
 
     if (u->connection) {
     }
 
     if (u->connection) {

-        DBusError error;
-        dbus_error_init(&error);
-
-        dbus_bus_remove_match(pa_dbus_connection_get(u->connection), "type='signal',sender='org.freedesktop.ConsoleKit', interface='org.freedesktop.ConsoleKit.Seat'", &error);
-        dbus_error_free(&error);
+        pa_dbus_remove_matches(
+                pa_dbus_connection_get(u->connection),
+                "type='signal',sender='org.freedesktop.ConsoleKit',interface='org.freedesktop.ConsoleKit.Seat',member='SessionAdded'",
+                "type='signal',sender='org.freedesktop.ConsoleKit',interface='org.freedesktop.ConsoleKit.Seat',member='SessionRemoved'", NULL);

 
 

-        dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u);
+        if (u->filter_added)
+            dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u);

 
         pa_dbus_connection_unref(u->connection);
     }
 
         pa_dbus_connection_unref(u->connection);
     }