callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small fixes.

Browse Source 
2004-10-20  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkicontheme.c: Small fixes.
This commit is contained in:
Matthias Clasen 2004-10-20 17:23:02 +00:00 committed by Matthias Clasen
parent b8e4b7386d
commit 73fd5538d2
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2004-10-20 Matthias Clasen <mclasen@redhat.com> 2004-10-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c: Small fixes.
* gtk/gtkrc.c: Include gtkmodules.h. (#155885, Kazuki IWAMOTO) * gtk/gtkrc.c: Include gtkmodules.h. (#155885, Kazuki IWAMOTO)
* gtk/gtktoolbar.h: Add _gtk_toolbar_rebuild_menu(). (#155885) * gtk/gtktoolbar.h: Add _gtk_toolbar_rebuild_menu(). (#155885)

2
ChangeLog.pre-2-10
View File

@ -1,5 +1,7 @@
2004-10-20 Matthias Clasen <mclasen@redhat.com> 2004-10-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c: Small fixes.
* gtk/gtkrc.c: Include gtkmodules.h. (#155885, Kazuki IWAMOTO) * gtk/gtkrc.c: Include gtkmodules.h. (#155885, Kazuki IWAMOTO)
* gtk/gtktoolbar.h: Add _gtk_toolbar_rebuild_menu(). (#155885) * gtk/gtktoolbar.h: Add _gtk_toolbar_rebuild_menu(). (#155885)

2
ChangeLog.pre-2-6
View File

@ -1,5 +1,7 @@
2004-10-20 Matthias Clasen <mclasen@redhat.com> 2004-10-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c: Small fixes.
* gtk/gtkrc.c: Include gtkmodules.h. (#155885, Kazuki IWAMOTO) * gtk/gtkrc.c: Include gtkmodules.h. (#155885, Kazuki IWAMOTO)
* gtk/gtktoolbar.h: Add _gtk_toolbar_rebuild_menu(). (#155885) * gtk/gtktoolbar.h: Add _gtk_toolbar_rebuild_menu(). (#155885)

2
ChangeLog.pre-2-8
View File

@ -1,5 +1,7 @@
2004-10-20 Matthias Clasen <mclasen@redhat.com> 2004-10-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c: Small fixes.
* gtk/gtkrc.c: Include gtkmodules.h. (#155885, Kazuki IWAMOTO) * gtk/gtkrc.c: Include gtkmodules.h. (#155885, Kazuki IWAMOTO)
* gtk/gtktoolbar.h: Add _gtk_toolbar_rebuild_menu(). (#155885) * gtk/gtktoolbar.h: Add _gtk_toolbar_rebuild_menu(). (#155885)

12
gtk/gtkicontheme.c
View File

@ -1116,7 +1116,7 @@ ensure_valid_themes (GtkIconTheme *icon_theme)
if (priv->themes_valid) if (priv->themes_valid)
{ {
g_get_current_time(&tv); g_get_current_time (&tv);
if (ABS (tv.tv_sec - priv->last_stat_time) > 5) if (ABS (tv.tv_sec - priv->last_stat_time) > 5)
gtk_icon_theme_rescan_if_needed (icon_theme); gtk_icon_theme_rescan_if_needed (icon_theme);
@ -1181,12 +1181,12 @@ gtk_icon_theme_lookup_icon (GtkIconTheme *icon_theme,
l = priv->themes; l = priv->themes;
while (l != NULL) 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; 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) if (icon_info)
goto out; goto out;
@ -1789,9 +1789,7 @@ theme_lookup_icon (IconTheme *theme,
dir = l->data; dir = l->data;
suffix = theme_dir_get_icon_suffix (dir, icon_name, NULL); suffix = theme_dir_get_icon_suffix (dir, icon_name, NULL);
if (best_suffix (suffix, allow_svg) != ICON_SUFFIX_NONE)
if (suffix != ICON_SUFFIX_NONE &&
(allow_svg || suffix != ICON_SUFFIX_SVG))
{ {
difference = theme_dir_size_difference (dir, size, &smaller); difference = theme_dir_size_difference (dir, size, &smaller);