Added figures by Fotis Tsamis

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

diff --git a/shell/ev-sidebar-page.c b/shell/ev-sidebar-page.c
index af45413183864ee5d50b619dcdd4a86c68d0d463..14bb847c2858f7d195e0b6821ab3731e3b4f22f4 100644 (file)
--- a/shell/ev-sidebar-page.c
+++ b/shell/ev-sidebar-page.c
@@ -22,38 +22,15 @@
 #include "config.h"
 #endif
 
-#include "ev-sidebar-page.h"
 #include <gtk/gtk.h>
 
-static void ev_sidebar_page_iface_init (gpointer iface);
-
-GType
-ev_sidebar_page_get_type (void)
-{
-       static GType type = 0;
-
-       if (G_UNLIKELY (type == 0))
-       {
-               static const GTypeInfo sidebar_page_info =
-               {
-                       sizeof (EvSidebarPageIface),
-                       NULL,
-                       NULL,
-                       (GClassInitFunc)ev_sidebar_page_iface_init,
-               };
-
-               type = g_type_register_static (G_TYPE_INTERFACE,
-                                              "EvSidebarPage",
-                                              &sidebar_page_info, (GTypeFlags)0);
-       }
-
-       return type;
-}
+#include "ev-sidebar-page.h"
 
+EV_DEFINE_INTERFACE (EvSidebarPage, ev_sidebar_page, 0)
 
 gboolean 
-ev_sidebar_page_support_document  (EvSidebarPage    *sidebar_page,
-                                  EvDocument *document)
+ev_sidebar_page_support_document (EvSidebarPage *sidebar_page,
+                                 EvDocument    *document)
 {
         EvSidebarPageIface *iface;
 
@@ -68,8 +45,8 @@ ev_sidebar_page_support_document  (EvSidebarPage    *sidebar_page,
 }
 
 void 
-ev_sidebar_page_set_document      (EvSidebarPage    *sidebar_page,
-                                  EvDocument *document)
+ev_sidebar_page_set_document (EvSidebarPage *sidebar_page,
+                             EvDocument    *document)
 {
        EvSidebarPageIface *iface;
 
@@ -78,15 +55,13 @@ ev_sidebar_page_set_document      (EvSidebarPage    *sidebar_page,
 
        iface = EV_SIDEBAR_PAGE_GET_IFACE (sidebar_page);
 
-       g_return_if_fail (iface->set_document);
+       g_assert (iface->set_document);
        
        iface->set_document (sidebar_page, document);
-       
-       return;
 }
 
-const gchar*
-ev_sidebar_page_get_label (EvSidebarPage    *sidebar_page)
+const gchar *
+ev_sidebar_page_get_label (EvSidebarPage *sidebar_page)
 {
        EvSidebarPageIface *iface;
 
@@ -94,18 +69,24 @@ ev_sidebar_page_get_label (EvSidebarPage    *sidebar_page)
 
        iface = EV_SIDEBAR_PAGE_GET_IFACE (sidebar_page);
 
-       g_return_val_if_fail (iface->get_label, NULL);
+       g_assert (iface->get_label);
        
        return iface->get_label (sidebar_page);
 }
 
 
-static void ev_sidebar_page_iface_init (gpointer         iface)
+static void
+ev_sidebar_page_class_init (EvSidebarPageIface *iface)
 {
-       g_object_interface_install_property (iface,
-                                            g_param_spec_object ("main-widget",
-                                                                 "Main Widget",
-                                                                 "Main page widget, used to handle focus",
-                                                                 GTK_TYPE_WIDGET,
-                                                                 G_PARAM_READABLE));
+       static gboolean initialized = FALSE;
+ 
+       if (!initialized) {
+               g_object_interface_install_property (iface,
+                                                    g_param_spec_object ("main-widget",
+                                                                         "Main Widget",
+                                                                         "Main page widget, used to handle focus",
+                                                                         GTK_TYPE_WIDGET,
+                                                                         G_PARAM_READABLE));
+               initialized = TRUE;
+       }
 }