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

[evince.git] / libdocument / ev-document-layers.c

diff --git a/libdocument/ev-document-layers.c b/libdocument/ev-document-layers.c
index f203565ea47a040520601a0f24e0ba295b091edc..38c8885b7d39870eb73ab3ab6e1e646b76d2678c 100644 (file)
--- a/libdocument/ev-document-layers.c
+++ b/libdocument/ev-document-layers.c
@@ -15,37 +15,25 @@
  *
  * 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.
  */
 
 #include "config.h"
 
 #include "ev-document-layers.h"
+#include "ev-document.h"
 
-GType
-ev_document_layers_get_type (void)
-{
-       static GType type = 0;
-
-       if (G_UNLIKELY (type == 0)) {
-               const GTypeInfo our_info = {
-                       sizeof (EvDocumentLayersIface),
-                       NULL,
-                       NULL,
-               };
+G_DEFINE_INTERFACE (EvDocumentLayers, ev_document_layers, 0)
 
-               type = g_type_register_static (G_TYPE_INTERFACE,
-                                              "EvDocumentLayers",
-                                              &our_info, (GTypeFlags)0);
-       }
-
-       return type;
+static void
+ev_document_layers_default_init (EvDocumentLayersInterface *klass)
+{
 }
 
 gboolean
 ev_document_layers_has_layers (EvDocumentLayers *document_layers)
 {
-       EvDocumentLayersIface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers);
+       EvDocumentLayersInterface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers);
 
        return iface->has_layers (document_layers);
 }
@@ -53,7 +41,7 @@ ev_document_layers_has_layers (EvDocumentLayers *document_layers)
 GtkTreeModel *
 ev_document_layers_get_layers (EvDocumentLayers *document_layers)
 {
-       EvDocumentLayersIface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers);
+       EvDocumentLayersInterface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers);
 
        return iface->get_layers (document_layers);
 }
@@ -62,7 +50,7 @@ void
 ev_document_layers_show_layer (EvDocumentLayers *document_layers,
                               EvLayer          *layer)
 {
-       EvDocumentLayersIface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers);
+       EvDocumentLayersInterface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers);
 
        iface->show_layer (document_layers, layer);
 }
@@ -71,7 +59,7 @@ void
 ev_document_layers_hide_layer (EvDocumentLayers *document_layers,
                               EvLayer          *layer)
 {
-       EvDocumentLayersIface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers);
+       EvDocumentLayersInterface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers);
 
        iface->hide_layer (document_layers, layer);
 }
@@ -80,7 +68,7 @@ gboolean
 ev_document_layers_layer_is_visible (EvDocumentLayers *document_layers,
                                     EvLayer          *layer)
 {
-       EvDocumentLayersIface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers);
+       EvDocumentLayersInterface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers);
 
        return iface->layer_is_visible (document_layers, layer);
 }