aboutsummaryrefslogtreecommitdiff
path: root/libindicator
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-03-11 10:22:17 -0600
committerTed Gould <ted@gould.cx>2010-03-11 10:22:17 -0600
commitb4ca4f6ff3d2176b42cad8ec5e5970452d83edb9 (patch)
treef8d4306e87a72a5051f54f5f1c006a292f222b5a /libindicator
parentfc87fda00e8e42d5a212a199a6f9e8d350388905 (diff)
downloadlibayatana-indicator-b4ca4f6ff3d2176b42cad8ec5e5970452d83edb9.tar.gz
libayatana-indicator-b4ca4f6ff3d2176b42cad8ec5e5970452d83edb9.tar.bz2
libayatana-indicator-b4ca4f6ff3d2176b42cad8ec5e5970452d83edb9.zip
Splitting things out into an update function and a buid function.
Diffstat (limited to 'libindicator')
-rw-r--r--libindicator/indicator-image-helper.c30
-rw-r--r--libindicator/indicator-image-helper.h4
2 files changed, 19 insertions, 15 deletions
diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c
index cbbad3d..2703208 100644
--- a/libindicator/indicator-image-helper.c
+++ b/libindicator/indicator-image-helper.c
@@ -112,21 +112,24 @@ image_destroyed_cb (GtkImage * image, gpointer user_data)
GtkImage *
indicator_image_helper (const gchar * name)
{
- g_return_val_if_fail(name != NULL, NULL);
- g_return_val_if_fail(name[0] != '\0', NULL);
-
- /* Build us a GIcon */
- GIcon * icon_names = g_themed_icon_new_with_default_fallbacks(name);
- g_return_val_if_fail(icon_names != NULL, NULL);
-
/* Build us an image */
GtkImage * image = GTK_IMAGE(gtk_image_new());
- if (image == NULL) {
- g_error("Unable to create image from pixbuf on icon name '%s'", name);
- g_object_unref(icon_names);
- return NULL;
- }
+ indicator_image_helper_update(image, name);
+
+ return image;
+}
+
+void
+indicator_image_helper_update (GtkImage * image, const gchar * name)
+{
+ g_return_if_fail(name != NULL);
+ g_return_if_fail(name[0] != '\0');
+ g_return_if_fail(image != NULL);
+
+ /* Build us a GIcon */
+ GIcon * icon_names = g_themed_icon_new_with_default_fallbacks(name);
+ g_return_if_fail(icon_names != NULL);
/* Attach our names to the image */
g_object_set_data_full(G_OBJECT(image), INDICATOR_NAMES_DATA, icon_names, g_object_unref);
@@ -138,6 +141,5 @@ indicator_image_helper (const gchar * name)
g_signal_connect(G_OBJECT(gtk_icon_theme_get_default()), "changed", G_CALLBACK(theme_changed_cb), image);
g_signal_connect(G_OBJECT(image), "destroy", G_CALLBACK(image_destroyed_cb), NULL);
- /* Return our built image */
- return image;
+ return;
}
diff --git a/libindicator/indicator-image-helper.h b/libindicator/indicator-image-helper.h
index fed02dc..77e2f0a 100644
--- a/libindicator/indicator-image-helper.h
+++ b/libindicator/indicator-image-helper.h
@@ -26,6 +26,8 @@ License along with this library. If not, see
#include <gtk/gtk.h>
-GtkImage * indicator_image_helper (const gchar * name);
+GtkImage * indicator_image_helper (const gchar * name);
+void indicator_image_helper_update (GtkImage * image,
+ const gchar * name);
#endif /* __INDICATOR_IMAGE_HELPER_H__ */