diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2004-10-20 17:23:02 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-10-20 17:23:02 +0000 |
| commit | 73fd5538d239a22745a89ec7b34ce931b526b502 (patch) | |
| tree | fbe536e485f1bc61ef42f4163e06c44e492388db | |
| parent | b8e4b7386db4e1e8a49a580e9af1c8d0e63aff27 (diff) | |
| download | gtk+-73fd5538d239a22745a89ec7b34ce931b526b502.tar.gz | |
Small fixes.
2004-10-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c: Small fixes.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 2 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 2 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 2 | ||||
| -rw-r--r-- | gtk/gtkicontheme.c | 14 |
5 files changed, 14 insertions, 8 deletions
@@ -1,5 +1,7 @@ 2004-10-20 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkicontheme.c: Small fixes. + * gtk/gtkrc.c: Include gtkmodules.h. (#155885, Kazuki IWAMOTO) * gtk/gtktoolbar.h: Add _gtk_toolbar_rebuild_menu(). (#155885) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c256ed6903..2b1b4712db 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,7 @@ 2004-10-20 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkicontheme.c: Small fixes. + * gtk/gtkrc.c: Include gtkmodules.h. (#155885, Kazuki IWAMOTO) * gtk/gtktoolbar.h: Add _gtk_toolbar_rebuild_menu(). (#155885) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c256ed6903..2b1b4712db 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,7 @@ 2004-10-20 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkicontheme.c: Small fixes. + * gtk/gtkrc.c: Include gtkmodules.h. (#155885, Kazuki IWAMOTO) * gtk/gtktoolbar.h: Add _gtk_toolbar_rebuild_menu(). (#155885) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c256ed6903..2b1b4712db 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,7 @@ 2004-10-20 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkicontheme.c: Small fixes. + * gtk/gtkrc.c: Include gtkmodules.h. (#155885, Kazuki IWAMOTO) * gtk/gtktoolbar.h: Add _gtk_toolbar_rebuild_menu(). (#155885) diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index b2053d620c..7b428bcf9f 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -1116,7 +1116,7 @@ ensure_valid_themes (GtkIconTheme *icon_theme) if (priv->themes_valid) { - g_get_current_time(&tv); + g_get_current_time (&tv); if (ABS (tv.tv_sec - priv->last_stat_time) > 5) gtk_icon_theme_rescan_if_needed (icon_theme); @@ -1163,7 +1163,7 @@ gtk_icon_theme_lookup_icon (GtkIconTheme *icon_theme, g_return_val_if_fail (icon_name != NULL, NULL); g_return_val_if_fail ((flags & GTK_ICON_LOOKUP_NO_SVG) == 0 || (flags & GTK_ICON_LOOKUP_FORCE_SVG) == 0, NULL); - + priv = icon_theme->priv; if (flags & GTK_ICON_LOOKUP_NO_SVG) @@ -1181,12 +1181,12 @@ gtk_icon_theme_lookup_icon (GtkIconTheme *icon_theme, l = priv->themes; while (l != NULL) { - IconTheme *icon_theme = l->data; + IconTheme *theme = l->data; - if (strcmp (icon_theme->name, DEFAULT_THEME_NAME) == 0) + if (strcmp (theme->name, DEFAULT_THEME_NAME) == 0) found_default = TRUE; - icon_info = theme_lookup_icon (icon_theme, icon_name, size, allow_svg, use_builtin); + icon_info = theme_lookup_icon (theme, icon_name, size, allow_svg, use_builtin); if (icon_info) goto out; @@ -1789,9 +1789,7 @@ theme_lookup_icon (IconTheme *theme, dir = l->data; suffix = theme_dir_get_icon_suffix (dir, icon_name, NULL); - - if (suffix != ICON_SUFFIX_NONE && - (allow_svg || suffix != ICON_SUFFIX_SVG)) + if (best_suffix (suffix, allow_svg) != ICON_SUFFIX_NONE) { difference = theme_dir_size_difference (dir, size, &smaller); |