diff options
Diffstat (limited to 'libdocument')
-rw-r--r-- | libdocument/Makefile.am | 2 | ||||
-rw-r--r-- | libdocument/ev-document-attachments.c | 1 | ||||
-rw-r--r-- | libdocument/ev-document-factory.c | 1 | ||||
-rw-r--r-- | libdocument/ev-document-fonts.h | 1 | ||||
-rw-r--r-- | libdocument/ev-document-misc.c | 1 | ||||
-rw-r--r-- | libdocument/ev-document-security.h | 1 | ||||
-rw-r--r-- | libdocument/ev-document-text.c | 1 | ||||
-rw-r--r-- | libdocument/ev-document.c | 1 | ||||
-rw-r--r-- | libdocument/ev-document.h | 5 | ||||
-rw-r--r-- | libdocument/ev-file-helpers.c | 87 | ||||
-rw-r--r-- | libdocument/ev-file-helpers.h | 1 | ||||
-rw-r--r-- | libdocument/ev-form-field.h | 1 | ||||
-rw-r--r-- | libdocument/ev-image.h | 1 | ||||
-rw-r--r-- | libdocument/ev-init.c | 7 | ||||
-rw-r--r-- | libdocument/ev-render-context.h | 2 | ||||
-rw-r--r-- | libdocument/ev-transition-effect.c | 2 | ||||
-rw-r--r-- | libdocument/ev-transition-effect.h | 2 |
17 files changed, 5 insertions, 112 deletions
diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am index d1db419c..fc81c891 100644 --- a/libdocument/Makefile.am +++ b/libdocument/Makefile.am @@ -168,7 +168,7 @@ AtrilDocument-$(EV_API_VERSION).gir: libatrildocument.la Makefile $(INST_H_FILES --include=Gdk-3.0 \ --include=GdkPixbuf-2.0 \ --include=Gtk-3.0 \ - --library=atrildocument \ + --library=libatrildocument.la \ --libtool="$(LIBTOOL)" \ --output $@ \ --pkg atril-document-$(EV_API_VERSION) \ diff --git a/libdocument/ev-document-attachments.c b/libdocument/ev-document-attachments.c index 6b1b695f..cdc840d5 100644 --- a/libdocument/ev-document-attachments.c +++ b/libdocument/ev-document-attachments.c @@ -52,4 +52,3 @@ ev_document_attachments_get_attachments (EvDocumentAttachments *document_attachm return iface->get_attachments (document_attachments); } - diff --git a/libdocument/ev-document-factory.c b/libdocument/ev-document-factory.c index 82286829..4d07f065 100644 --- a/libdocument/ev-document-factory.c +++ b/libdocument/ev-document-factory.c @@ -106,7 +106,6 @@ get_compression_from_mime_type (const gchar *mime_type) return EV_COMPRESSION_NONE; } - /* * get_document_from_uri: * @uri: the document URI diff --git a/libdocument/ev-document-fonts.h b/libdocument/ev-document-fonts.h index 6251644a..bd5d4220 100644 --- a/libdocument/ev-document-fonts.h +++ b/libdocument/ev-document-fonts.h @@ -37,7 +37,6 @@ G_BEGIN_DECLS - #define EV_TYPE_DOCUMENT_FONTS (ev_document_fonts_get_type ()) #define EV_DOCUMENT_FONTS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_FONTS, EvDocumentFonts)) #define EV_DOCUMENT_FONTS_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_FONTS, EvDocumentFontsInterface)) diff --git a/libdocument/ev-document-misc.c b/libdocument/ev-document-misc.c index 80948936..06dce9c5 100644 --- a/libdocument/ev-document-misc.c +++ b/libdocument/ev-document-misc.c @@ -149,7 +149,6 @@ ev_document_misc_get_page_border_size (gint page_width, } } - void ev_document_misc_paint_one_page (cairo_t *cr, GtkWidget *widget, diff --git a/libdocument/ev-document-security.h b/libdocument/ev-document-security.h index 1f411562..beef49af 100644 --- a/libdocument/ev-document-security.h +++ b/libdocument/ev-document-security.h @@ -35,7 +35,6 @@ G_BEGIN_DECLS - #define EV_TYPE_DOCUMENT_SECURITY (ev_document_security_get_type ()) #define EV_DOCUMENT_SECURITY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_SECURITY, EvDocumentSecurity)) #define EV_DOCUMENT_SECURITY_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_SECURITY, EvDocumentSecurityInterface)) diff --git a/libdocument/ev-document-text.c b/libdocument/ev-document-text.c index 8fdc916c..072782f6 100644 --- a/libdocument/ev-document-text.c +++ b/libdocument/ev-document-text.c @@ -42,7 +42,6 @@ ev_document_text_get_text (EvDocumentText *document_text, return iface->get_text (document_text, page); } - gboolean ev_document_text_get_text_layout (EvDocumentText *document_text, EvPage *page, diff --git a/libdocument/ev-document.c b/libdocument/ev-document.c index f7c87895..96b80946 100644 --- a/libdocument/ev-document.c +++ b/libdocument/ev-document.c @@ -388,7 +388,6 @@ ev_document_get_page (EvDocument *document, return klass->get_page (document, index); } - #ifdef ENABLE_SYNCTEX static gboolean _ev_document_support_synctex (EvDocument *document) diff --git a/libdocument/ev-document.h b/libdocument/ev-document.h index 7fb1bf2f..ea0016c0 100644 --- a/libdocument/ev-document.h +++ b/libdocument/ev-document.h @@ -56,6 +56,7 @@ typedef struct _EvDocumentPrivate EvDocumentPrivate; typedef enum { EV_DOCUMENT_ERROR_INVALID, + EV_DOCUMENT_ERROR_UNSUPPORTED_CONTENT, EV_DOCUMENT_ERROR_ENCRYPTED } EvDocumentError; @@ -277,10 +278,6 @@ register_atril_backend (GTypeModule *module) \ (GInstanceInitFunc) backend_name##_init \ }; \ \ - /* Initialise the i18n stuff */ \ - bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); \ - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); \ - \ g_define_type_id = g_type_module_register_type (module, \ EV_TYPE_DOCUMENT, \ #BackendName, \ diff --git a/libdocument/ev-file-helpers.c b/libdocument/ev-file-helpers.c index 9b22e93a..f077e9fc 100644 --- a/libdocument/ev-file-helpers.c +++ b/libdocument/ev-file-helpers.c @@ -197,91 +197,6 @@ ev_mkstemp_file (const char *template, } /** - * This function is copied from - * http://bugzilla.gnome.org/show_bug.cgi?id=524831 - * and renamed from g_mkdtemp to _ev_g_mkdtemp. - * - * If/when this function gets added to glib, it can be removed from - * atril' sources. - * - * - * g_mkdtemp: - * @tmpl: template directory name - * - * Creates a temporary directory. See the mkdtemp() documentation - * on most UNIX-like systems. - * - * The parameter is a string that should follow the rules for - * mkdtemp() templates, i.e. contain the string "XXXXXX". g_mkdtemp() - * is slightly more flexible than mkdtemp() in that the sequence does - * not have to occur at the very end of the template. The X string - * will be modified to form the name of a directory that didn't - * already exist. The string should be in the GLib file name - * encoding. Most importantly, on Windows it should be in UTF-8. - * - * Return value: If a temporary directory was successfully created, - * @tmpl will be returned with the XXXXXX string modified in such a - * way as to make the path unique. In case of errors, %NULL is - * returned. - */ -static gchar * -_ev_g_mkdtemp (gchar *tmpl) -{ - static const char letters[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - static const int NLETTERS = sizeof (letters) - 1; - static int counter = 0; - char *XXXXXX; - GTimeVal tv; - glong value; - int count; - - /* find the last occurrence of "XXXXXX" */ - XXXXXX = g_strrstr (tmpl, "XXXXXX"); - - if (!XXXXXX || strncmp (XXXXXX, "XXXXXX", 6)) - { - errno = EINVAL; - return NULL; - } - - /* Get some more or less random data. */ - g_get_current_time (&tv); - value = (tv.tv_usec ^ tv.tv_sec) + counter++; - - for (count = 0; count < 100; value += 7777, ++count) - { - glong v = value; - - /* Fill in the random bits. */ - XXXXXX[0] = letters[v % NLETTERS]; - v /= NLETTERS; - XXXXXX[1] = letters[v % NLETTERS]; - v /= NLETTERS; - XXXXXX[2] = letters[v % NLETTERS]; - v /= NLETTERS; - XXXXXX[3] = letters[v % NLETTERS]; - v /= NLETTERS; - XXXXXX[4] = letters[v % NLETTERS]; - v /= NLETTERS; - XXXXXX[5] = letters[v % NLETTERS]; - - /* tmpl is in UTF-8 on Windows, thus use g_mkdir() */ - if (g_mkdir (tmpl, 0700) == 0) - return tmpl; - - if (errno != EEXIST) - /* Any other error will apply also to other names we might - * try, and there are 2^32 or so of them, so give up now. - */ - return NULL; - } - - /* We got out of the loop because we ran out of combinations to try. */ - errno = EEXIST; - return NULL; -} - -/** * ev_mkdtemp: * @template: a template string; must end in 'XXXXXX' * @error: a location to store a #GError @@ -302,7 +217,7 @@ ev_mkdtemp (const char *template, return NULL; name = g_build_filename (tmp, template, NULL); - if (_ev_g_mkdtemp (name) == NULL) { + if (g_mkdtemp (name) == NULL) { int errsv = errno; g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errsv), diff --git a/libdocument/ev-file-helpers.h b/libdocument/ev-file-helpers.h index 0a6ff7e0..d55ef267 100644 --- a/libdocument/ev-file-helpers.h +++ b/libdocument/ev-file-helpers.h @@ -66,7 +66,6 @@ gchar *ev_file_compress (const gchar *uri, EvCompressionType type, GError **error); - G_END_DECLS #endif /* EV_FILE_HELPERS_H */ diff --git a/libdocument/ev-form-field.h b/libdocument/ev-form-field.h index c0795463..45db85d9 100644 --- a/libdocument/ev-form-field.h +++ b/libdocument/ev-form-field.h @@ -209,7 +209,6 @@ EvFormField *ev_form_field_choice_new (gint id, GType ev_form_field_signature_get_type (void) G_GNUC_CONST; EvFormField *ev_form_field_signature_new (gint id); - G_END_DECLS #endif /* !EV_FORM_FIELD_H */ diff --git a/libdocument/ev-image.h b/libdocument/ev-image.h index 738b7fd5..899d502f 100644 --- a/libdocument/ev-image.h +++ b/libdocument/ev-image.h @@ -62,7 +62,6 @@ const gchar *ev_image_save_tmp (EvImage *image, GdkPixbuf *pixbuf); const gchar *ev_image_get_tmp_uri (EvImage *image); - G_END_DECLS #endif /* __EV_IMAGE_H__ */ diff --git a/libdocument/ev-init.c b/libdocument/ev-init.c index 15cb555e..21aca668 100644 --- a/libdocument/ev-init.c +++ b/libdocument/ev-init.c @@ -38,8 +38,7 @@ ev_get_locale_dir (void) /** * ev_init: * - * Initializes the atril document library, and binds the atril - * gettext domain. + * Initializes the atril document library. * * You must call this before calling any other function in the atril * document library. @@ -54,10 +53,6 @@ ev_init (void) if (ev_init_count++ > 0) return have_backends; - /* set up translation catalog */ - bindtextdomain (GETTEXT_PACKAGE, ev_get_locale_dir ()); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - _ev_debug_init (); _ev_file_helpers_init (); have_backends = _ev_backends_manager_init (); diff --git a/libdocument/ev-render-context.h b/libdocument/ev-render-context.h index 4366842d..e071cb01 100644 --- a/libdocument/ev-render-context.h +++ b/libdocument/ev-render-context.h @@ -52,7 +52,6 @@ struct _EvRenderContext gdouble scale; }; - GType ev_render_context_get_type (void) G_GNUC_CONST; EvRenderContext *ev_render_context_new (EvPage *page, gint rotation, @@ -64,7 +63,6 @@ void ev_render_context_set_rotation (EvRenderContext *rc, void ev_render_context_set_scale (EvRenderContext *rc, gdouble scale); - G_END_DECLS #endif /* !EV_RENDER_CONTEXT */ diff --git a/libdocument/ev-transition-effect.c b/libdocument/ev-transition-effect.c index ce6798f4..b521ff91 100644 --- a/libdocument/ev-transition-effect.c +++ b/libdocument/ev-transition-effect.c @@ -81,7 +81,7 @@ ev_transition_effect_set_property (GObject *object, priv->scale = g_value_get_double (value); break; case PROP_RECTANGULAR: - priv->rectangular = g_value_get_boolean (value); + priv->rectangular = (g_value_get_boolean (value) != FALSE); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); diff --git a/libdocument/ev-transition-effect.h b/libdocument/ev-transition-effect.h index b9d00c0b..5cb91dd1 100644 --- a/libdocument/ev-transition-effect.h +++ b/libdocument/ev-transition-effect.h @@ -61,7 +61,6 @@ typedef enum { EV_TRANSITION_DIRECTION_OUTWARD } EvTransitionEffectDirection; - typedef struct EvTransitionEffect EvTransitionEffect; typedef struct EvTransitionEffectClass EvTransitionEffectClass; @@ -75,7 +74,6 @@ struct EvTransitionEffectClass GObjectClass parent_class; }; - GType ev_transition_effect_get_type (void) G_GNUC_CONST; EvTransitionEffect *ev_transition_effect_new (EvTransitionEffectType type, |