Rename error as mdvi_error to avoid symbol conflicts with the libc error.

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

diff --git a/libdocument/ev-document.c b/libdocument/ev-document.c
index 5e582d0aae3c9cfa8a3f5b10df4a73c5f7e2c604..1171509a3587ec8c29d259671821079c73967bca 100644 (file)
--- a/libdocument/ev-document.c
+++ b/libdocument/ev-document.c
@@ -30,7 +30,6 @@ static void ev_document_class_init (gpointer g_class);
 GMutex *ev_doc_mutex = NULL;
 GMutex *ev_fc_mutex = NULL;
 
-#define LOG(x) 
 GType
 ev_document_get_type (void)
 {
@@ -90,6 +89,12 @@ ev_document_doc_mutex_unlock (void)
        g_mutex_unlock (ev_document_get_doc_mutex ());
 }
 
+gboolean
+ev_document_doc_mutex_trylock (void)
+{
+       return g_mutex_trylock (ev_document_get_doc_mutex ());
+}
+
 GMutex *
 ev_document_get_fc_mutex (void)
 {
@@ -111,6 +116,12 @@ ev_document_fc_mutex_unlock (void)
        g_mutex_unlock (ev_document_get_fc_mutex ());
 }
 
+gboolean
+ev_document_fc_mutex_trylock (void)
+{
+       return g_mutex_trylock (ev_document_get_fc_mutex ());
+}
+
 gboolean
 ev_document_load (EvDocument  *document,
                  const char  *uri,
@@ -118,7 +129,7 @@ ev_document_load (EvDocument  *document,
 {
        EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
        gboolean retval;
-       LOG ("ev_document_load");
+
        retval = iface->load (document, uri, error);
 
        return retval;
@@ -132,7 +143,6 @@ ev_document_save (EvDocument  *document,
        EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
        gboolean retval;
 
-       LOG ("ev_document_save");
        retval = iface->save (document, uri, error);
 
        return retval;
@@ -144,7 +154,6 @@ ev_document_get_n_pages (EvDocument  *document)
        EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
        gint retval;
 
-       LOG ("ev_document_get_n_pages");
        retval = iface->get_n_pages (document);
 
        return retval;
@@ -173,7 +182,6 @@ ev_document_get_page_size (EvDocument *document,
 {
        EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
 
-       LOG ("ev_document_get_page_size");
        iface->get_page_size (document, page, width, height);
 }
 
@@ -183,7 +191,6 @@ ev_document_get_page_label (EvDocument *document,
 {
        EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
 
-       LOG ("ev_document_get_page_label");
        if (iface->get_page_label == NULL)
                return NULL;
 
@@ -215,7 +222,6 @@ ev_document_get_attachments (EvDocument *document)
        EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
        GList *retval;
 
-       LOG ("ev_document_get_attachments");
        if (iface->get_attachments == NULL)
                return NULL;
        retval = iface->get_attachments (document);
@@ -230,7 +236,6 @@ ev_document_render (EvDocument      *document,
        EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
        cairo_surface_t *retval;
 
-       LOG ("ev_document_render_pixbuf");
        g_assert (iface->render);
 
        retval = iface->render (document, rc);