[maemo-commits] [maemo-commits] r12913 - projects/haf/trunk/hildon-fm/hildon-fm

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-07-30 17:15:55 +0300 (Mon, 30 Jul 2007)
New Revision: 12913

Modified:
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
Log:
Call inspect_view in constructor to initialize the views properly.


Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2007-07-30 14:00:57 UTC (rev 12912)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2007-07-30 14:15:55 UTC (rev 12913)
@@ -423,7 +423,7 @@
     gboolean content_focused = FALSE;
 
     if (!hildon_file_selection_content_pane_visible(priv))
-        return;
+      return;
 
     current_page = priv->cur_view;
     target_page = get_view_to_be_displayed(priv);
@@ -433,12 +433,11 @@
     {
       content_focused = GTK_WIDGET_HAS_FOCUS(view) ||
           priv->force_content_pane || priv->content_pane_last_used;
-      gtk_widget_hide (view_widget (priv, current_page));
+      if (current_page >= 0)
+	gtk_widget_hide (view_widget (priv, current_page));
       gtk_widget_show (view_widget (priv, target_page));
       priv->cur_view = target_page;
 
-      fprintf (stderr, "SHOWING %d -> %d\n", current_page, target_page);
-
       if (current_page == HILDON_FILE_SELECTION_MODE_THUMBNAILS &&
         target_page == HILDON_FILE_SELECTION_MODE_LIST)
         hildon_file_selection_sync_selections(priv, priv->view[1],
@@ -464,7 +463,6 @@
     if (priv->force_content_pane)
       expand_cursor_row(GTK_TREE_VIEW(priv->dir_tree));
 }
-
 static void hildon_file_selection_forall(GtkContainer * self,
                                          gboolean include_internals,
                                          GtkCallback callback,
@@ -3084,13 +3082,6 @@
     gtk_box_pack_start (GTK_BOX (self->priv->view_selector),
 			self->priv->scroll_thumb, TRUE, TRUE, 0);
 
-    gtk_widget_show_all (priv->hpaned);
-    priv->cur_view = 0;
-    gtk_widget_hide (priv->scroll_thumb);
-    gtk_widget_hide (priv->view[2]);
-    gtk_widget_hide (priv->view[3]);
-
-
     /* Also the views of the navigation pane are trees (and this is
        needed). Let's deny expanding */
     g_signal_connect(priv->view[0], "test-expand-row",
@@ -3157,6 +3148,15 @@
         hildon_file_selection_setup_dnd_view(self, priv->dir_tree);
     }
 
+    gtk_widget_show_all (priv->hpaned);
+    priv->cur_view = -1;
+    gtk_widget_hide (priv->scroll_list);
+    gtk_widget_hide (priv->scroll_thumb);
+    gtk_widget_hide (priv->view[2]);
+    gtk_widget_hide (priv->view[3]);
+
+    hildon_file_selection_inspect_view (priv);
+
     return obj;
 }