rpms/bluez-gnome/devel bluez-gnome-new-sendto-7.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 bluez-gnome.spec, 1.32, 1.33 main.c, 1.1, 1.2 sources, 1.11, 1.12 bluez-gnome-new-sendto-6.patch, 1.2, NONE

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32169

Modified Files:
	.cvsignore bluez-gnome.spec main.c sources 
Added Files:
	bluez-gnome-new-sendto-7.patch 
Removed Files:
	bluez-gnome-new-sendto-6.patch 
Log Message:
* Thu Feb 07 2008 - Bastien Nocera <bnocera at redhat.com> - 0.17-1
- Update to 0.17
- Update new sendto patch


bluez-gnome-new-sendto-7.patch:

--- NEW FILE bluez-gnome-new-sendto-7.patch ---
Index: po/POTFILES.in
===================================================================
RCS file: /cvsroot/bluez/gnome/po/POTFILES.in,v
retrieving revision 1.14
diff -u -p -r1.14 POTFILES.in
--- po/POTFILES.in	17 Dec 2007 01:15:34 -0000	1.14
+++ po/POTFILES.in	7 Feb 2008 00:57:49 -0000
@@ -17,3 +17,5 @@ analyzer/dialog.c
 analyzer/tracer.c
 analyzer/bluetooth-analyzer.desktop.in
 analyzer/bluetooth-manager.xml.in
+sendto/main.c
+sendto/utils.c
Index: sendto/Makefile.am
===================================================================
RCS file: /cvsroot/bluez/gnome/sendto/Makefile.am,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile.am
--- sendto/Makefile.am	6 Feb 2008 01:53:17 -0000	1.10
+++ sendto/Makefile.am	7 Feb 2008 00:57:49 -0000
@@ -1,7 +1,7 @@
 
 bin_PROGRAMS = bluetooth-sendto
 
-bluetooth_sendto_SOURCES = main.c
+bluetooth_sendto_SOURCES = main.c utils.c utils.h
 
 bluetooth_sendto_LDADD = $(top_builddir)/common/libcommon.a \
 					@GTK_LIBS@ @DBUS_LIBS@
@@ -15,3 +15,4 @@ man_MANS = bluetooth-sendto.1
 EXTRA_DIST = $(man_MANS)
 
 MAINTAINERCLEANFILES = Makefile.in
+
--- /dev/null	2008-01-24 17:45:36.352009045 +0000
+++ sendto/utils.c	2008-02-06 13:05:42.000000000 +0000
@@ -0,0 +1,112 @@
+/*
+ * bluetooth-sendto
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2005-2007  Marcel Holtmann <marcel at holtmann.org>
+ *  Copyright (C) 2006-2007 Tadas Dailyda <tadas at dailyda.com>
+ *  Copyright (C) 2007 Bastien Nocera <hadess at hadess.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <glib/gstdio.h>
+#include <gtk/gtk.h>
+
+#include "bluetooth-device-selection.h"
+
+static void selected_device_changed_cb(BluetoothDeviceSelection *selector,
+				       gchar *address, gpointer user_data)
+{
+	GtkWidget *dialog = user_data;
+
+	gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
+					  GTK_RESPONSE_ACCEPT, address != NULL);
+}
+
+gchar *browse_device_dialog(void)
+{
+	GtkWidget *dialog;
+	GtkWidget *selector;
+	gchar *address = NULL;
+
+	dialog = gtk_dialog_new_with_buttons(_("Select Destination Device"),
+					     NULL, GTK_DIALOG_NO_SEPARATOR,
+					     GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+					     GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
+
+	gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
+
+	gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
+					  GTK_RESPONSE_ACCEPT, FALSE);
+
+	gtk_window_set_default_size(GTK_WINDOW(dialog), 450, 300);
+
+	gtk_container_set_border_width(GTK_CONTAINER(dialog), 6);
+
+	selector = bluetooth_device_selection_new(_("Select destination device"));
+	bluetooth_device_selection_start_discovery(
+	    BLUETOOTH_DEVICE_SELECTION(selector));
+
+	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), selector);
+
+	g_signal_connect(selector, "selected-device-changed",
+			 G_CALLBACK(selected_device_changed_cb), dialog);
+
+	gtk_widget_show_all(selector);
+
+	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
+		g_object_get(selector, "device-selected", &address, NULL);
+
+	gtk_widget_destroy(dialog);
+
+	return address;
+}
+
+GSList *select_files_dialog(void)
+{
+	GtkWidget *dialog;
+	GSList *file_list;
+
+	file_list = NULL;
+	dialog = gtk_file_chooser_dialog_new(_("Choose files to send"), NULL,
+					     GTK_FILE_CHOOSER_ACTION_OPEN,
+					     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+					     _("Send"), GTK_RESPONSE_ACCEPT,
+					     NULL);
+	gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
+	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), TRUE);
+
+	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
+		file_list = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog));
+	}
+	gtk_widget_destroy(dialog);
+
+	return file_list;
+}
+
--- /dev/null	2008-01-24 17:45:36.352009045 +0000
+++ sendto/utils.h	2008-02-06 13:05:42.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+ * bluetooth-sendto
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2005-2007  Marcel Holtmann <marcel at holtmann.org>
+ *  Copyright (C) 2006-2007 Tadas Dailyda <tadas at dailyda.com>
+ *  Copyright (C) 2007 Bastien Nocera <hadess at hadess.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include <glib.h>
+
+gchar *browse_device_dialog(void);
+GSList *select_files_dialog(void);
+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	6 Feb 2008 10:23:04 -0000	1.11
+++ .cvsignore	7 Feb 2008 01:03:10 -0000	1.12
@@ -1 +1 @@
-bluez-gnome-0.16.tar.gz
+bluez-gnome-0.17.tar.gz


Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- bluez-gnome.spec	6 Feb 2008 13:12:16 -0000	1.32
+++ bluez-gnome.spec	7 Feb 2008 01:03:10 -0000	1.33
@@ -1,6 +1,6 @@
 Name:		bluez-gnome
-Version:	0.16
-Release:	2%{?dist}
+Version:	0.17
+Release:	1%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
@@ -8,7 +8,7 @@
 URL:		http://www.bluez.org/
 Source0:	http://bluez.sf.net/download/%{name}-%{version}.tar.gz
 Patch1:		bluez-gnome-remove-class.patch
-Patch2:		bluez-gnome-new-sendto-6.patch
+Patch2:		bluez-gnome-new-sendto-7.patch
 Patch3:		main.c
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -135,6 +135,10 @@
 %{_datadir}/man/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Thu Feb 07 2008 - Bastien Nocera <bnocera at redhat.com> - 0.17-1
+- Update to 0.17
+- Update new sendto patch
+
 * Wed Feb 06 2008 - Bastien Nocera <bnocera at redhat.com> - 0.16-2
 - Re-add the sendto patch, we don't want the old stuff
 


Index: main.c
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- main.c	6 Feb 2008 13:12:16 -0000	1.1
+++ main.c	7 Feb 2008 01:03:10 -0000	1.2
@@ -413,7 +413,7 @@
 }
 
 static void transfer_started_cb(DBusGProxy *proxy, const gchar *filename,
-				const gchar *local_path, gint byte_count, gpointer user_data)
+				const gchar *local_path, guint64 byte_count, gpointer user_data)
 {
 	file_length = byte_count;
 }
@@ -434,7 +434,7 @@
 	g_free(error_text);
 }
 
-static void transfer_progress_cb(DBusGProxy *proxy, gint bytes_transferred, gpointer user_data)
+static void transfer_progress_cb(DBusGProxy *proxy, guint64 bytes_transferred, gpointer user_data)
 {
 	gdouble frac;
 	guint actual_bytes_sent;
@@ -511,7 +511,7 @@
 	const gchar *path = NULL;
 
 	if (!dbus_g_proxy_end_call(proxy, call, &error,
-				   G_TYPE_STRING, &path, G_TYPE_INVALID)) {
+				   DBUS_TYPE_G_OBJECT_PATH, &path, G_TYPE_INVALID)) {
 		const gchar *error_name = NULL;
 		gint response_id;
 
@@ -550,7 +550,7 @@
 				    G_CALLBACK(session_connected_cb), NULL, NULL);
 
 	dbus_g_proxy_add_signal(session_proxy, "TransferStarted",
-				G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INVALID);
+				G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID);
 
 	dbus_g_proxy_connect_signal(session_proxy, "TransferStarted",
 				    G_CALLBACK(transfer_started_cb), NULL, NULL);
@@ -568,7 +568,7 @@
 				    G_CALLBACK(error_occurred_cb), NULL, NULL);
 
 	dbus_g_proxy_add_signal(session_proxy, "TransferProgress",
-				G_TYPE_UINT, G_TYPE_INVALID);
+				G_TYPE_UINT64, G_TYPE_INVALID);
 
 	dbus_g_proxy_connect_signal(session_proxy, "TransferProgress",
 				    G_CALLBACK(transfer_progress_cb), NULL, NULL);
@@ -739,12 +739,14 @@
 		}
 	}
 
-	dbus_g_object_register_marshaller(marshal_VOID__STRING_STRING_INT,
+	dbus_g_object_register_marshaller(marshal_VOID__STRING_STRING_UINT64,
 					  G_TYPE_NONE, G_TYPE_STRING,
-					  G_TYPE_STRING, G_TYPE_INT, G_TYPE_INVALID);
+					  G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID);
 	dbus_g_object_register_marshaller(marshal_VOID__STRING_STRING,
 					  G_TYPE_NONE, G_TYPE_STRING,
 					  G_TYPE_STRING, G_TYPE_INVALID);
+	dbus_g_object_register_marshaller(marshal_VOID__UINT64,
+					  G_TYPE_NONE, G_TYPE_UINT64, G_TYPE_INVALID);
 
 	/* init UI */
 	ui_init();


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	6 Feb 2008 10:23:04 -0000	1.11
+++ sources	7 Feb 2008 01:03:10 -0000	1.12
@@ -1 +1 @@
-7e428ee4ab20f1484a8a2366f95a177d  bluez-gnome-0.16.tar.gz
+a4e0c63d3fdefb67b10abc67cf8ab208  bluez-gnome-0.17.tar.gz


--- bluez-gnome-new-sendto-6.patch DELETED ---