diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2011-02-04 12:34:26 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2011-02-04 18:02:48 +0100 |
| commit | a90891e6e3d7c13946fc9aaae2a9dd4afdb082d7 (patch) | |
| tree | 4141f2165f525cde1d8515428ace99275375033a /src | |
| parent | 25d7f059e23b6030fb4b854213176840bd5c2ca1 (diff) | |
| download | strongswan-a90891e6e3d7c13946fc9aaae2a9dd4afdb082d7.tar.bz2 strongswan-a90891e6e3d7c13946fc9aaae2a9dd4afdb082d7.tar.xz | |
maemo: Reload icons on icon theme change.
This is also needed during the installation because the applet might be
loaded before the icons are installed (or the icon cache is refreshed).
Diffstat (limited to 'src')
| -rw-r--r-- | src/frontends/maemo/src/strongswan-status.c | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/src/frontends/maemo/src/strongswan-status.c b/src/frontends/maemo/src/strongswan-status.c index 8a26f2780..951ce50db 100644 --- a/src/frontends/maemo/src/strongswan-status.c +++ b/src/frontends/maemo/src/strongswan-status.c @@ -39,6 +39,10 @@ #define ICON_SIZE_STATUS 18 #define ICON_SIZE_BUTTON 48 +#define UNREF_IF(obj) do { \ + if (obj) { obj = (g_object_unref (obj), NULL); } \ +} while(0) + typedef enum { STATUS_DISCONNECTED, @@ -485,14 +489,8 @@ dbus_req_handler(const gchar *interface, const gchar *method, static GdkPixbuf* load_icon (GtkIconTheme *theme, const gchar *name, gint size) { - GdkPixbuf *icon = NULL; - GdkPixbuf *loaded = gtk_icon_theme_load_icon (theme, name, size, - GTK_ICON_LOOKUP_NO_SVG, NULL); - if (loaded) - { /* so we don't have to listen for theme changes, we copy the icon */ - icon = gdk_pixbuf_copy (loaded); - g_object_unref (loaded); - } + GdkPixbuf *icon = gtk_icon_theme_load_icon (theme, name, size, + GTK_ICON_LOOKUP_NO_SVG, NULL); return icon; } @@ -508,10 +506,18 @@ load_icons (StrongswanStatusPrivate *priv) ICON_SIZE_BUTTON); priv->icons.button_close = load_icon (theme, "strongswan_lock_close", ICON_SIZE_BUTTON); - if (!priv->icons.status_open || !priv->icons.button_open) - { - hildon_banner_show_information (NULL, NULL, "failed to load icons"); - } +} + +static void +icon_theme_changed (GtkIconTheme *theme, StrongswanStatus *plugin) +{ + StrongswanStatusPrivate *priv = plugin->priv; + UNREF_IF(priv->icons.status_open); + UNREF_IF(priv->icons.status_close); + UNREF_IF(priv->icons.button_open); + UNREF_IF(priv->icons.button_close); + load_icons (priv); + update_status_menu (plugin); } static void @@ -539,6 +545,9 @@ strongswan_status_init (StrongswanStatus *plugin) priv->conns = strongswan_connections_new (); + g_signal_connect_object (gtk_icon_theme_get_default (), "changed", + G_CALLBACK (icon_theme_changed), plugin, 0); + load_icons(priv); hd_status_plugin_item_set_status_area_icon (HD_STATUS_PLUGIN_ITEM (plugin), @@ -564,10 +573,6 @@ strongswan_status_init (StrongswanStatus *plugin) gtk_widget_show_all (GTK_WIDGET (plugin)); } -#define UNREF_IF(obj) do { \ - if (obj) { obj = (g_object_unref (obj), NULL); } \ -} while(0) - static void strongswan_status_dispose (GObject *object) { |