diff options
author | Shaun McCance <shaunm@gnome.org> | 2010-03-15 18:59:29 -0500 |
---|---|---|
committer | Shaun McCance <shaunm@gnome.org> | 2010-03-15 18:59:29 -0500 |
commit | a9c338284c9b61c03261a021b176c4cbc864a79a (patch) | |
tree | 46dae811cd6d66a16db912beca339e609ea637c5 | |
parent | fed4890a2bda568ceed204fe1fe2cde196e91e21 (diff) | |
download | yelp-a9c338284c9b61c03261a021b176c4cbc864a79a.tar.gz |
[libyelp/yelp-settings] Use new yelp-xsl icon parameters
-rw-r--r-- | libyelp/yelp-settings.c | 26 | ||||
-rw-r--r-- | libyelp/yelp-settings.h | 1 |
2 files changed, 11 insertions, 16 deletions
diff --git a/libyelp/yelp-settings.c b/libyelp/yelp-settings.c index 1f0dc1dd..69f10895 100644 --- a/libyelp/yelp-settings.c +++ b/libyelp/yelp-settings.c @@ -112,22 +112,19 @@ yelp_settings_class_init (YelpSettingsClass *klass) for (i = 0; i < YELP_SETTINGS_NUM_ICONS; i++) { switch (i) { case YELP_SETTINGS_ICON_BUG: - icon_names[i] = "admon-bug"; - break; - case YELP_SETTINGS_ICON_CAUTION: - icon_names[i] = "admon-caution"; + icon_names[i] = "yelp-note-bug"; break; case YELP_SETTINGS_ICON_IMPORTANT: - icon_names[i] = "admon-important"; + icon_names[i] = "yelp-note-important"; break; case YELP_SETTINGS_ICON_NOTE: - icon_names[i] = "admon-note"; + icon_names[i] = "yelp-note"; break; case YELP_SETTINGS_ICON_TIP: - icon_names[i] = "admon-tip"; + icon_names[i] = "yelp-note-tip"; break; case YELP_SETTINGS_ICON_WARNING: - icon_names[i] = "admon-warning"; + icon_names[i] = "yelp-note-warning"; break; default: g_assert_not_reached (); @@ -186,7 +183,7 @@ yelp_settings_init (YelpSettings *settings) settings->priv = GET_PRIV (settings); settings->priv->mutex = g_mutex_new (); - settings->priv->icon_size = 48; + settings->priv->icon_size = 24; for (i = 0; i < YELP_SETTINGS_NUM_ICONS; i++) settings->priv->icons[i] = NULL; @@ -579,12 +576,11 @@ const gchar * yelp_settings_get_icon_param (YelpSettingsIcon icon) { static const gchar *params[YELP_SETTINGS_NUM_ICONS] = { - "theme.icon.admon.bug", - "theme.icon.admon.caution", - "theme.icon.admon.important", - "theme.icon.admon.note", - "theme.icon.admon.tip", - "theme.icon.admon.warning" + "theme.icons.note.bug", + "theme.icons.note.important", + "theme.icons.note", + "theme.icons.note.tip", + "theme.icons.note.warning" }; g_return_val_if_fail (icon < YELP_SETTINGS_NUM_ICONS, NULL); return params[icon]; diff --git a/libyelp/yelp-settings.h b/libyelp/yelp-settings.h index 93143c6b..e894ab51 100644 --- a/libyelp/yelp-settings.h +++ b/libyelp/yelp-settings.h @@ -73,7 +73,6 @@ typedef enum { typedef enum { YELP_SETTINGS_ICON_BUG, - YELP_SETTINGS_ICON_CAUTION, YELP_SETTINGS_ICON_IMPORTANT, YELP_SETTINGS_ICON_NOTE, YELP_SETTINGS_ICON_TIP, |