diff options
| author | Evgeni Golov <evgeni@debian.org> | 2010-07-14 10:03:46 +0200 |
|---|---|---|
| committer | Evgeni Golov <evgeni@debian.org> | 2010-07-14 10:03:46 +0200 |
| commit | b4d146190da79eaf88b63d38e7d0d40856b5262f (patch) | |
| tree | cd3b5e99ccb2ba8a7fd32fe20d78b9c6563ef82f /libindicator/indicator-image-helper.c | |
| parent | 34b4a4d73f886573fc992d0618f44817ec12c3a5 (diff) | |
| parent | d14f25ad6ec36e956cd2d2c031147b8cb2fddec3 (diff) | |
| download | libayatana-indicator-b4d146190da79eaf88b63d38e7d0d40856b5262f.tar.gz libayatana-indicator-b4d146190da79eaf88b63d38e7d0d40856b5262f.tar.bz2 libayatana-indicator-b4d146190da79eaf88b63d38e7d0d40856b5262f.zip | |
Merging new upstream release and some changes from Ubuntu.
Don't drop debian/source
* Merged in fix for (LP: #603489)
* New upstream release.
* Removing checking for style properties that aren't used.
* Make it so that a watcher dying is the same as unregistering.
* Merge debian changes
* Drop debian/source/*
* debian/control: Switch VCS for this branch to be the indicator
applet developers branch.
Diffstat (limited to 'libindicator/indicator-image-helper.c')
| -rw-r--r-- | libindicator/indicator-image-helper.c | 12 |
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) { |