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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-09-28 14:31:55 +0300 (Fri, 28 Sep 2007)
New Revision: 14168

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-local-device.c
Log:
	* hildon-fm/hildon-file-system-local-device.c
	(hildon_file_system_local_device_get_display_name): Get device
	name from $OSSO_PRODUCT_NAME if it can't get it from bluez, or set
	it to the empty string if $OSSO_PRODUCT_NAME is not set (N70816).


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-09-28 11:29:13 UTC (rev 14167)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-09-28 11:31:55 UTC (rev 14168)
@@ -1,5 +1,10 @@
 2007-09-28  Marius Vollmer  <marius.vollmer at nokia.com>
 
+	* hildon-fm/hildon-file-system-local-device.c
+	(hildon_file_system_local_device_get_display_name): Get device
+	name from $OSSO_PRODUCT_NAME if it can't get it from bluez, or set
+	it to the empty string if $OSSO_PRODUCT_NAME is not set (N70816).
+	
 	* hildon-fm/hildon-file-system-model.c (get_folder_callback): Call
 	free:handle_data at the very end so that the HildonFileSystemModel
 	remains reffed (N69754).

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-09-28 11:29:13 UTC (rev 14167)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-09-28 11:31:55 UTC (rev 14168)
@@ -1,6 +1,7 @@
 libhildonfm (1:1.9.41~unreleased) unstable; urgency=low
 
-  * Fixes: NB#N71163, NB#71170, NB#71144, NB#71168, NB#69754.
+  * Fixes: NB#71163, NB#71170, NB#71144, NB#71168, NB#69754.
+  * Fixes: NB#70816.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Tue, 25 Sep 2007 09:56:09 +0300
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-local-device.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-local-device.c	2007-09-28 11:29:13 UTC (rev 14167)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-local-device.c	2007-09-28 11:31:55 UTC (rev 14168)
@@ -121,8 +121,11 @@
     g_object_get (fs_settings, "btname", &name, NULL);
 
     if (!name)
-        name = g_strdup (_("sfil_li_folder_root"));
+      name = g_strdup (g_getenv ("OSSO_PRODUCT_NAME"));
 
+    if (!name)
+      name = g_strdup ("");
+
     return name;
 }