AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Small cleanups

Browse Source 
svn path=/trunk/; revision=18488
This commit is contained in:
Matthias Clasen 2007-07-18 07:30:34 +00:00
parent 70557e930b
commit e0e3b2136f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2007-07-18 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c: Small cleanups
2007-07-17 Kristian Rietveld <kris@imendio.com>
* gtk/gtktooltip.c (find_widget_under_pointer): only do the

8
gtk/gtkicontheme.c
View File

@ -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,
@ -2901,8 +2901,6 @@ GdkPixbuf *
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);
@ -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);