diff options
| author | Shaun McCance <shaunm@gnome.org> | 2009-11-13 13:20:55 -0600 |
|---|---|---|
| committer | Shaun McCance <shaunm@gnome.org> | 2009-11-13 13:20:55 -0600 |
| commit | 63016128972c806708cd458c4bf4331da42a9423 (patch) | |
| tree | 95e7aa87459f63627be6c207e61d2f7d5c3e17a6 /libyelp/yelp-mallard-document.c | |
| parent | 8c9d130a7fcc049ed5b7e59c82d5e8336e622de7 (diff) | |
| download | yelp-63016128972c806708cd458c4bf4331da42a9423.tar.gz | |
[yelp-settings] Adding yelp_settings_get_all_params for XSLT parameters
Diffstat (limited to 'libyelp/yelp-mallard-document.c')
| -rw-r--r-- | libyelp/yelp-mallard-document.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/libyelp/yelp-mallard-document.c b/libyelp/yelp-mallard-document.c index 261ff5ff..bed450d8 100644 --- a/libyelp/yelp-mallard-document.c +++ b/libyelp/yelp-mallard-document.c @@ -239,7 +239,7 @@ mallard_request_page (YelpDocument *document, case MALLARD_STATE_BLANK: case MALLARD_STATE_STOP: docuri = yelp_uri_get_document_uri (priv->uri); - error = g_error_new (YELP_ERROR, YELP_ERROR_PROCESSING, + error = g_error_new (YELP_ERROR, YELP_ERROR_NOT_FOUND, _("The page ‘%s’ was not found in the document ‘%s’."), page_id, docuri); g_free (docuri); @@ -553,28 +553,7 @@ mallard_page_data_run (MallardPageData *page_data) (GCallback) transform_error, page_data); - params = g_new0 (gchar *, - (2*YELP_SETTINGS_NUM_COLORS) + (2*YELP_SETTINGS_NUM_ICONS) + 3); - for (i = 0; i < YELP_SETTINGS_NUM_COLORS; i++) { - gchar *val; - ix = 2 * i; - params[ix] = g_strdup (yelp_settings_get_color_param (i)); - val = yelp_settings_get_color (settings, i); - params[ix + 1] = g_strdup_printf ("\"%s\"", val); - g_free (val); - } - for (i = 0; i < YELP_SETTINGS_NUM_ICONS; i++) { - gchar *val; - ix = 2 * (YELP_SETTINGS_NUM_COLORS + i); - params[ix] = g_strdup (yelp_settings_get_icon_param (i)); - val = yelp_settings_get_icon (settings, i); - params[ix + 1] = g_strdup_printf ("\"%s\"", val); - g_free (val); - } - ix = 2 * (YELP_SETTINGS_NUM_COLORS + YELP_SETTINGS_NUM_ICONS); - params[ix++] = g_strdup ("theme.icon.admon.size"); - params[ix++] = g_strdup_printf ("%i", yelp_settings_get_icon_size (settings)); - params[ix] = NULL; + params = yelp_settings_get_all_params (settings, 0, NULL); yelp_transform_start (page_data->transform, page_data->xmldoc, |