[Xfce4-commits] <xfce4-weather-plugin:master> Cache the tooltip icon.

[Harald Judt]

Updating branch refs/heads/master
         to e918a3b9e474b6fd9b92225eb69038b676c56784 (commit)
       from 9a632ce7b1901e873f0836dcdb68305865da91c7 (commit)

commit e918a3b9e474b6fd9b92225eb69038b676c56784
Author: Harald Judt <h.judt at gmx.at>
Date:   Mon Jan 14 02:48:14 2013 +0100

    Cache the tooltip icon.
    
    Load the tooltip icon into memory and update it whenever the panel icon
    is updated. This way, both icons will always look the same and disk
    access will be minimized, though usually this is not a problem because
    disk cache will come into play.

 panel-plugin/weather.c |   48 ++++++++++++++++++++++++------------------------
 panel-plugin/weather.h |    1 +
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index 23fa4af..084e0b3 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -247,6 +247,19 @@ get_cache_directory(void)
 }
 
 
+static gint
+get_tooltip_icon_size(plugin_data *data)
+{
+    switch (data->tooltip_style) {
+    case TOOLTIP_SIMPLE:
+        return 96;
+    case TOOLTIP_VERBOSE:
+    default:
+        return 128;
+    }
+}
+
+
 void
 update_icon(plugin_data *data)
 {
@@ -263,16 +276,22 @@ update_icon(plugin_data *data)
         size *= 2;
 #endif
 
-    /* set icon according to current weather conditions */
+    /* set panel icon according to current weather conditions */
     conditions = get_current_conditions(data->weatherdata);
     str = get_data(conditions, data->units, SYMBOL,
                    data->round, data->night_time);
     icon = get_icon(data->icon_theme, str, size, data->night_time);
-    g_free(str);
     gtk_image_set_from_pixbuf(GTK_IMAGE(data->iconimage), icon);
     if (G_LIKELY(icon))
         g_object_unref(G_OBJECT(icon));
-    weather_debug("Updated panel icon.");
+
+    /* set tooltip icon too */
+    size = get_tooltip_icon_size(data);
+    if (G_LIKELY(data->tooltip_icon))
+        g_object_unref(G_OBJECT(data->tooltip_icon));
+    data->tooltip_icon = get_icon(data->icon_theme, str, size, data->night_time);
+    g_free(str);
+    weather_debug("Updated panel and tooltip icons.");
 }
 
 
@@ -1549,10 +1568,7 @@ weather_get_tooltip_cb(GtkWidget *widget,
                        GtkTooltip *tooltip,
                        plugin_data *data)
 {
-    GdkPixbuf *icon;
-    xml_time *conditions;
-    gchar *markup_text, *rawvalue;
-    gint icon_size;
+    gchar *markup_text;
 
     if (data->weatherdata == NULL)
         gtk_tooltip_set_text(tooltip, _("Cannot update weather data"));
@@ -1562,23 +1578,7 @@ weather_get_tooltip_cb(GtkWidget *widget,
         g_free(markup_text);
     }
 
-    conditions = get_current_conditions(data->weatherdata);
-    rawvalue = get_data(conditions, data->units, SYMBOL,
-                        data->round, data->night_time);
-    switch (data->tooltip_style) {
-    case TOOLTIP_SIMPLE:
-        icon_size = 96;
-        break;
-    case TOOLTIP_VERBOSE:
-    default:
-        icon_size = 128;
-        break;
-    }
-    icon = get_icon(data->icon_theme, rawvalue, icon_size, data->night_time);
-    g_free(rawvalue);
-    gtk_tooltip_set_icon(tooltip, icon);
-    g_object_unref(G_OBJECT(icon));
-
+    gtk_tooltip_set_icon(tooltip, data->tooltip_icon);
     return TRUE;
 }
 
diff --git a/panel-plugin/weather.h b/panel-plugin/weather.h
index a802e58..d4469a2 100644
--- a/panel-plugin/weather.h
+++ b/panel-plugin/weather.h
@@ -66,6 +66,7 @@ typedef struct {
     GtkWidget *vbox_center_scrollbox;
     GtkWidget *iconimage;
     GtkWidget *tooltipbox;
+    GdkPixbuf *tooltip_icon;
     GtkWidget *summary_window;
     summary_details *summary_details;
     guint config_remember_tab;