[nautilus/wip/gbsneto/cleanups] window: remove old hack
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/gbsneto/cleanups] window: remove old hack
- Date: Wed, 29 Jul 2015 22:27:40 +0000 (UTC)
commit e7680032748ff875ec38ee6a54580d11c1e3a335
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Wed Jul 29 19:10:36 2015 -0300
window: remove old hack
NautilusWindow immediately displays the newly opened
tab or window and, for that to happen correctly, an
old hack is present.
This hack, however, added some unecessary complexity
to NautilusWindow code, and is completely obsolete
nowadays.
Remove the old hack and show the window properly.
src/nautilus-application.c | 2 ++
src/nautilus-view.c | 3 ---
src/nautilus-window.c | 21 ---------------------
3 files changed, 2 insertions(+), 24 deletions(-)
---
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 19ce99a..95a1812 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -372,6 +372,8 @@ nautilus_application_create_window (NautilusApplication *application,
}
g_free (geometry_string);
+ gtk_widget_show (GTK_WIDGET (window));
+
DEBUG ("Creating a new navigation window");
nautilus_profile_end (NULL);
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index a666ee9..fc4d399 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -7235,9 +7235,6 @@ finish_loading (NautilusView *view)
setup_loading_floating_bar (view);
check_empty_states (view);
- /* Assume we have now all information to show window */
- nautilus_window_view_visible (nautilus_view_get_window (view), NAUTILUS_VIEW (view));
-
if (nautilus_directory_are_all_files_seen (view->details->model)) {
/* Unschedule a pending update and schedule a new one with the minimal
* update interval. This gives the view a short chance at gathering the
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 1b8d9d0..48c0c35 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -2253,27 +2253,6 @@ nautilus_window_view_visible (NautilusWindow *window,
g_return_if_fail (NAUTILUS_IS_WINDOW (window));
- /* FIXME: this code is odd and should not really be needed, but
- * removing it causes bugs, see e.g.
- * https://bugzilla.gnome.org/show_bug.cgi?id=679640
- *
- * Needs more investigation...
- */
- slot = nautilus_view_get_nautilus_window_slot (view);
- if (g_object_get_data (G_OBJECT (slot), "nautilus-window-view-visible") != NULL) {
- return;
- }
-
- g_object_set_data (G_OBJECT (slot), "nautilus-window-view-visible", GINT_TO_POINTER (1));
-
- /* Look for other non-visible slots */
- for (l = window->priv->slots; l != NULL; l = l->next) {
- slot = l->data;
- if (g_object_get_data (G_OBJECT (slot), "nautilus-window-view-visible") == NULL) {
- return;
- }
- }
-
/* Look for other non-visible slots */
for (l = window->priv->slots; l != NULL; l = l->next) {
slot = l->data;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]