686c686
<   gboolean        cycle_tabs;
---
>   gboolean        cycle_tabs = 1;
707c707
<       g_object_get (G_OBJECT (window->preferences),
---
>       /*g_object_get (G_OBJECT (window->preferences),
709c709
<                     NULL);
---
>                     NULL);*/
712c712
<       gtk_action_set_sensitive (action, (cycle_tabs && n_pages > 1) || (page_num > 0));
---
>       gtk_action_set_sensitive (action, cycle_tabs /*&& n_pages > 1) || (page_num > 0)*/);
715c715
<       gtk_action_set_sensitive (action, (cycle_tabs && n_pages > 1 ) || (page_num < n_pages - 1));
---
>       gtk_action_set_sensitive (action, cycle_tabs /*&& n_pages > 1 ) || (page_num < n_pages - 1)*/);
924c924
<       gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window->notebook), !tabs_shown);
---
>       gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window->notebook), always_show_tabs/*!tabs_shown*/);