Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Oblomov
gtk
Commits
73fd5538
Commit
73fd5538
authored
Oct 20, 2004
by
Matthias Clasen
Committed by
Matthias Clasen
Oct 20, 2004
Browse files
Small fixes.
2004-10-20 Matthias Clasen <mclasen@redhat.com> * gtk/gtkicontheme.c: Small fixes.
parent
b8e4b738
Changes
5
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
73fd5538
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
)
...
...
ChangeLog.pre-2-10
View file @
73fd5538
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
)
...
...
ChangeLog.pre-2-6
View file @
73fd5538
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
)
...
...
ChangeLog.pre-2-8
View file @
73fd5538
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
)
...
...
gtk/gtkicontheme.c
View file @
73fd5538
...
...
@@ -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
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment