Fix fir bug 308265: Sidebar dissappears coming out of Presentation mode

diff --git a/ChangeLog b/ChangeLog
index 5d8952a04328ecd72effc681c97391ac0bf2ea7f..525140040ce514be3d007db56bd4b9312af4bd15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-23  Nikolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+       * shell/ev-window.c: (ev_window_sidebar_visibility_changed_cb):
+       
+       Fix for Bug 308265: Sidebar dissappears coming out of 
+       Presentation mode
+
 2005-06-23  Nikolay V. Shmyrev  <nshmyrev@yandex.ru>
 
        * shell/ev-application.c: (ev_application_open):

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 07aaa37dd8044cc0d9cccd7f32ab99934b2384a7..cb3994034ffcbe07afa360282f55d3d31c4e5e6f 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -2216,17 +2216,18 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspe
                                         EvWindow   *ev_window)
 {
        GtkAction *action;
-       gboolean visible, fullscreen;
+       gboolean visible, fullscreen_mode;
+
+
+       fullscreen_mode = ev_view_get_presentation (EV_VIEW (ev_window->priv->view)) ||
+                              ev_view_get_fullscreen (EV_VIEW (ev_window->priv->view));
 
-       g_object_get (ev_window->priv->view,
-                     "fullscreen", &fullscreen,
-                     NULL);
        visible = GTK_WIDGET_VISIBLE (ev_sidebar);
 
        /* In fullscreen mode the sidebar is not visible,
         * but we don't want to update the chrome
         */
-       if (fullscreen)
+       if (fullscreen_mode)
                return;
        
        action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar");