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

[From: subversion at stage.maemo.org]

Author: ogorter
Date: 2007-05-23 16:54:29 +0300 (Wed, 23 May 2007)
New Revision: 11778

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   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):
	Test is mime is "", if so, warn about error and continue, instead of
	translating "" string, which returns translation information ...
	Fixes NB#53804

Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-05-23 13:06:35 UTC (rev 11777)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-05-23 13:54:29 UTC (rev 11778)
@@ -2,6 +2,14 @@
 
 	* hildon-fm/hildon-file-details-dialog.c:
 	(hildon_file_details_dialog_set_file_iter):
+	Test is mime is "", if so, warn about error and continue, instead of
+	translating "" string, which returns translation information ...
+	Fixes NB#53804
+
+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
 

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-05-23 13:06:35 UTC (rev 11777)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-05-23 13:54:29 UTC (rev 11778)
@@ -1,6 +1,7 @@
 libhildonfm (1:1.9.23.unreleased) unstable; urgency=low
 
   * Fixes: NB#52802.
+  * Fixes: NB#53804.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Mon, 21 May 2007 20:29:59 +0300
 

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 13:06:35 UTC (rev 11777)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-details-dialog.c	2007-05-23 13:54:29 UTC (rev 11778)
@@ -736,7 +736,11 @@
     -1);
 
   g_object_set(self->priv->file_name, "label", name, NULL);
-  g_object_set(self->priv->file_type, "label", _(mime), NULL);
+  if (mime && mime[0] != 0) {
+      g_object_set(self->priv->file_type, "label", _(mime), NULL);
+  } else {
+      g_warning("COLUMN_MIME_TYPE contains empty mime type for file: %s", name);
+  }
 
   if (size < 1024)
     g_snprintf(buffer, sizeof(buffer), _("ckdg_va_properties_size_kb"), 1);