diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2005-07-11 15:49:04 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2005-07-11 15:49:04 (GMT) |
| commit | 14e7543ecf3dc28eee5d813f5f09d146b539618d (patch) | |
| tree | 9bb21a9355a037a57b1b34e17004a1e52b75d720 | |
| parent | 80444e12678d3f2f46dc3a46c66436f60b2be239 (diff) | |
Do not leak the fullscreen toolbar
2005-07-11 Marco Pesenti Gritti <mpg@redhat.com>
* shell/ev-window.c: (update_chrome_visibility),
(ev_window_create_fullscreen_popup), (ev_window_init):
Do not leak the fullscreen toolbar
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | shell/ev-window.c | 11 |
2 files changed, 12 insertions, 6 deletions
@@ -1,5 +1,12 @@ 2005-07-11 Marco Pesenti Gritti <mpg@redhat.com> + * shell/ev-window.c: (update_chrome_visibility), + (ev_window_create_fullscreen_popup), (ev_window_init): + + Do not leak the fullscreen toolbar + +2005-07-11 Marco Pesenti Gritti <mpg@redhat.com> + * shell/ev-window.c: (view_actions_focus_in_cb), (view_actions_focus_out_cb): diff --git a/shell/ev-window.c b/shell/ev-window.c index cc5e739..0c5ca3d 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -341,13 +341,14 @@ update_chrome_visibility (EvWindow *window) set_widget_visibility (priv->sidebar, sidebar); set_widget_visibility (priv->find_bar, findbar); set_widget_visibility (priv->statusbar, statusbar); - set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar); if (priv->fullscreen_popup != NULL) { if (fullscreen) show_fullscreen_popup (window); else set_widget_visibility (priv->fullscreen_popup, FALSE); + + set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar); } } @@ -1662,6 +1663,9 @@ ev_window_create_fullscreen_popup (EvWindow *window) GtkWidget *hbox; GtkWidget *button; + window->priv->fullscreen_toolbar = egg_editable_toolbar_new_with_model + (window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP)); + popup = gtk_window_new (GTK_WINDOW_POPUP); hbox = gtk_hbox_new (FALSE, 0); button = ev_window_get_exit_fullscreen_button (window); @@ -3254,11 +3258,6 @@ ev_window_init (EvWindow *ev_window) TRUE, TRUE, 0); gtk_widget_show (ev_window->priv->toolbar); - ev_window->priv->fullscreen_toolbar = egg_editable_toolbar_new_with_model - (ev_window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP)); - egg_editable_toolbar_show (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), - "DefaultToolBar"); - /* Add the main area */ ev_window->priv->hpaned = gtk_hpaned_new (); g_signal_connect (ev_window->priv->hpaned, |