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

[From: subversion at stage.maemo.org]

Author: erikarls
Date: 2007-02-22 17:21:33 +0200 (Thu, 22 Feb 2007)
New Revision: 10183

Modified:
   projects/haf/trunk/libhildonmime/ChangeLog
   projects/haf/trunk/libhildonmime/debian/changelog
   projects/haf/trunk/libhildonmime/libhildonmime/hildon-uri.c
Log:
2007-02-22  Erik Karlsson  <erik.b.karlsson at nokia.com>

        * libhildonmime/hildon-uri.c: (hildon_uri_open)
        (hildon_uri_get_default_action) Fixed some points
        where NULL pointer was used.



Modified: projects/haf/trunk/libhildonmime/ChangeLog
===================================================================
--- projects/haf/trunk/libhildonmime/ChangeLog	2007-02-22 15:20:34 UTC (rev 10182)
+++ projects/haf/trunk/libhildonmime/ChangeLog	2007-02-22 15:21:33 UTC (rev 10183)
@@ -1,3 +1,9 @@
+2007-02-22  Erik Karlsson  <erik.b.karlsson at nokia.com>
+
+	* libhildonmime/hildon-uri.c: (hildon_uri_open)
+	(hildon_uri_get_default_action) Fixed some points
+	where NULL pointer was used.	
+	
 2007-01-16  Erik Karlsson  <erik.b.karlsson at nokia.com>
 
 	* Changed the prefix from osso_ to hildon_

Modified: projects/haf/trunk/libhildonmime/debian/changelog
===================================================================
--- projects/haf/trunk/libhildonmime/debian/changelog	2007-02-22 15:20:34 UTC (rev 10182)
+++ projects/haf/trunk/libhildonmime/debian/changelog	2007-02-22 15:21:33 UTC (rev 10183)
@@ -1,3 +1,9 @@
+libhildonmime (1.9.2) unstable; urgency=low
+
+  * Removed a glitch inside the uri handling code. 
+
+ -- Erik Karlsson <erik.b.karlsson at nokia.com>  Thu, 22 Feb 2007 16:52:58 +0200
+
 libhildonmime (1.9.1) unstable; urgency=low
 
   * Added conflict package 

Modified: projects/haf/trunk/libhildonmime/libhildonmime/hildon-uri.c
===================================================================
--- projects/haf/trunk/libhildonmime/libhildonmime/hildon-uri.c	2007-02-22 15:20:34 UTC (rev 10182)
+++ projects/haf/trunk/libhildonmime/libhildonmime/hildon-uri.c	2007-02-22 15:21:33 UTC (rev 10183)
@@ -1707,13 +1707,16 @@
 		
 		action = NULL;
 	}
-		
+
 	/* If name not found, default to the first item */
 	if (!action) {
 		DEBUG_MSG (("URI: Using first action as default action"));
-		action = actions->data;
+
+		if (actions) {
+			action = actions->data;
+		} 
 	}
-	
+
 	if (action) {
 		hildon_uri_action_ref (action);
 	}
@@ -2018,14 +2021,18 @@
 			    "since no action was given.",
 			    uri));
 		
+		/* TODO: Fix this, what was the idea here */
+/*
 		if (action->id) {
 			action = hildon_uri_get_default_action_by_uri (uri, error);
 		} else {
-			action = hildon_uri_get_default_action (scheme, error);
-		}
+*/
+		action = hildon_uri_get_default_action (scheme, error);
 
+/*		}
+ */
 		cleanup_action = TRUE;
-		
+
 		if (!action) {
 			GSList *actions;