aboutsummaryrefslogtreecommitdiff
path: root/libindicate/indicator.c
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-04-12 21:55:06 -0500
committerTed Gould <ted@canonical.com>2009-04-12 21:55:06 -0500
commita1207dc360feed65bee877daafb54c9fbd458a44 (patch)
tree2ca2e14da8987cfdd534e7e12d6715084455f02e /libindicate/indicator.c
parentce664599c72dcb80f9e0427a2a49fc3c26fb79c8 (diff)
parente9ef5ec77b72c9bf518e4cdda96e941421daa985 (diff)
downloadlibayatana-indicator-a1207dc360feed65bee877daafb54c9fbd458a44.tar.gz
libayatana-indicator-a1207dc360feed65bee877daafb54c9fbd458a44.tar.bz2
libayatana-indicator-a1207dc360feed65bee877daafb54c9fbd458a44.zip
Updating from trunk
Diffstat (limited to 'libindicate/indicator.c')
-rw-r--r--libindicate/indicator.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libindicate/indicator.c b/libindicate/indicator.c
index 9427d03..7e0c986 100644
--- a/libindicate/indicator.c
+++ b/libindicate/indicator.c
@@ -261,7 +261,7 @@ indicate_indicator_set_property_icon (IndicateIndicator * indicator, const gchar
return;
}
- gchar * prop_str = g_base64_encode(png_data, png_data_len);
+ gchar * prop_str = g_base64_encode((guchar *)png_data, png_data_len);
indicate_indicator_set_property(indicator, key, prop_str);
g_free(prop_str);
@@ -308,7 +308,7 @@ set_property (IndicateIndicator * indicator, const gchar * key, const gchar * da
{
g_return_if_fail(INDICATE_IS_INDICATOR(indicator));
- if (key != NULL && !strcmp(key, "type")) {
+ if (key != NULL && !g_strcmp0(key, "type")) {
g_warning("Trying to set the 'type' of an indicator which should be done through subclassing.");
return;
}
@@ -316,7 +316,7 @@ set_property (IndicateIndicator * indicator, const gchar * key, const gchar * da
IndicateIndicatorPrivate * priv = INDICATE_INDICATOR_GET_PRIVATE(indicator);
gchar * current = g_hash_table_lookup(priv->properties, key);
- if (current == NULL || strcmp(current, data)) {
+ if (current == NULL || g_strcmp0(current, data)) {
/* If the value has changed or there is no value */
gchar * newkey = g_strdup(key);
/* g_debug("What is newkey? %s", newkey); */
@@ -335,7 +335,7 @@ get_property (IndicateIndicator * indicator, const gchar * key)
{
g_return_val_if_fail(INDICATE_IS_INDICATOR(indicator), NULL);
- if (key != NULL && !strcmp(key, "type")) {
+ if (key != NULL && !g_strcmp0(key, "type")) {
return indicate_indicator_get_indicator_type(indicator);
}