Mercurial > audlegacy-plugins
changeset 2903:9c623f4ac901
Automated merge with ssh://chrome@hg.atheme.org//hg/audacious-plugins
| author | Andrew O. Shadoura <bugzilla@tut.by> |
|---|---|
| date | Wed, 13 Aug 2008 14:10:14 +0300 |
| parents | 5e0d42b0f690 (current diff) 35773e919dba (diff) |
| children | ff9b4776b938 |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/bluetooth/agent.c Wed Aug 13 14:09:18 2008 +0300 +++ b/src/bluetooth/agent.c Wed Aug 13 14:10:14 2008 +0300 @@ -700,7 +700,7 @@ static void bonding_created(DBusGProxy *object, const char *address, gpointer user_data) { - bonded_dev_mutex = g_mutex_new (); + const char *adapter = NULL, *name = NULL; gchar *device, *text; @@ -719,10 +719,8 @@ device = g_strdup_printf("%s (%s)", name, address); } else device = g_strdup(address); - - g_mutex_lock(bonded_dev_mutex); - bonded_dev = g_strdup_printf(address); - g_mutex_unlock(bonded_dev_mutex); + bonded_dev = g_strdup_printf(address); + text = g_strdup_printf(_("Created bonding with %s"), device); bonding_finish = 1; @@ -756,7 +754,7 @@ text = g_strdup_printf(_("Removed bonding with %s"), device); g_free(device); - printf("bonding removed"); + printf("bonding removed\n"); // show_notification(adapter ? adapter : _("Bluetooth device"), // text, NULL, 6000, NULL);
--- a/src/bluetooth/bluetooth.c Wed Aug 13 14:09:18 2008 +0300 +++ b/src/bluetooth/bluetooth.c Wed Aug 13 14:10:14 2008 +0300 @@ -156,19 +156,17 @@ dbus_g_object_register_marshaller(marshal_VOID__STRING_UINT_INT, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_INT, G_TYPE_INVALID); run_agents(); - close_call(); - show_scan(1); - dbus_g_proxy_call(obj,"CreateBonding",NULL,G_TYPE_STRING,current_address,G_TYPE_INVALID,G_TYPE_INVALID); return NULL; } void connect_call(void) -{ +{ close_call(); + close_window(); + show_scan(1); + remove_bonding(); current_address = g_strdup(((DeviceData*)(selected_dev->data))->address); connect_th = g_thread_create((GThreadFunc)connect_call_th,NULL,TRUE,NULL) ; - close_call(); - close_window(); - show_scan(1); + }