[maemo-commits] [maemo-commits] r11775 - in projects/haf/trunk/hildon-fm: . debian hildon-fm

[From: subversion at stage.maemo.org]

Author: ogorter
Date: 2007-05-23 15:06:37 +0300 (Wed, 23 May 2007)
New Revision: 11775

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/rules
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-details-dialog.c
Log:
	* hildon-fm/hildon-file-details-dialog.c:
	(hildon_file_details_dialog_set_file_iter):
	add extra g_return_if_fail incase the path found is invalid. Happens if
	called with invalid iterator, prevents certain crashes
	Restored -Werror in debian/rules, but it is gone from configure.ac

Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-05-23 11:55:12 UTC (rev 11774)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-05-23 12:06:37 UTC (rev 11775)
@@ -1,5 +1,14 @@
 2007-05-23  Onne Gorter  <onne.gorter at nokia.com>
 
+	* hildon-fm/hildon-file-details-dialog.c:
+	(hildon_file_details_dialog_set_file_iter):
+	add extra g_return_if_fail incase the path found is invalid. Happens if
+	called with invalid iterator, prevents certain crashes
+
+	Restored -Werror in debian/rules, but it is gone from configure.ac
+
+2007-05-23  Onne Gorter  <onne.gorter at nokia.com>
+
 	* hildon-fm/hildon-file-chooser-dialog.c:
 	When calculating new name, don't turn it into a known extension.
 	Fixes NB#52803 (hopefully)

Modified: projects/haf/trunk/hildon-fm/debian/rules
===================================================================
--- projects/haf/trunk/hildon-fm/debian/rules	2007-05-23 11:55:12 UTC (rev 11774)
+++ projects/haf/trunk/hildon-fm/debian/rules	2007-05-23 12:06:37 UTC (rev 11775)
@@ -13,7 +13,7 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 
-CFLAGS = -Wall -g
+CFLAGS = -Wall -g -Werror
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-details-dialog.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-details-dialog.c	2007-05-23 11:55:12 UTC (rev 11774)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-details-dialog.c	2007-05-23 12:06:37 UTC (rev 11775)
@@ -721,6 +721,8 @@
   /* Save iterator to priv struct as row reference */
   gtk_tree_row_reference_free(self->priv->active_file);
   path = gtk_tree_model_get_path(model, iter);
+  g_return_if_fail(path); // add some safety with logging here to clear up bug NB#51729, NB#52272, NB#52271
+
   self->priv->active_file = gtk_tree_row_reference_new(model, path);
   gtk_tree_path_free(path);