diff options
| author | Evgeni Golov <evgeni@debian.org> | 2010-07-14 10:00:17 +0200 |
|---|---|---|
| committer | Evgeni Golov <evgeni@debian.org> | 2010-07-14 10:00:17 +0200 |
| commit | d14f25ad6ec36e956cd2d2c031147b8cb2fddec3 (patch) | |
| tree | 0314066c4f5b3177ba896b005bbb1062cbd5c052 /libindicator/indicator-image-helper.c | |
| parent | ec36577978bd7e31c0f52083d5d9d05976edc2db (diff) | |
| parent | b52f07039fdf21d25fb1724c47a34a66c4981798 (diff) | |
| download | libayatana-indicator-d14f25ad6ec36e956cd2d2c031147b8cb2fddec3.tar.gz libayatana-indicator-d14f25ad6ec36e956cd2d2c031147b8cb2fddec3.tar.bz2 libayatana-indicator-d14f25ad6ec36e956cd2d2c031147b8cb2fddec3.zip | |
Merging lp:~ubuntu-desktop/libindicator/ubuntu
* 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.
* Revert cdbs drop, as requested by the Ubuntu maintainers.
* Update Maintainer and Vcs-* fields for pkg-ayatana.
* Merge Ubuntu package into Debian.
Closes: #549999
* debian/copyright:
+ Update to machine readable format.
* debian/control:
+ Drop cdbs Build-Dep, bump debhelper to >=7.
+ Standards-Version 3.8.4.
+ Update Vcs-* fields.
+ Drop GNOME from Description, the package is not GNOME specific.
+ Slightly update Description, thanks lintian.
* debian/rules:
+ Use minimal debhelper 7 rules without cdbs.
+ Disable tests for now, they fail (launchpad 587811)
* debian/source/format:
+ Add file, make package 3.0 (quilt).
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) { |