rpms/bluez-gnome/devel bluez-gnome-1.3-input.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 bluez-gnome.spec, 1.52, 1.53 sources, 1.23, 1.24 bluez-gnome-0.28-services.patch, 1.1, NONE bluez-gnome-remove-class-file-sharing.patch, 1.1, NONE
David Woodhouse
dwmw2 at fedoraproject.org
Thu Sep 11 02:16:43 UTC 2008
- Previous message: rpms/bluez/devel bluetooth.conf, NONE, 1.1 bluetooth.init, NONE, 1.1 bluez-4.4-input.patch, NONE, 1.1 bluez-utils-oui-usage.patch, NONE, 1.1 bluez.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: [pkgdb] eclipse-nls was added for seanf
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwmw2
Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32052
Modified Files:
.cvsignore bluez-gnome.spec sources
Added Files:
bluez-gnome-1.3-input.patch
Removed Files:
bluez-gnome-0.28-services.patch
bluez-gnome-remove-class-file-sharing.patch
Log Message:
1.3
bluez-gnome-1.3-input.patch:
--- NEW FILE bluez-gnome-1.3-input.patch ---
diff --git a/common/bluetooth-agent.c b/common/bluetooth-agent.c
index f6106ad..bdc20b6 100644
--- a/common/bluetooth-agent.c
+++ b/common/bluetooth-agent.c
@@ -229,6 +229,22 @@ static gboolean bluetooth_agent_authorize(BluetoothAgent *agent,
return result;
}
+static gboolean bluetooth_agent_confirm_mode(BluetoothAgent *agent,
+ const char *mode, DBusGMethodInvocation *context)
+{
+ BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
+ const char *sender = dbus_g_method_get_sender(context);
+
+ DBG("agent %p sender %s", agent, sender);
+
+ if (g_str_equal(sender, priv->busname) == FALSE)
+ return FALSE;
+
+ dbus_g_method_return(context);
+
+ return TRUE;
+}
+
static gboolean bluetooth_agent_cancel(BluetoothAgent *agent,
DBusGMethodInvocation *context)
{
diff --git a/common/bluetooth-agent.xml b/common/bluetooth-agent.xml
index 052818c..478177c 100644
--- a/common/bluetooth-agent.xml
+++ b/common/bluetooth-agent.xml
@@ -33,6 +33,11 @@
<arg type="s" name="uuid"/>
</method>
+ <method name="ConfirmMode">
+ <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+ <arg type="s" name="mode"/>
+ </method>
+
<method name="Cancel">
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
</method>
diff --git a/common/bluetooth-client.c b/common/bluetooth-client.c
index f74744b..a54dfeb 100644
--- a/common/bluetooth-client.c
+++ b/common/bluetooth-client.c
@@ -57,6 +57,7 @@
#define BLUEZ_MANAGER_INTERFACE "org.bluez.Manager"
#define BLUEZ_ADAPTER_INTERFACE "org.bluez.Adapter"
#define BLUEZ_DEVICE_INTERFACE "org.bluez.Device"
+#define BLUEZ_INPUT_INTERFACE "org.bluez.Input"
static DBusGConnection *connection = NULL;
static BluetoothClient *bluetooth_client = NULL;
@@ -999,3 +1000,57 @@ gboolean bluetooth_client_create_device(BluetoothClient *client,
return TRUE;
}
+
+typedef struct {
+ BluetoothClientConnectFunc func;
+ gpointer data;
+} ConnectData;
+
+static void connect_input_callback(DBusGProxy *proxy,
+ DBusGProxyCall *call, void *user_data)
+{
+ ConnectData *conndata = user_data;
+ GError *error = NULL;
+
+ dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_INVALID);
+
+ if (error != NULL)
+ g_error_free(error);
+
+ if (conndata->func)
+ conndata->func(conndata->data);
+
+ g_object_unref(proxy);
+}
+
+gboolean bluetooth_client_connect_input(BluetoothClient *client,
+ const char *device,
+ BluetoothClientConnectFunc func, gpointer data)
+{
+ BluetoothClientPrivate *priv = BLUETOOTH_CLIENT_GET_PRIVATE(client);
+ ConnectData *conndata;
+ DBusGProxy *proxy;
+ DBusGProxyCall *call;
+
+ DBG("client %p", client);
+
+ proxy = dbus_g_proxy_new_from_proxy(priv->manager,
+ BLUEZ_INPUT_INTERFACE, device);
+ if (proxy == NULL)
+ return FALSE;
+
+ conndata = g_try_new0(ConnectData, 1);
+ if (conndata == NULL) {
+ g_object_unref(proxy);
+ return FALSE;
+ }
+
+ conndata->func = func;
+ conndata->data = data;
+
+ call = dbus_g_proxy_begin_call(proxy, "Connect",
+ connect_input_callback, conndata, g_free,
+ G_TYPE_INVALID);
+
+ return TRUE;
+}
diff --git a/common/bluetooth-client.h b/common/bluetooth-client.h
index 32ed1bd..bf1a313 100644
--- a/common/bluetooth-client.h
+++ b/common/bluetooth-client.h
@@ -79,6 +79,12 @@ gboolean bluetooth_client_create_device(BluetoothClient *client,
const char *address, const char *agent,
BluetoothClientCreateDeviceFunc func, gpointer data);
+typedef void (*BluetoothClientConnectFunc) (gpointer data);
+
+gboolean bluetooth_client_connect_input(BluetoothClient *client,
+ const char *device,
+ BluetoothClientConnectFunc, gpointer data);
+
enum {
BLUETOOTH_COLUMN_PROXY,
BLUETOOTH_COLUMN_ADDRESS,
diff --git a/wizard/main.c b/wizard/main.c
index f41083a..5f1b8e2 100644
--- a/wizard/main.c
+++ b/wizard/main.c
@@ -96,6 +96,10 @@ static gboolean cancel_callback(DBusGMethodInvocation *context,
return TRUE;
}
+static void connect_callback(gpointer user_data)
+{
+}
+
static void create_callback(const char *path, gpointer user_data)
{
GtkAssistant *assistant = user_data;
@@ -112,6 +116,11 @@ static void create_callback(const char *path, gpointer user_data)
if (page > 0)
gtk_assistant_set_current_page(assistant, page + 1);
+ if (target_type == BLUETOOTH_TYPE_KEYBOARD ||
+ target_type == BLUETOOTH_TYPE_MOUSE)
+ bluetooth_client_connect_input(client, path,
+ connect_callback, assistant);
+
complete = TRUE;
} else
text = g_strdup_printf(_("Pairing with %s failed"),
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 8 Aug 2008 10:35:02 -0000 1.23
+++ .cvsignore 11 Sep 2008 02:16:12 -0000 1.24
@@ -1 +1 @@
-bluez-gnome-0.28.tar.gz
+bluez-gnome-1.3.tar.gz
Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- bluez-gnome.spec 10 Sep 2008 06:13:13 -0000 1.52
+++ bluez-gnome.spec 11 Sep 2008 02:16:13 -0000 1.53
@@ -1,14 +1,13 @@
Name: bluez-gnome
-Version: 0.28
-Release: 3%{?dist}
+Version: 1.3
+Release: 1%{?dist}
Summary: Bluetooth pairing and control applet
Group: Applications/System
License: GPLv2+
URL: http://www.bluez.org/
Source0: http://bluez.sf.net/download/%{name}-%{version}.tar.gz
-Patch1: bluez-gnome-remove-class-file-sharing.patch
-Patch2: bluez-gnome-0.28-services.patch
+Patch1: bluez-gnome-1.3-input.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,8 +45,7 @@
%prep
%setup -q
-%patch1 -p0 -b .remove-class
-%patch2 -p1 -b .services
+%patch1 -p1 -b .input
%build
%configure --disable-mime-update --disable-desktop-update --disable-icon-update
@@ -120,10 +118,12 @@
%{_bindir}/bluetooth-applet
%{_bindir}/bluetooth-properties
%{_bindir}/bluetooth-sendto
+%{_bindir}/bluetooth-wizard
%config %{_sysconfdir}/gconf/schemas/*
%{_datadir}/gnome/autostart/bluetooth-applet.desktop
%{_datadir}/man/man1/bluetooth-applet.1.gz
%{_datadir}/man/man1/bluetooth-properties.1.gz
+%{_datadir}/man/man1/bluetooth-wizard.1.gz
%{_datadir}/applications/bluetooth-properties.desktop
%{_datadir}/mime/packages/bluetooth-manager.xml
%{_datadir}/icons/hicolor/*/apps/*
@@ -136,6 +136,9 @@
%{_datadir}/man/man1/bluetooth-analyzer.1.gz
%changelog
+* Wed Sep 10 2008 - David Woodhouse <David.Woodhouse at intel.com> - 1.3-1
+- Update to 1.3
+
* Tue Sep 09 2008 - David Woodhouse <David.Woodhouse at intel.com> -0.28-3
- Fix device addition
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 8 Aug 2008 10:35:02 -0000 1.23
+++ sources 11 Sep 2008 02:16:13 -0000 1.24
@@ -1 +1 @@
-f2afcb04e998fdc6aa545633190bc941 bluez-gnome-0.28.tar.gz
+dc824a04adcef5ee6567beb660cf5bcc bluez-gnome-1.3.tar.gz
--- bluez-gnome-0.28-services.patch DELETED ---
--- bluez-gnome-remove-class-file-sharing.patch DELETED ---
- Previous message: rpms/bluez/devel bluetooth.conf, NONE, 1.1 bluetooth.init, NONE, 1.1 bluez-4.4-input.patch, NONE, 1.1 bluez-utils-oui-usage.patch, NONE, 1.1 bluez.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: [pkgdb] eclipse-nls was added for seanf
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list