summaryrefslogtreecommitdiff
path: root/gtk/gtkicontheme.c
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2007-07-18 07:30:34 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2007-07-18 07:30:34 +0000
commite0e3b2136f7de767bfb2248acf9b3f103c798377 (patch)
treeb30b75b8fb0ce693a7aa7cf9af0dc48124f6db60 /gtk/gtkicontheme.c
parent70557e930b6c58802c5bc20de91008a1026ba2b8 (diff)
downloadgtk+-e0e3b2136f7de767bfb2248acf9b3f103c798377.tar.gz
Small cleanups
svn path=/trunk/; revision=18488
Diffstat (limited to 'gtk/gtkicontheme.c')
-rw-r--r--gtk/gtkicontheme.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 89c793042a..3121d86c9c 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -1493,8 +1493,8 @@ gtk_icon_theme_load_icon (GtkIconTheme *icon_theme,
(flags & GTK_ICON_LOOKUP_FORCE_SVG) == 0, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, size,
- flags | GTK_ICON_LOOKUP_USE_BUILTIN);
+ icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, size,
+ flags | GTK_ICON_LOOKUP_USE_BUILTIN);
if (!icon_info)
{
g_set_error (error, GTK_ICON_THEME_ERROR, GTK_ICON_THEME_NOT_FOUND,
@@ -2902,8 +2902,6 @@ gtk_icon_info_load_icon (GtkIconInfo *icon_info,
GError **error)
{
g_return_val_if_fail (icon_info != NULL, NULL);
-
- g_return_val_if_fail (icon_info != NULL, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
if (!icon_info_ensure_scale_and_pixbuf (icon_info, FALSE))
@@ -2916,7 +2914,7 @@ gtk_icon_info_load_icon (GtkIconInfo *icon_info,
GTK_ICON_THEME_NOT_FOUND,
_("Failed to load icon"));
- return NULL;
+ return NULL;
}
return g_object_ref (icon_info->pixbuf);