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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-02-20 18:56:36 +0200 (Wed, 20 Feb 2008)
New Revision: 15215

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c
Log:
	(hildon_file_chooser_dialog_create_sub_dialog): Copy "local-only",
	"show-hidden", and "show-upnp" properties into
	sub-dialog (N80021).


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2008-02-20 16:47:01 UTC (rev 15214)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2008-02-20 16:56:36 UTC (rev 15215)
@@ -5,6 +5,9 @@
 	content as the internal file name as soon as it changes, so there
 	isn't any mismatch between the internally stored name and the
 	displayed one. (N75049)
+	(hildon_file_chooser_dialog_create_sub_dialog): Copy "local-only",
+	"show-hidden", and "show-upnp" properties into
+	sub-dialog (N80021).
 
 	* hildon-fm/hildon-file-chooser-dialog.c
 	(handle_folder_popup): Do not change current name unless there has

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2008-02-20 16:47:01 UTC (rev 15214)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2008-02-20 16:56:36 UTC (rev 15215)
@@ -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.
+  * Fixes: NB#76327, NB#74397, NB#75049, NB#80021.
 
  -- 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-chooser-dialog.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2008-02-20 16:47:01 UTC (rev 15214)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2008-02-20 16:56:36 UTC (rev 15215)
@@ -1204,13 +1204,23 @@
                                                   action)
 {
     GtkWidget *dialog;
+    gboolean local_only = FALSE;
+    gboolean show_hidden = FALSE;
+    gboolean show_upnp = TRUE;
+    
+    g_object_get (self->priv->filetree, "local-only", &local_only, NULL);
+    g_object_get (self->priv->filetree, "show-hidden", &show_hidden, NULL);
+    g_object_get (self->priv->filetree, "show-upnp", &show_upnp, NULL);
 
-    dialog =
-        hildon_file_chooser_dialog_new_with_properties(GTK_WINDOW(self),
-                                                       "action", action,
-                                                       "file-system-model",
-                                                       self->priv->model,
-                                                       NULL);
+    dialog = hildon_file_chooser_dialog_new_with_properties
+      (GTK_WINDOW(self),
+       "action", action,
+       "file-system-model",
+       self->priv->model, 
+       "local-only", local_only,
+       "show-hidden", show_hidden,
+       "show-upnp", show_upnp,
+       NULL);
     gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
     sync_current_folders(self, HILDON_FILE_CHOOSER_DIALOG(dialog));