← Back to branch summary

~ubuntu-branches/ubuntu/vivid/bluez/vivid

« back to all changes in this revision

Viewing changes to debian/patches/git-57170b3-fix_network_connect_method.patch

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-08-13 17:16:30 UTC
  • Revision ID: package-import@ubuntu.com-20120813171630-2h2o5fakcpwfafhx
Tags: 4.101-0ubuntu4
https://launchpad.net/bugs/1036241
https://launchpad.net/bugs/1026378
* debian/patches/git-57170b3-fix_network_connect_method.patch: set the correct
  parameters and return values for the org.bluez.Network Connect() method.
  (LP: #1036241)
* debian/patches/git-2f92669-permit_concurrent_ag_hf.patch: allow AG and HF
  roles to be enabled concurrently; should fix cases where HFP/HSP doesn't
  show in pulseaudio (where the plugin fails to start) (LP: #1026378)
* debian/patches/git-a66a557-gdbus_missing_flags.patch: upstream converted
  to using GDBus macros, but some flags got lost in the process. Fix them.
* debian/patches/git-b57c64f-network-null-deref.patch: fix an issue with
  NULL dereferencing when evaluating network interface names/indexes.
* debian/patches/git-ea793cb-input_io_channel_watches.patch: Ensure input
  IO channel watches are always properly added when channels are connected.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/git-57170b3-fix_network_connect_method.patch
 
1
From 57170b311f1468330f4a9961dc0b3ac45f97bc13 Mon Sep 17 00:00:00 2001
 
2
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
 
3
Date: Sat, 30 Jun 2012 00:39:05 -0300
 
4
Subject: [PATCH] network: fix network Connect() method parameters
 
5
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1036241
 
6
 
 
7
---
 
8
 network/connection.c |    4 +++-
 
9
 1 files changed, 3 insertions(+), 1 deletions(-)
 
10
 
 
11
diff --git a/network/connection.c b/network/connection.c
 
12
index 544ec3a..59423a9 100644
 
13
--- a/network/connection.c
 
14
+++ b/network/connection.c
 
15
@@ -554,7 +554,9 @@ static void path_unregister(void *data)
 
16
 
 
17
 static const GDBusMethodTable connection_methods[] = {
 
18
        { GDBUS_ASYNC_METHOD("Connect",
 
19
-                       NULL, NULL, connection_connect) },
 
20
+                               GDBUS_ARGS({"uuid", "s"}),
 
21
+                               GDBUS_ARGS({"interface", "s"}),
 
22
+                               connection_connect) },
 
23
        { GDBUS_METHOD("Disconnect",
 
24
                        NULL, NULL, connection_disconnect) },
 
25
        { GDBUS_METHOD("GetProperties",
 
26
-- 
 
27
1.7.6.5
 
28