diff options
| author | raveit65 <[email protected]> | 2017-03-08 13:24:04 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2017-03-08 16:08:00 +0100 |
| commit | adff2474297f0153bd5f06b9e89b7674eaef7435 (patch) | |
| tree | 5bc4a9dfb1e1647de9dff9c3418bac27793378ad /font-viewer | |
| parent | cc55fabbf675e4f4b8c79d8be1ab3cb5c503f907 (diff) | |
| download | mate-control-center-adff2474297f0153bd5f06b9e89b7674eaef7435.tar.bz2 mate-control-center-adff2474297f0153bd5f06b9e89b7674eaef7435.tar.xz | |
sushi-font-loader: Add face_index argument
sushi_new_ft_face_from_uri{,_async}() now takes face index as the third
argument. All callers changed.
https://bugzilla.gnome.org/show_bug.cgi?id=752005
taken from:
https://git.gnome.org/browse/gnome-font-viewer/commit/?id=28bab70
Diffstat (limited to 'font-viewer')
| -rw-r--r-- | font-viewer/font-thumbnailer.c | 2 | ||||
| -rw-r--r-- | font-viewer/font-utils.c | 2 | ||||
| -rw-r--r-- | font-viewer/sushi-font-loader.c | 9 | ||||
| -rw-r--r-- | font-viewer/sushi-font-loader.h | 2 | ||||
| -rw-r--r-- | font-viewer/sushi-font-widget.c | 1 |
5 files changed, 11 insertions, 5 deletions
diff --git a/font-viewer/font-thumbnailer.c b/font-viewer/font-thumbnailer.c index 4ce71f73..74b135d0 100644 --- a/font-viewer/font-thumbnailer.c +++ b/font-viewer/font-thumbnailer.c @@ -237,7 +237,7 @@ main (int argc, uri = g_file_get_uri (file); g_object_unref (file); - face = sushi_new_ft_face_from_uri (library, uri, &contents, &gerror); + face = sushi_new_ft_face_from_uri (library, uri, 0, &contents, &gerror); if (gerror) { g_printerr ("Could not load face '%s': %s\n", uri, gerror->message); diff --git a/font-viewer/font-utils.c b/font-viewer/font-utils.c index 7ec5f605..6c96395a 100644 --- a/font-viewer/font-utils.c +++ b/font-viewer/font-utils.c @@ -47,7 +47,7 @@ font_utils_get_font_name_for_file (FT_Library library, file = g_file_new_for_path (path); uri = g_file_get_uri (file); - face = sushi_new_ft_face_from_uri (library, uri, &contents, &error); + face = sushi_new_ft_face_from_uri (library, uri, 0, &contents, &error); if (face != NULL) { name = font_utils_get_font_name (face); FT_Done_Face (face); diff --git a/font-viewer/sushi-font-loader.c b/font-viewer/sushi-font-loader.c index 41b4c219..c317d098 100644 --- a/font-viewer/sushi-font-loader.c +++ b/font-viewer/sushi-font-loader.c @@ -45,13 +45,14 @@ typedef struct { static FontLoadJob * font_load_job_new (FT_Library library, const gchar *uri, + gint face_index, GAsyncReadyCallback callback, gpointer user_data) { FontLoadJob *job = g_slice_new0 (FontLoadJob); job->library = library; - job->face_index = 0; + job->face_index = (FT_Long) face_index; job->file = g_file_new_for_uri (uri); return job; @@ -134,13 +135,14 @@ font_load_job (GTask *task, FT_Face sushi_new_ft_face_from_uri (FT_Library library, const gchar *uri, + gint face_index, gchar **contents, GError **error) { FontLoadJob *job = NULL; FT_Face face; - job = font_load_job_new (library, uri, NULL, NULL); + job = font_load_job_new (library, uri, face_index, NULL, NULL); font_load_job_do_load (job, error); if ((error != NULL) && (*error != NULL)) { @@ -161,10 +163,11 @@ sushi_new_ft_face_from_uri (FT_Library library, void sushi_new_ft_face_from_uri_async (FT_Library library, const gchar *uri, + gint face_index, GAsyncReadyCallback callback, gpointer user_data) { - FontLoadJob *job = font_load_job_new (library, uri, callback, user_data); + FontLoadJob *job = font_load_job_new (library, uri, face_index, callback, user_data); GTask *task; task = g_task_new (NULL, NULL, callback, user_data); diff --git a/font-viewer/sushi-font-loader.h b/font-viewer/sushi-font-loader.h index aa63b9b1..8fd33502 100644 --- a/font-viewer/sushi-font-loader.h +++ b/font-viewer/sushi-font-loader.h @@ -34,11 +34,13 @@ FT_Face sushi_new_ft_face_from_uri (FT_Library library, const gchar *uri, + gint face_index, gchar **contents, GError **error); void sushi_new_ft_face_from_uri_async (FT_Library library, const gchar *uri, + gint face_index, GAsyncReadyCallback callback, gpointer user_data); diff --git a/font-viewer/sushi-font-widget.c b/font-viewer/sushi-font-widget.c index 1c8a418b..e4c18f28 100644 --- a/font-viewer/sushi-font-widget.c +++ b/font-viewer/sushi-font-widget.c @@ -574,6 +574,7 @@ load_font_face (SushiFontWidget *self) { sushi_new_ft_face_from_uri_async (self->priv->library, self->priv->uri, + 0, font_face_async_ready_cb, self); } |