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

entry: simplify code

Browse Source 
We can unconditionally call into the icon helper methods now that we
removed the g_return_val_if_fail() checks.
This commit is contained in:
Cosimo Cecchi 2011-11-30 19:05:34 -05:00
parent 864c5610f8
commit d47e82ffdd
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkentry.c
View File

@ -8019,8 +8019,7 @@ gtk_entry_get_icon_gicon (GtkEntry *entry,
if (!icon_info)
return NULL;
return _gtk_icon_helper_get_storage_type (icon_info->icon_helper) == GTK_IMAGE_GICON ?
_gtk_icon_helper_peek_gicon (icon_info->icon_helper) : NULL;
return _gtk_icon_helper_peek_gicon (icon_info->icon_helper);
}
/**
@ -8053,9 +8052,7 @@ gtk_entry_get_icon_stock (GtkEntry *entry,
if (!icon_info)
return NULL;
return _gtk_icon_helper_get_storage_type (icon_info->icon_helper) == GTK_IMAGE_STOCK ?
_gtk_icon_helper_get_stock_id (icon_info->icon_helper) : NULL;
return _gtk_icon_helper_get_stock_id (icon_info->icon_helper);
}
/**
@ -8088,9 +8085,7 @@ gtk_entry_get_icon_name (GtkEntry *entry,
if (!icon_info)
return NULL;
return _gtk_icon_helper_get_storage_type (icon_info->icon_helper) == GTK_IMAGE_ICON_NAME ?
_gtk_icon_helper_get_icon_name (icon_info->icon_helper) : NULL;
return _gtk_icon_helper_get_icon_name (icon_info->icon_helper);
}
/**