aboutsummaryrefslogtreecommitdiff
path: root/libindicator/indicator-image-helper.c
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-07-08 09:21:21 -0500
committerTed Gould <ted@gould.cx>2010-07-08 09:21:21 -0500
commit70f8170299f4294c33867e54b0b63295a7b08271 (patch)
tree6b23e42234040669a4accd5b5059db89bb4bb068 /libindicator/indicator-image-helper.c
parent589e659020e5653c8a2f4e83b9fdc440d43272a3 (diff)
parent96faa1e9fa3aca90a66617be39a4a526ccac8e83 (diff)
downloadlibayatana-indicator-70f8170299f4294c33867e54b0b63295a7b08271.tar.gz
libayatana-indicator-70f8170299f4294c33867e54b0b63295a7b08271.tar.bz2
libayatana-indicator-70f8170299f4294c33867e54b0b63295a7b08271.zip
* Merge Upstream
* Removing checking for style properties that aren't used.
Diffstat (limited to 'libindicator/indicator-image-helper.c')
-rw-r--r--libindicator/indicator-image-helper.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c
index 86d6c25..2492227 100644
--- a/libindicator/indicator-image-helper.c
+++ b/libindicator/indicator-image-helper.c
@@ -40,18 +40,6 @@ refresh_image (GtkImage * image)
gint icon_size = 22;
- GtkStyle * style = gtk_widget_get_style(GTK_WIDGET(image));
- GValue styleprop = {0};
- gtk_style_get_style_property(style, GTK_TYPE_IMAGE, "x-ayatana-indicator-dynamic", &styleprop);
-
- if (G_VALUE_HOLDS_BOOLEAN(&styleprop) && g_value_get_boolean(&styleprop)) {
- PangoContext * context = gtk_widget_get_pango_context(GTK_WIDGET(image));
- PangoFontMetrics * metrics = pango_context_get_metrics(context, style->font_desc, pango_context_get_language(context));
- icon_size = PANGO_PIXELS(pango_font_metrics_get_ascent(metrics)) + PANGO_PIXELS(pango_font_metrics_get_descent(metrics));
- g_debug("Looking for icon size %d", icon_size);
- pango_font_metrics_unref(metrics);
- }
-
/* Look through the themes for that icon */
GtkIconInfo * icon_info = gtk_icon_theme_lookup_by_gicon(default_theme, icon_names, icon_size, 0);
if (icon_info == NULL) {