Hello community, here is the log from the commit of package bluez-gnome checked in at Mon Dec 1 12:05:00 CET 2008. -------- --- GNOME/bluez-gnome/bluez-gnome.changes 2008-10-14 23:30:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/bluez-gnome/bluez-gnome.changes 2008-12-01 02:47:30.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 1 02:40:02 CET 2008 - vuntz@novell.com + +- Add bluez-gnome-fix-sendto.patch to have sending to device + working. Fix bnc#441677. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bluez-gnome-fix-sendto.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-gnome.spec ++++++ --- /var/tmp/diff_new_pack.i20346/_old 2008-12-01 12:04:46.000000000 +0100 +++ /var/tmp/diff_new_pack.i20346/_new 2008-12-01 12:04:46.000000000 +0100 @@ -35,9 +35,11 @@ Group: System/GUI/GNOME AutoReqProv: on Version: 1.8 -Release: 1 +Release: 2 Summary: Bluetooth helpers for GNOME Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM bluez-gnome-fix-sendto.patch bnc441677 vuntz@novell.com -- Patch taken from Fedora (patch already committed upstream) +Patch0: bluez-gnome-fix-sendto.patch Url: http://www.bluez.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -61,6 +63,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %configure \ @@ -119,6 +122,9 @@ %files lang -f bluetooth-manager.lang %changelog +* Mon Dec 01 2008 vuntz@novell.com +- Add bluez-gnome-fix-sendto.patch to have sending to device + working. Fix bnc#441677. * Wed Oct 15 2008 mboman@suse.de - Update to version 1.8: + Add additional support for using obex-client. @@ -131,7 +137,7 @@ + Add activation menu with option to setup devices. + Use the Icon property for device type icons. + Use the Alias property for device names. -* Mon Sep 29 2008 mboman@suse.de +* Tue Sep 30 2008 mboman@suse.de - Update to version 1.5: + Use GIO to normalize pathnames. + Fix getting name of remote devices. @@ -156,7 +162,7 @@ Fix device status display in selection lists. Enable bluetooth-sendto application. Enable bluetooth-wizard application. -* Sun Aug 31 2008 ro@suse.de +* Mon Sep 01 2008 ro@suse.de - for 11.0, require gvfs-backends instead of gnome-vfs-obexftp * Tue Aug 12 2008 captain.magnus@opensuse.org - Update to version 0.28 @@ -174,7 +180,7 @@ * Update user interface of sendto application. * Move analyzer application to the system category. * Translation updates -* Mon Mar 17 2008 jpr@suse.de +* Tue Mar 18 2008 jpr@suse.de - Update to version 0.25 Remove signal handlers when no longer needed. Show OBEX errors and close server on failure. @@ -183,7 +189,7 @@ Fix setting filter properties in the device selection widget. Fix missing assignment of filter labels. Show all the possibly known devices. -* Mon Mar 03 2008 jpr@suse.de +* Tue Mar 04 2008 jpr@suse.de - Update to version 0.23 Update for obex-data-server version 0.3 API. Allow translation of the sendto application. ++++++ bluez-gnome-fix-sendto.patch ++++++ diff -ur bluez-gnome-1.8.orig/common/marshal.list bluez-gnome-1.8/common/marshal.list --- bluez-gnome-1.8.orig/common/marshal.list 2008-08-24 22:14:24.000000000 +0100 +++ bluez-gnome-1.8/common/marshal.list 2008-10-04 23:38:59.000000000 +0100 @@ -3,3 +3,4 @@ VOID:STRING,STRING VOID:STRING,STRING,UINT64 VOID:UINT64 +VOID:STRING,STRING,STRING diff -ur bluez-gnome-1.8.orig/sendto/main.c bluez-gnome-1.8/sendto/main.c --- bluez-gnome-1.8.orig/sendto/main.c 2008-10-04 23:36:27.000000000 +0100 +++ bluez-gnome-1.8/sendto/main.c 2008-10-04 23:40:44.000000000 +0100 @@ -64,6 +64,8 @@ static gint64 first_update = 0; static gint64 last_update = 0; +static DBusGProxy *session_proxy = NULL; + static gchar *filename_to_path(const gchar *filename) { GFile *file; @@ -354,7 +356,16 @@ static void error_occurred(DBusGProxy *proxy, const gchar *name, const gchar *message, gpointer user_data) { - transfer_completed(proxy, user_data); + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), + _("Error Occurred")); + + gchar *text = g_strdup_printf("%s</span>", + message); + gtk_label_set_markup(GTK_LABEL(label_status), text); + g_free(text); + + gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), + GTK_RESPONSE_CLOSE, TRUE); } static void session_connected(DBusGProxy *proxy, gpointer user_data) @@ -363,7 +374,7 @@ first_update = get_system_time(); - send_file(proxy); + send_file(session_proxy); } #define OPENOBEX_CONNECTION_FAILED "org.openobex.Error.ConnectionAttemptFailed" @@ -407,60 +418,41 @@ if (dbus_g_proxy_end_call(proxy, call, &error, DBUS_TYPE_G_OBJECT_PATH, &path, G_TYPE_INVALID) == FALSE) { - gchar *text, *message; + gchar *message; message = get_error_message(error); - text = g_strdup_printf("%s</span>", - message); - gtk_label_set_markup(GTK_LABEL(label_status), text); - g_free(text); + error_occurred(proxy,NULL,message,NULL); g_free(message); - gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), - GTK_RESPONSE_CLOSE, TRUE); return; } - - proxy = dbus_g_proxy_new_for_name(conn, "org.openobex", + session_proxy = dbus_g_proxy_new_for_name(conn, "org.openobex", path, "org.openobex.Session"); - dbus_g_proxy_add_signal(proxy, "Connected", G_TYPE_INVALID); - - dbus_g_proxy_connect_signal(proxy, "Connected", - G_CALLBACK(session_connected), NULL, NULL); - - dbus_g_proxy_add_signal(proxy, "ErrorOccurred", - G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); - - dbus_g_proxy_connect_signal(proxy, "ErrorOccurred", - G_CALLBACK(error_occurred), NULL, NULL); - - dbus_g_proxy_add_signal(proxy, "Cancelled", G_TYPE_INVALID); + dbus_g_proxy_add_signal(session_proxy, "Cancelled", G_TYPE_INVALID); - dbus_g_proxy_connect_signal(proxy, "Cancelled", + dbus_g_proxy_connect_signal(session_proxy, "Cancelled", G_CALLBACK(transfer_cancelled), NULL, NULL); - dbus_g_proxy_add_signal(proxy, "TransferStarted", G_TYPE_STRING, + dbus_g_proxy_add_signal(session_proxy, "TransferStarted", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID); - dbus_g_proxy_connect_signal(proxy, "TransferStarted", + dbus_g_proxy_connect_signal(session_proxy, "TransferStarted", G_CALLBACK(transfer_started), NULL, NULL); - dbus_g_proxy_add_signal(proxy, "TransferProgress", + dbus_g_proxy_add_signal(session_proxy, "TransferProgress", G_TYPE_UINT64, G_TYPE_INVALID); - dbus_g_proxy_connect_signal(proxy, "TransferProgress", + dbus_g_proxy_connect_signal(session_proxy, "TransferProgress", G_CALLBACK(transfer_progress), NULL, NULL); - dbus_g_proxy_add_signal(proxy, "TransferCompleted", G_TYPE_INVALID); + dbus_g_proxy_add_signal(session_proxy, "TransferCompleted", G_TYPE_INVALID); - dbus_g_proxy_connect_signal(proxy, "TransferCompleted", + dbus_g_proxy_connect_signal(session_proxy, "TransferCompleted", G_CALLBACK(transfer_completed), NULL, NULL); - dbus_g_proxy_call(proxy, "Connect", NULL, G_TYPE_INVALID, - G_TYPE_INVALID); } static gchar *get_name(DBusGProxy *device) @@ -766,6 +758,14 @@ dbus_g_object_register_marshaller(marshal_VOID__UINT64, G_TYPE_NONE, G_TYPE_UINT64, G_TYPE_INVALID); + + dbus_g_object_register_marshaller(marshal_VOID__STRING_STRING_STRING, + G_TYPE_NONE, + DBUS_TYPE_G_OBJECT_PATH, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_INVALID); + device_name = get_device_name(option_device); if (device_name == NULL) @@ -787,9 +787,21 @@ dbus_g_proxy_connect_signal(proxy, "NameOwnerChanged", G_CALLBACK(name_owner_changed), NULL, NULL); + dbus_g_proxy_add_signal(proxy, "SessionConnected", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID); + + dbus_g_proxy_connect_signal(proxy, "SessionConnected", + G_CALLBACK(session_connected), NULL, NULL); + + dbus_g_proxy_add_signal(proxy, "SessionConnectError", + DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); + + dbus_g_proxy_connect_signal(proxy, "SessionConnectError", + G_CALLBACK(error_occurred), NULL, NULL); + dbus_g_proxy_begin_call(proxy, "CreateBluetoothSession", create_notify, NULL, NULL, G_TYPE_STRING, option_device, + G_TYPE_STRING, "00:00:00:00:00:00", G_TYPE_STRING, "opp", G_TYPE_INVALID); } else { GHashTable *hash = NULL; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de