diff options
| author | Martin Pitt <martin.pitt@canonical.com> | 2009-04-14 11:36:10 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@canonical.com> | 2009-04-14 11:36:10 +0200 |
| commit | 4959fae25c9f5f416ab95be98cec1c900eccaae1 (patch) | |
| tree | 387e69034a54444bff2ab71a2b3314db579c9460 /libindicate/server.c | |
| parent | df604ba78746b932c269d6c5b1b455ef28e2a319 (diff) | |
| parent | cb60d3fd9dc8a771259fcfedaa9c5eae16c6fb0f (diff) | |
| download | libayatana-indicator-4959fae25c9f5f416ab95be98cec1c900eccaae1.tar.gz libayatana-indicator-4959fae25c9f5f416ab95be98cec1c900eccaae1.tar.bz2 libayatana-indicator-4959fae25c9f5f416ab95be98cec1c900eccaae1.zip | |
* New upstream version
* Applied the same fixes as Cody Russell's patch to indicator-messages
to the finalize functions here. Should fix LP: #359018 completely.
* Minor warnings fixes in search of solution to above.
Diffstat (limited to 'libindicate/server.c')
| -rw-r--r-- | libindicate/server.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libindicate/server.c b/libindicate/server.c index 9e33516..e3d071c 100644 --- a/libindicate/server.c +++ b/libindicate/server.c @@ -297,6 +297,8 @@ indicate_server_finalize (GObject * obj) g_free(priv->type); } + G_OBJECT_CLASS (indicate_server_parent_class)->finalize (obj); + return; } @@ -307,6 +309,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 +336,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 +748,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 +831,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); } } |