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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-02-29 17:39:43 +0200 (Fri, 29 Feb 2008)
New Revision: 15241

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-mmc.c
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-old-gateway.c
Log:
	* hildon-fm/hildon-file-system-mmc.c,
	hildon-fm/hildon-file-system-old-gateway.c: Avoid using old
	logical_ids (N81354).


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2008-02-29 08:45:18 UTC (rev 15240)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2008-02-29 15:39:43 UTC (rev 15241)
@@ -1,3 +1,9 @@
+2008-02-29  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	* hildon-fm/hildon-file-system-mmc.c,
+	hildon-fm/hildon-file-system-old-gateway.c: Avoid using old
+	logical_ids (N81354).
+
 2008-02-20  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	* hildon-fm/hildon-file-chooser-dialog.c

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2008-02-29 08:45:18 UTC (rev 15240)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2008-02-29 15:39:43 UTC (rev 15241)
@@ -1,7 +1,7 @@
 libhildonfm (1:2.0.1~unreleased) unstable; urgency=low
 
   * Fixes: NB#76517, NB#79427, NB#76380, NB#76271, NB#79697.
-  * Fixes: NB#76327, NB#74397, NB#75049, NB#80021.
+  * Fixes: NB#76327, NB#74397, NB#75049, NB#80021, NB#81354.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Wed, 20 Feb 2008 16:42:40 +0200
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-mmc.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-mmc.c	2008-02-29 08:45:18 UTC (rev 15240)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-mmc.c	2008-02-29 15:39:43 UTC (rev 15241)
@@ -286,14 +286,6 @@
           return g_strdup (KE("card_ib_memory_card_corrupted"));
         }
 
-        if (is_connected && mmc_is_used)
-        {
-              return g_strdup (_("sfil_ib_mmc_usb_connected"));
-        }
-          else
-        {
-          return g_strdup (_("hfil_ib_mmc_not_present"));
-        }
     }
 
     return NULL;

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-old-gateway.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-old-gateway.c	2008-02-29 08:45:18 UTC (rev 15240)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-old-gateway.c	2008-02-29 15:39:43 UTC (rev 15241)
@@ -157,11 +157,6 @@
         gtk_file_system_volume_free (fs, vol);
     }
 
-    if (!name)
-    {
-        name =  g_strdup (_("sfil_li_gateway_root"));
-    }
-
     return name;
 }
 
@@ -205,7 +200,7 @@
     }
     else if (!gateway->available)
     {
-        return g_strdup (_("sfil_ib_no_connection_support"));
+        return g_strdup (_("sfil_ib_cannot_connect_device"));
     }
 
     return NULL;