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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-10-02 14:50:52 +0300 (Tue, 02 Oct 2007)
New Revision: 14281

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/configure.ac
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c
Log:
libhildonfm (1:1.9.42.1) unstable; urgency=low

  * Patch up stupid mistakes in 1.9.42 release.

 -- Marius Vollmer <marius.vollmer at nokia.com>  Tue, 02 Oct 2007 14:45:25 +0300


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-10-02 11:49:56 UTC (rev 14280)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-10-02 11:50:52 UTC (rev 14281)
@@ -1,5 +1,12 @@
 2007-10-02  Marius Vollmer  <marius.vollmer at nokia.com>
 
+	Released 1.9.42.1.  Patch up stupid mistakes in 1.9.42 release.
+	
+	* hildon-fm/hildon-file-system-model.c (is_drive): Use a proper
+	return statement.
+	* hildon-fm/hildon-file-selection.c (hildon_file_selection_init):
+	Correctly use label instead of button_label in one place.
+
 	Released 1.9.42
 	
 	* hildon-fm/hildon-file-selection.c

Modified: projects/haf/trunk/hildon-fm/configure.ac
===================================================================
--- projects/haf/trunk/hildon-fm/configure.ac	2007-10-02 11:49:56 UTC (rev 14280)
+++ projects/haf/trunk/hildon-fm/configure.ac	2007-10-02 11:50:52 UTC (rev 14281)
@@ -1,5 +1,5 @@
 AC_INIT(hildon-fm/hildon-file-system-model.c)
-AM_INIT_AUTOMAKE(libhildonfm, 1.9.42)
+AM_INIT_AUTOMAKE(libhildonfm, 1.9.42.1)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-10-02 11:49:56 UTC (rev 14280)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-10-02 11:50:52 UTC (rev 14281)
@@ -1,3 +1,9 @@
+libhildonfm (1:1.9.42.1) unstable; urgency=low
+
+  * Patch up stupid mistakes in 1.9.42 release.
+
+ -- Marius Vollmer <marius.vollmer at nokia.com>  Tue, 02 Oct 2007 14:45:25 +0300
+
 libhildonfm (1:1.9.42) unstable; urgency=low
 
   * Fixes: NB#71426.

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2007-10-02 11:49:56 UTC (rev 14280)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2007-10-02 11:50:52 UTC (rev 14281)
@@ -3020,7 +3020,7 @@
       gtk_label_set_max_width_chars (GTK_LABEL (label), 20);
       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
 #endif
-      gtk_misc_set_padding (GTK_MISC (button_label), 10, 10);
+      gtk_misc_set_padding (GTK_MISC (label), 10, 10);
       gtk_widget_show (label);
       
       button_label = gtk_label_new (_("sfil_bd_repair_memory_card"));

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c	2007-10-02 11:49:56 UTC (rev 14280)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c	2007-10-02 11:50:52 UTC (rev 14281)
@@ -614,7 +614,7 @@
 static gboolean
 is_drive (HildonFileSystemModelNode *m)
 {
-  g_str_has_prefix (gtk_file_path_get_string (m->path), "drive://");
+  return g_str_has_prefix (gtk_file_path_get_string (m->path), "drive://");
 }
 
 static gboolean