[dualscreen] fix crash on ctrl+w and fix control window closing

[evince.git] / shell / ev-sidebar-page.c

diff --git a/shell/ev-sidebar-page.c b/shell/ev-sidebar-page.c
index 14bb847c2858f7d195e0b6821ab3731e3b4f22f4..fdb8d4afb2b0bdb034557b0bde25402c8de31ff1 100644 (file)
--- a/shell/ev-sidebar-page.c
+++ b/shell/ev-sidebar-page.c
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
@@ -26,44 +26,44 @@
 
 #include "ev-sidebar-page.h"
 
-EV_DEFINE_INTERFACE (EvSidebarPage, ev_sidebar_page, 0)
+G_DEFINE_INTERFACE (EvSidebarPage, ev_sidebar_page, 0)
 
 gboolean 
 ev_sidebar_page_support_document (EvSidebarPage *sidebar_page,
                                  EvDocument    *document)
 {
-        EvSidebarPageIface *iface;
+        EvSidebarPageInterface *iface;
 
        g_return_val_if_fail (EV_IS_SIDEBAR_PAGE (sidebar_page), FALSE);
         g_return_val_if_fail (EV_IS_DOCUMENT (document), FALSE);
 
        iface = EV_SIDEBAR_PAGE_GET_IFACE (sidebar_page);
 
-        g_return_val_if_fail (iface->set_document, FALSE);
+        g_return_val_if_fail (iface->support_document, FALSE);
        
         return iface->support_document (sidebar_page, document);    
 }
 
-void 
-ev_sidebar_page_set_document (EvSidebarPage *sidebar_page,
-                             EvDocument    *document)
+void
+ev_sidebar_page_set_model (EvSidebarPage   *sidebar_page,
+                          EvDocumentModel *model)
 {
-       EvSidebarPageIface *iface;
+       EvSidebarPageInterface *iface;
 
         g_return_if_fail (EV_IS_SIDEBAR_PAGE (sidebar_page));
-       g_return_if_fail (EV_IS_DOCUMENT (document));
+       g_return_if_fail (EV_IS_DOCUMENT_MODEL (model));
 
        iface = EV_SIDEBAR_PAGE_GET_IFACE (sidebar_page);
 
-       g_assert (iface->set_document);
-       
-       iface->set_document (sidebar_page, document);
+       g_assert (iface->set_model);
+
+       iface->set_model (sidebar_page, model);
 }
 
 const gchar *
 ev_sidebar_page_get_label (EvSidebarPage *sidebar_page)
 {
-       EvSidebarPageIface *iface;
+       EvSidebarPageInterface *iface;
 
         g_return_val_if_fail (EV_IS_SIDEBAR_PAGE (sidebar_page), NULL);
 
@@ -76,7 +76,7 @@ ev_sidebar_page_get_label (EvSidebarPage *sidebar_page)
 
 
 static void
-ev_sidebar_page_class_init (EvSidebarPageIface *iface)
+ev_sidebar_page_default_init (EvSidebarPageInterface *iface)
 {
        static gboolean initialized = FALSE;