[gtk+] Move some comments around
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Move some comments around
- Date: Mon, 23 Jun 2014 12:19:47 +0000 (UTC)
commit fe92c4478e8d62b623690a07a4328b43edb1d62b
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Jun 22 22:04:00 2014 -0400
Move some comments around
gtk/gtkicontheme.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 3c427d6..86b4e15 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -1710,9 +1710,7 @@ real_choose_icon (GtkIconTheme *icon_theme,
{
icon_info = icon_info_new (ICON_THEME_DIR_UNTHEMED, size, 1);
- /* A SVG icon, when allowed, beats out a XPM icon, but not
- * a PNG icon
- */
+ /* A SVG icon, when allowed, beats out a XPM icon, but not a PNG icon */
if (allow_svg &&
unthemed_icon->svg_filename &&
(!unthemed_icon->no_svg_filename ||
@@ -1912,7 +1910,6 @@ choose_icon (GtkIconTheme *icon_theme,
return icon_info;
}
-
/**
* gtk_icon_theme_lookup_icon:
* @icon_theme: a #GtkIconTheme
@@ -3704,9 +3701,6 @@ icon_info_ensure_scale_and_pixbuf (GtkIconInfo *icon_info,
if (icon_info->load_error)
return FALSE;
- /* SVG icons are a special case - we just immediately scale them
- * to the desired size
- */
if (icon_info->icon_file && !icon_info->loadable)
icon_info->loadable = G_LOADABLE_ICON (g_file_icon_new (icon_info->icon_file));
@@ -3770,6 +3764,9 @@ icon_info_ensure_scale_and_pixbuf (GtkIconInfo *icon_info,
&icon_info->load_error);
if (stream)
{
+ /* SVG icons are a special case - we just immediately scale them
+ * to the desired size
+ */
if (icon_info->is_svg)
{
gint size;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]