rpms/bluez-gnome/devel .cvsignore, 1.28, 1.29 bluetooth-sendto-ods-svn.patch, 1.1, 1.2 bluez-gnome.spec, 1.63, 1.64 sources, 1.28, 1.29 05_bluetooth_sendto_dbus-snd.patch, 1.1, NONE

Sat Oct 4 22:44:36 UTC 2008

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31656

Modified Files:
	.cvsignore bluetooth-sendto-ods-svn.patch bluez-gnome.spec 
	sources 
Removed Files:
	05_bluetooth_sendto_dbus-snd.patch 
Log Message:
* Sat Oct 04 2008 - Bastien Nocera <bnocera at redhat.com> - 1.8-1
- Update to 1.8 and update obex-data-server patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29

--- .cvsignore	30 Sep 2008 09:15:54 -0000	1.28
+++ .cvsignore	4 Oct 2008 22:44:05 -0000	1.29
@@ -1 +1 @@
-bluez-gnome-1.7.tar.gz
+bluez-gnome-1.8.tar.gz

bluetooth-sendto-ods-svn.patch:

Index: bluetooth-sendto-ods-svn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluetooth-sendto-ods-svn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bluetooth-sendto-ods-svn.patch	24 Sep 2008 01:06:12 -0000	1.1
+++ bluetooth-sendto-ods-svn.patch	4 Oct 2008 22:44:05 -0000	1.2
@@ -1,12 +1,156 @@
-diff --git a/sendto/main.c b/sendto/main.c
-index 044bbbc..f0c435b 100644
---- a/sendto/main.c
-+++ b/sendto/main.c
-@@ -619,6 +619,7 @@ int main(int argc, char *argv[])
- 	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);
+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;
  
- 	gtk_main();
++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("<span foreground=\"red\">%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("<span foreground=\"red\">%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;


Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- bluez-gnome.spec	2 Oct 2008 13:17:46 -0000	1.63
+++ bluez-gnome.spec	4 Oct 2008 22:44:05 -0000	1.64
@@ -1,6 +1,6 @@
 Name:		bluez-gnome
-Version:	1.7
-Release:	2%{?dist}
+Version:	1.8
+Release:	1%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
@@ -9,7 +9,6 @@
 Source0:	http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 
 Patch0:		bluetooth-sendto-ods-svn.patch
-Patch1:		05_bluetooth_sendto_dbus-snd.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,7 +47,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .ods-svn
-%patch1 -p1 -b .bluez4
 
 %build
 %configure --disable-mime-update --disable-desktop-update --disable-icon-update
@@ -140,6 +138,9 @@
 %{_mandir}/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Sat Oct 04 2008 - Bastien Nocera <bnocera at redhat.com> - 1.8-1
+- Update to 1.8 and update obex-data-server patch
+
 * Thu Oct 02 2008 - Bastien Nocera <bnocera at redhat.com> - 1.7-2
 - Remove the X-GNOME-NetworkSettings category from the
   preferences' desktop file, it makes the prefs show up in


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	30 Sep 2008 09:15:54 -0000	1.28
+++ sources	4 Oct 2008 22:44:05 -0000	1.29
@@ -1 +1 @@
-85321cff1d2f344b2d0491cd26f50c14  bluez-gnome-1.7.tar.gz
+7f34a08e36aa77d4476d0919c52b59b6  bluez-gnome-1.8.tar.gz


--- 05_bluetooth_sendto_dbus-snd.patch DELETED ---


