diff options
| author | Ted Gould <ted@canonical.com> | 2009-04-12 21:55:06 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-04-12 21:55:06 -0500 |
| commit | a1207dc360feed65bee877daafb54c9fbd458a44 (patch) | |
| tree | 2ca2e14da8987cfdd534e7e12d6715084455f02e /libindicate/server.c | |
| parent | ce664599c72dcb80f9e0427a2a49fc3c26fb79c8 (diff) | |
| parent | e9ef5ec77b72c9bf518e4cdda96e941421daa985 (diff) | |
| download | libayatana-indicator-a1207dc360feed65bee877daafb54c9fbd458a44.tar.gz libayatana-indicator-a1207dc360feed65bee877daafb54c9fbd458a44.tar.bz2 libayatana-indicator-a1207dc360feed65bee877daafb54c9fbd458a44.zip | |
Updating from trunk
Diffstat (limited to 'libindicate/server.c')
| -rw-r--r-- | libindicate/server.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libindicate/server.c b/libindicate/server.c index 1378a0d..1f574c1 100644 --- a/libindicate/server.c +++ b/libindicate/server.c @@ -307,6 +307,9 @@ set_property (GObject * obj, guint id, const GValue * value, GParamSpec * pspec) g_return_if_fail(id == PROP_DESKTOP || id == PROP_TYPE); gchar ** outstr; + gchar * tempstr = NULL; + outstr = &tempstr; + IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(obj); switch (id) { case PROP_DESKTOP: @@ -331,7 +334,7 @@ get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec) { g_return_if_fail(id == PROP_DESKTOP || id == PROP_TYPE); - gchar * outstr; + gchar * outstr = NULL; IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(obj); switch (id) { case PROP_DESKTOP: @@ -743,7 +746,7 @@ count_by_type (IndicateIndicator * indicator, count_by_t * cbt) if (type == NULL && cbt->type == NULL) { cbt->count++; } else if (type == NULL || cbt->type == NULL) { - } else if (!strcmp(type, cbt->type)) { + } else if (!g_strcmp0(type, cbt->type)) { cbt->count++; } @@ -826,7 +829,7 @@ get_indicator_list_by_type (IndicateServer * server, gchar * type, GArray ** ind if (type == NULL && itype == NULL) { g_array_insert_val(*indicators, i++, id); } else if (type == NULL || itype == NULL) { - } else if (!strcmp(type, itype)) { + } else if (!g_strcmp0(type, itype)) { g_array_insert_val(*indicators, i++, id); } } |