backported crash on receive fix from CVS (#77129) thanks to Marcello V Mansueto. added patch for speed indicator on progress bar

6 files changed, 179 insertions, 2 deletions

diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog
index 59e91da63523..444e8a8d8516 100644
--- a/net-wireless/gnome-bluetooth/ChangeLog
+++ b/net-wireless/gnome-bluetooth/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-wireless/gnome-bluetooth
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.14 2005/01/05 19:20:00 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.15 2005/01/13 16:30:22 liquidx Exp $
+
+*gnome-bluetooth-0.5.1-r1 (13 Jan 2005)
+
+  13 Jan 2005; Alastair Tse <liquidx@gentoo.org>
+  +files/gnome-bluetooth-0.5.1-gobcrash.patch,
+  +files/gnome-bluetooth-0.5.1-obex_xfer_rate.patch,
+  +gnome-bluetooth-0.5.1-r1.ebuild, gnome-bluetooth-0.5.1.ebuild:
+  backported crash on receive fix from CVS (#77129) thanks to Marcello V
+  Mansueto. added patch for speed indicator on progress bar
 
   05 Jan 2005; Michael Hanselmann <hansmi@gentoo.org>
   gnome-bluetooth-0.5.1.ebuild:
diff --git a/net-wireless/gnome-bluetooth/files/digest-gnome-bluetooth-0.5.1-r1 b/net-wireless/gnome-bluetooth/files/digest-gnome-bluetooth-0.5.1-r1
new file mode 100644
index 000000000000..0cf8c37a3873
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/files/digest-gnome-bluetooth-0.5.1-r1
@@ -0,0 +1 @@
+MD5 60dfef22c0cc075ac1e3d84c249b8ca3 gnome-bluetooth-0.5.1.tar.gz 821273
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.5.1-gobcrash.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.5.1-gobcrash.patch
new file mode 100644
index 000000000000..11a11c44a6fc
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.5.1-gobcrash.patch
@@ -0,0 +1,35 @@
+--- src/fileactiondialog.gob        17 Jun 2004 20:42:55 -0000      1.2
++++ src/fileactiondialog.gob        8 Oct 2004 11:57:46 -0000
+@@ -51,13 +51,16 @@
+     private const gchar *fname;
+ 
+     private GdkPixbuf *icon = { gnomebt_icon (); }
+-        destroywith gdk_pixbuf_unref;
+-
++	destroywith g_object_unref;
++	
+     private GdkPixbuf *mimeicon = { NULL; }
+-        destroywith gdk_pixbuf_unref;
++	destroywith g_object_unref;
+ 
+-	private GnomeVFSFileInfo *vfsinf = { NULL; }
+-        destroywith gnome_vfs_file_info_unref;
++    private GnomeVFSFileInfo *vfsinf = { NULL; }
++        destroy {
++		gnome_vfs_file_info_unref (vfsinf);
++		vfsinf = NULL;
++	};
+ 
+     private gchar *uri = { NULL; }
+         destroywith g_free;
+	 
+--- src/permissiondialog.gob        17 Jun 2004 20:42:55 -0000      1.7
++++ src/permissiondialog.gob        29 Jul 2004 17:13:39 -0000      1.8
+@@ -43,7 +43,7 @@
+     private GtkWidget *rememberbutton;
+
+     private GdkPixbuf *icon = { gnomebt_icon (); }
+-        destroywith gdk_pixbuf_unref;
++        destroywith g_object_unref;
+
+     private gboolean remember = FALSE;
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.5.1-obex_xfer_rate.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.5.1-obex_xfer_rate.patch
new file mode 100644
index 000000000000..fdce3865cef2
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.5.1-obex_xfer_rate.patch
@@ -0,0 +1,70 @@
+diff -ur gnome-bluetooth-0.5.1/obex/gnome-obex-send.c gnome-bluetooth-0.5.1a/obex/gnome-obex-send.c
+--- gnome-bluetooth-0.5.1/obex/gnome-obex-send.c	2004-06-04 19:28:00.000000000 +0100
++++ gnome-bluetooth-0.5.1a/obex/gnome-obex-send.c	2004-10-25 00:36:00.937169868 +0100
+@@ -46,6 +46,8 @@
+ 	GnomeProgram	*prog;
+ 	gchar	*data;
+ 	gchar	*error;
++  GTimer *xfer_timer;
++  gsize  xfer_size;
+ } MyApp;
+ 
+ #define GLADE_FILE DATA_DIR "/gnome-obex-send.glade"
+@@ -94,9 +96,18 @@
+ {
+ 	GladeXML *xml=app->xml;
+ 	GtkWidget *bar;
++
++	gchar *rate_string;
++	gdouble rate = 0;
++
+ 	gdouble frac = btctl_obex_client_progress (app->obex);
+ 	bar = glade_xml_get_widget (xml, "progressbar1");
+ 	gtk_progress_bar_set_fraction( GTK_PROGRESS_BAR (bar), frac);
++	if (g_timer_elapsed(app->xfer_timer, 0) > 0)
++	  rate = (frac * app->xfer_size) / g_timer_elapsed(app->xfer_timer, 0) / 1024;
++	rate_string = g_strdup_printf(" %.2f KB/s", rate);
++	gtk_progress_bar_set_text(GTK_PROGRESS_BAR(bar), rate_string);
++	g_free(rate_string);
+ }
+ 
+ static void
+@@ -152,6 +163,7 @@
+ 			bname = g_path_get_basename (fname);
+ 			label = glade_xml_get_widget (app->xml, "filename_label");
+ 			gtk_label_set_text (GTK_LABEL (label), bname);
++			app->xfer_size = len;
+ 			btctl_obex_client_push_data (app->obex,
+ 					bname, app->data, len);
+ 			/* TODO: check error return here from command submit */
+@@ -175,7 +187,10 @@
+ connected_callback (BtctlObexClient *bo, gchar * bdaddr, gpointer data) 
+ {
+ 	/* OBEX connect has succeeded, so start sending */
+-	g_idle_add ((GSourceFunc) send_one, data);
++  MyApp *app = (MyApp *)data;
++  g_timer_reset(app->xfer_timer);
++  g_timer_start(app->xfer_timer);
++  g_idle_add ((GSourceFunc) send_one, data);
+ }
+ 
+ static void
+@@ -242,6 +257,8 @@
+ 
+ 	app = g_new0 (MyApp, 1);
+ 
++	app->xfer_timer = g_timer_new();
++
+ 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ 	textdomain (GETTEXT_PACKAGE);
+@@ -307,6 +324,9 @@
+ 		g_object_unref (app->obex);
+ 	}
+ 
++	if (app->xfer_timer)
++	  g_timer_destroy(app->xfer_timer);
++
+ 	if (app->data)
+ 		g_free (app->data);
+ 
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-0.5.1-r1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..abf1746c2dc5
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-0.5.1-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-0.5.1-r1.ebuild,v 1.1 2005/01/13 16:30:22 liquidx Exp $
+
+inherit distutils gnome2 eutils
+
+DESCRIPTION="Gnome2 Bluetooth integration suite."
+HOMEPAGE="http://usefulinc.com/software/gnome-bluetooth/"
+SRC_URI="http://downloads.usefulinc.com/gnome-bluetooth/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc"
+IUSE=""
+
+RDEPEND=">=gnome-base/libgnomeui-2
+	>=gnome-base/gnome-vfs-2.1.3
+	>=x11-libs/gtk+-2
+	>=gnome-base/librsvg-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/libbonobo-2
+	>=gnome-base/libbonoboui-2
+	>=gnome-base/gconf-2
+	>=gnome-base/orbit-2
+	>=dev-util/gob-2
+	>=dev-libs/openobex-1
+	>=net-wireless/bluez-libs-2.7
+	>=net-wireless/libbtctl-0.4.1
+	>=dev-python/pygtk-2.0
+	>=dev-python/gnome-python-2"
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+DOCS="README NEWS AUTHORS COPYING ChangeLog"
+MAKEOPTS="${MAKEOPTS} -j1"
+PYTHON_MODNAME="gnomebt"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gobcrash.patch
+	epatch ${FILESDIR}/${P}-obex_xfer_rate.patch
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	gnome2_pkg_postrm
+}
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-0.5.1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-0.5.1.ebuild
index e407fb0cd536..38c3d5997049 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-0.5.1.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-0.5.1.ebuild,v 1.6 2005/01/05 19:20:00 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-0.5.1.ebuild,v 1.7 2005/01/13 16:30:22 liquidx Exp $
 
 inherit distutils gnome2 eutils
 
@@ -38,6 +38,12 @@ DOCS="README NEWS AUTHORS COPYING ChangeLog"
 MAKEOPTS="${MAKEOPTS} -j1"
 PYTHON_MODNAME="gnomebt"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gobcrash.patch
+}
+
 pkg_postinst() {
 	distutils_pkg_postinst
 	gnome2_pkg_postinst