[maemo-commits] [maemo-commits] r13283 - in projects/haf/trunk/libhildonmime: . debian libhildonmime

[From: subversion at stage.maemo.org]

Author: martyn
Date: 2007-08-20 13:19:36 +0300 (Mon, 20 Aug 2007)
New Revision: 13283

Modified:
   projects/haf/trunk/libhildonmime/ChangeLog
   projects/haf/trunk/libhildonmime/configure.in
   projects/haf/trunk/libhildonmime/debian/changelog
   projects/haf/trunk/libhildonmime/libhildonmime/hildon-uri.c
Log:
	* configure.in: Bumped verison.

	* libhildonmime/hildon-uri.c: (uri_get_desktop_file_by_filename):
	Fixed bug where we would obtain the desktop file and the action id
	but would have a space prepending or appending the returned
	strings, this meant you could be returned the desktop file
	'foo.desktop ' and that breaks a lot of things. Now we strip the
	returned strings for whitespace. Fixes bug NB#62728.


Modified: projects/haf/trunk/libhildonmime/ChangeLog
===================================================================
--- projects/haf/trunk/libhildonmime/ChangeLog	2007-08-20 09:28:23 UTC (rev 13282)
+++ projects/haf/trunk/libhildonmime/ChangeLog	2007-08-20 10:19:36 UTC (rev 13283)
@@ -1,3 +1,14 @@
+2007-08-20  Martyn Russell  <martyn at imendio.com>
+
+	* configure.in: Bumped verison.
+
+	* libhildonmime/hildon-uri.c: (uri_get_desktop_file_by_filename):
+	Fixed bug where we would obtain the desktop file and the action id
+	but would have a space prepending or appending the returned
+	strings, this meant you could be returned the desktop file
+	'foo.desktop ' and that breaks a lot of things. Now we strip the
+	returned strings for whitespace. Fixes bug NB#62728.
+
 2007-08-15  Martyn Russell  <martyn at imendio.com>
 
 	* Release 1.9.13.

Modified: projects/haf/trunk/libhildonmime/configure.in
===================================================================
--- projects/haf/trunk/libhildonmime/configure.in	2007-08-20 09:28:23 UTC (rev 13282)
+++ projects/haf/trunk/libhildonmime/configure.in	2007-08-20 10:19:36 UTC (rev 13283)
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
  
-AC_INIT(libhildonmime, 1.9.13)
+AC_INIT(libhildonmime, 1.9.14)
 AC_CONFIG_SRCDIR(libhildonmime/hildon-uri.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 

Modified: projects/haf/trunk/libhildonmime/debian/changelog
===================================================================
--- projects/haf/trunk/libhildonmime/debian/changelog	2007-08-20 09:28:23 UTC (rev 13282)
+++ projects/haf/trunk/libhildonmime/debian/changelog	2007-08-20 10:19:36 UTC (rev 13283)
@@ -1,3 +1,9 @@
+libhildonmime (1.9.14-1~unreleased) unstable; urgency=low
+
+  * Fixes: NB#62728, Default handling application for "sip" link is incorrect
+
+ -- Martyn Russell <martyn at imendio.com>  Thu, 23 Aug 2007 17:00:00 +0100
+
 libhildonmime (1.9.13-1) unstable; urgency=low
 
   * Fixes: NB#62728, Default handling application for "sip" link is incorrect

Modified: projects/haf/trunk/libhildonmime/libhildonmime/hildon-uri.c
===================================================================
--- projects/haf/trunk/libhildonmime/libhildonmime/hildon-uri.c	2007-08-20 09:28:23 UTC (rev 13282)
+++ projects/haf/trunk/libhildonmime/libhildonmime/hildon-uri.c	2007-08-20 10:19:36 UTC (rev 13283)
@@ -938,6 +938,7 @@
 			strv = g_strsplit (str, ";", -1);
 			if (strv) {
 				*desktop_file = g_strdup (strv[0]);
+				g_strstrip (*desktop_file);
 				g_strfreev (strv);
 				g_free (str);
 			} else {
@@ -948,6 +949,7 @@
 			if (p) {
 				*action_id = g_strdup (p + 1);
 				p[0] = '\0';
+				g_strstrip (*action_id);
 			}
 		}
 	}