brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st-texture-cache: Remove unused St.IconType.APPLICATION/DOCUMENT

Browse Source 
No reason to have special handling for fallbacks that we can do (and do do)
in the JS.

https://bugzilla.gnome.org/show_bug.cgi?id=671656
This commit is contained in:
Jasper St. Pierre 2012-03-15 18:24:51 -04:00
parent 14d267c246
commit 21e8097b9c
3 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/st/st-icon.c
View File

@ -481,9 +481,7 @@ st_icon_update (StIcon *icon)
if (priv->gicon) if (priv->gicon)
{ {
priv->pending_texture = st_texture_cache_load_gicon (cache, priv->pending_texture = st_texture_cache_load_gicon (cache,
(priv->icon_type != ST_ICON_APPLICATION && theme_node,
priv->icon_type != ST_ICON_DOCUMENT) ?
theme_node : NULL,
priv->gicon, priv->gicon,
priv->icon_size); priv->icon_size);
} }

35
src/st/st-texture-cache.c
View File

@ -1149,22 +1149,12 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
* StIconType: * StIconType:
* @ST_ICON_SYMBOLIC: a symbolic (ie, mostly monochrome) icon * @ST_ICON_SYMBOLIC: a symbolic (ie, mostly monochrome) icon
* @ST_ICON_FULLCOLOR: a full-color icon * @ST_ICON_FULLCOLOR: a full-color icon
* @ST_ICON_APPLICATION: a full-color icon, which is expected
* to be an application icon
* @ST_ICON_DOCUMENT: a full-color icon, which is expected
* to be a document (MIME type) icon
* *
* Describes what style of icon is desired in a call to * Describes what style of icon is desired in a call to
* st_texture_cache_load_icon_name() or st_texture_cache_load_gicon(). * st_texture_cache_load_icon_name() or st_texture_cache_load_gicon().
* Use %ST_ICON_SYMBOLIC for symbolic icons (eg, for the panel and * Use %ST_ICON_SYMBOLIC for symbolic icons (eg, for the panel and
* much of the rest of the shell chrome) or %ST_ICON_FULLCOLOR for a * much of the rest of the shell chrome) or %ST_ICON_FULLCOLOR for a
* full-color icon. * full-color icon.
*
* If you know that the requested icon is either an application icon
* or a document type icon, you should use %ST_ICON_APPLICATION or
* %ST_ICON_DOCUMENT, which may do a better job of selecting the
* correct theme icon for those types. If you are unsure what kind of
* icon you are loading, use %ST_ICON_FULLCOLOR.
*/ */
/* generates names like g_themed_icon_new_with_default_fallbacks(), /* generates names like g_themed_icon_new_with_default_fallbacks(),
@ -1236,31 +1226,6 @@ st_texture_cache_load_icon_name (StTextureCache *cache,
switch (icon_type) switch (icon_type)
{ {
case ST_ICON_APPLICATION:
themed = g_themed_icon_new (name);
texture = load_gicon_with_colors (cache, themed, size, NULL);
g_object_unref (themed);
if (texture == NULL)
{
themed = g_themed_icon_new ("application-x-executable");
texture = load_gicon_with_colors (cache, themed, size, NULL);
g_object_unref (themed);
}
return CLUTTER_ACTOR (texture);
break;
case ST_ICON_DOCUMENT:
themed = g_themed_icon_new (name);
texture = load_gicon_with_colors (cache, themed, size, NULL);
g_object_unref (themed);
if (texture == NULL)
{
themed = g_themed_icon_new ("x-office-document");
texture = load_gicon_with_colors (cache, themed, size, NULL);
g_object_unref (themed);
}
return CLUTTER_ACTOR (texture);
break;
case ST_ICON_SYMBOLIC: case ST_ICON_SYMBOLIC:
names = symbolic_names_for_icon (name); names = symbolic_names_for_icon (name);
themed = g_themed_icon_new_from_names (names, -1); themed = g_themed_icon_new_from_names (names, -1);

4
src/st/st-types.h
View File

@ -44,9 +44,7 @@ typedef enum {
typedef enum { typedef enum {
ST_ICON_SYMBOLIC, ST_ICON_SYMBOLIC,
ST_ICON_FULLCOLOR, ST_ICON_FULLCOLOR
ST_ICON_APPLICATION,
ST_ICON_DOCUMENT
} StIconType; } StIconType;
typedef enum { typedef enum {