rpms/bluez-gnome/devel bluez-gnome-sendto-palm.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 bluez-gnome.spec, 1.47, 1.48 sources, 1.20, 1.21 bluez-gnome-new-sendto-9.patch, 1.1, NONE

[Bastien Nocera (hadess)]

Author: hadess

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

Modified Files:
	.cvsignore bluez-gnome.spec sources 
Added Files:
	bluez-gnome-sendto-palm.patch 
Removed Files:
	bluez-gnome-new-sendto-9.patch 
Log Message:
* Tue Apr 08 2008 - Bastien Nocera <bnocera at redhat.com> - 0.26-1
- Update to 0.26


bluez-gnome-sendto-palm.patch:

--- NEW FILE bluez-gnome-sendto-palm.patch ---
Index: sendto/dialog.h
===================================================================
RCS file: /cvsroot/bluez/gnome/sendto/dialog.h,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 dialog.h
--- sendto/dialog.h	5 Apr 2008 23:59:11 -0000	1.2
+++ sendto/dialog.h	8 Apr 2008 15:53:07 -0000
@@ -21,5 +21,7 @@
  *
  */
 
+#include <glib.h>
+
 gchar *show_browse_dialog(void);
 gchar **show_select_dialog(void);
Index: sendto/main.c
===================================================================
RCS file: /cvsroot/bluez/gnome/sendto/main.c,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 main.c
--- sendto/main.c	6 Apr 2008 01:26:23 -0000	1.27
+++ sendto/main.c	8 Apr 2008 15:53:08 -0000
@@ -78,6 +78,13 @@ static void response_callback(GtkWidget 
 	gtk_main_quit();
 }
 
+static gboolean is_palm_device(const gchar *bdaddr)
+{
+	return (g_str_has_prefix(bdaddr, "00:04:6B")
+		|| g_str_has_prefix(bdaddr, "00:07:E0")
+		|| g_str_has_prefix(bdaddr, "00:0E:20"));
+}
+
 static void create_window(void)
 {
 	GtkWidget *vbox;
@@ -260,15 +267,15 @@ static void transfer_progress(DBusGProxy
 	remaining_time = (total_size - current_sent) / transfer_rate;
 
 	if (remaining_time >= 3600)
-		time = g_strdup_printf(_("ETA %d:%02d:%02d"),
+		time = g_strdup_printf(_("%d:%02d:%02d Remaining"),
 					remaining_time / 3600,
 					(remaining_time % 3600) / 60,
 					(remaining_time % 3600) % 60);
 	else
-		time = g_strdup_printf(_("ETA %d:%02d"),
+		time = g_strdup_printf(_("%d:%02d Remaining"),
 				remaining_time / 60, remaining_time % 60);
 
-	if (transfer_rate >= 1000)
+	if (transfer_rate >= 3000)
 		rate = g_strdup_printf(_("%d KB/s"), transfer_rate / 1000);
 	else
 		rate = g_strdup_printf(_("%d B/s"), transfer_rate);
@@ -312,6 +319,29 @@ static void session_connected(DBusGProxy
 	send_file(proxy);
 }
 
+static gchar *get_error_message(GError *error)
+{
+	char *message;
+
+	if (error != NULL) {
+		const gchar *error_name;
+
+		if (error && error->code == DBUS_GERROR_REMOTE_EXCEPTION)
+			error_name = dbus_g_error_get_name(error);
+		else
+			error_name = NULL;
+
+		if (error_name && !strcmp(error_name, "org.openobex.Error.ConnectionAttemptFailed") && is_palm_device(option_device)) {
+			message = g_strdup (_("Make sure that remote device is on and that it accepts Bluetooth connections."));
+		} else {
+			message = g_strdup(error->message);
+		}
+	} else
+		message = g_strdup(_("An unknown error occured"));
+
+	return message;
+}
+
 static void create_notify(DBusGProxy *proxy,
 				DBusGProxyCall *call, void *user_data)
 {
@@ -323,12 +353,9 @@ static void create_notify(DBusGProxy *pr
 						G_TYPE_INVALID) == FALSE) {
 		gchar *text, *message;
 
-		if (error != NULL) {
-			message = g_strdup(error->message);
+		message = get_error_message(error);
+		if (error != NULL)
 			g_error_free(error);
-		} else
-			message = g_strdup(_("An unknown error occured"));
-
 		text = g_strdup_printf("<span foreground=\"red\">%s</span>",
 								message);
 		gtk_label_set_markup(GTK_LABEL(label_status), text);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	14 Mar 2008 10:18:35 -0000	1.20
+++ .cvsignore	8 Apr 2008 16:00:42 -0000	1.21
@@ -1 +1 @@
-bluez-gnome-0.25.tar.gz
+bluez-gnome-0.26.tar.gz


Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- bluez-gnome.spec	14 Mar 2008 10:18:35 -0000	1.47
+++ bluez-gnome.spec	8 Apr 2008 16:00:42 -0000	1.48
@@ -1,5 +1,5 @@
 Name:		bluez-gnome
-Version:	0.25
+Version:	0.26
 Release:	1%{?dist}
 Summary:	Bluetooth pairing and control applet
 
@@ -8,7 +8,7 @@
 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-new-sendto-9.patch
+Patch2:		bluez-gnome-sendto-palm.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -47,9 +47,7 @@
 %prep
 %setup -q
 %patch1 -p0 -b .remove-class
-pushd sendto/
 %patch2 -p0 -b .sendto
-popd
 
 %build
 %configure --disable-mime-update --disable-desktop-update --disable-icon-update
@@ -138,6 +136,9 @@
 %{_datadir}/man/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Tue Apr 08 2008 - Bastien Nocera <bnocera at redhat.com> - 0.26-1
+- Update to 0.26
+
 * Fri Mar 14 2008 - Bastien Nocera <bnocera at redhat.com> - 0.25-1
 - Update to 0.25 (crash fix)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	14 Mar 2008 10:18:35 -0000	1.20
+++ sources	8 Apr 2008 16:00:42 -0000	1.21
@@ -1 +1 @@
-4acb0c83b351e4f36e88c6d775f15837  bluez-gnome-0.25.tar.gz
+d1e68cf63458472eaeb70ef1b3f1df5d  bluez-gnome-0.26.tar.gz


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