[maemo-commits] [maemo-commits] r12036 - in projects/haf/trunk/osso-gnomevfs-extra: . debian obex-module/src

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-06-01 14:31:44 +0300 (Fri, 01 Jun 2007)
New Revision: 12036

Modified:
   projects/haf/trunk/osso-gnomevfs-extra/ChangeLog
   projects/haf/trunk/osso-gnomevfs-extra/configure.in
   projects/haf/trunk/osso-gnomevfs-extra/debian/changelog
   projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/om-dbus.c
Log:
Improve robustness when restarting the daemon

Modified: projects/haf/trunk/osso-gnomevfs-extra/ChangeLog
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/ChangeLog	2007-06-01 11:23:03 UTC (rev 12035)
+++ projects/haf/trunk/osso-gnomevfs-extra/ChangeLog	2007-06-01 11:31:44 UTC (rev 12036)
@@ -1,3 +1,11 @@
+2007-06-01  Richard Hult  <richard at imendio.com>
+
+	* obex-module/src/om-dbus.c (send_disconnect_if_first): Make the
+	BDA check case insensitive in case we get called with a different
+	variant. Improves behavior when restarting the daemon.
+
+	* configure.in: Bump version.
+
 2007-02-15  Richard Hult  <richard at imendio.com>
 
 	* obex-module/src/om-dbus.c (connection_free): Close the private

Modified: projects/haf/trunk/osso-gnomevfs-extra/configure.in
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/configure.in	2007-06-01 11:23:03 UTC (rev 12035)
+++ projects/haf/trunk/osso-gnomevfs-extra/configure.in	2007-06-01 11:31:44 UTC (rev 12036)
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
  
-AC_INIT(osso-gnomevfs-extra, 1.9.2)
+AC_INIT(osso-gnomevfs-extra, 1.9.4)
 AC_CONFIG_SRCDIR(obex-module/src/obex-method.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 

Modified: projects/haf/trunk/osso-gnomevfs-extra/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/debian/changelog	2007-06-01 11:23:03 UTC (rev 12035)
+++ projects/haf/trunk/osso-gnomevfs-extra/debian/changelog	2007-06-01 11:31:44 UTC (rev 12036)
@@ -1,3 +1,9 @@
+osso-gnomevfs-extra (1.9.4-1) unstable; urgency=low
+
+  * Improve robustness when restarting the daemon
+
+ -- Richard Hult <richard at imendio.com>  Fri,  1 Jun 2007 13:30:26 +0200
+
 osso-gnomevfs-extra (1.9.3-1) unstable; urgency=low
 
   * Remove old module conf file when installing
@@ -21,7 +27,6 @@
 
 osso-gnomevfs-extra (1.9.0-1) unstable; urgency=low
 
-  * UNRELEASED
   * Start new development branch
 
  -- Richard Hult <richard at imendio.com>  Thu, 21 Dec 2006 09:49:20 +0100

Modified: projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/om-dbus.c
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/om-dbus.c	2007-06-01 11:23:03 UTC (rev 12035)
+++ projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/om-dbus.c	2007-06-01 11:31:44 UTC (rev 12036)
@@ -176,24 +176,29 @@
 static gboolean 
 send_disconnect_if_first (Connection *conn, const gchar *str, const gchar *profile)
 {
+	gchar *lower;
+	
 	G_LOCK (used_devs);
 
 	if (!used_devs) {
 		used_devs = g_hash_table_new (g_str_hash, g_str_equal);
 	}
 
-	if (g_hash_table_lookup (used_devs, str)) {
+	lower = g_ascii_strdown (str, -1);
+	if (g_hash_table_lookup (used_devs, lower)) {
+		g_free (lower);
 		d(g_printerr ("obex: %s has already been used, don't disconnect.\n", str));
 		G_UNLOCK (used_devs);
 		return FALSE;
 	}
 
-	g_hash_table_insert (used_devs, g_strdup (str), GINT_TO_POINTER (TRUE));
+	d(g_printerr ("obex: %s has not been used yet, disconnect.\n", lower));
 
+	/* The hash table takes ownership of lower here. */
+	g_hash_table_insert (used_devs, lower, GINT_TO_POINTER (TRUE));
+
 	G_UNLOCK (used_devs);
 
-	d(g_printerr ("obex: %s has not been used yet, disconnect.\n", str));
-	
 	send_disconnect (conn, str, profile);
 
 	return TRUE;