From a09510f6cb416fed7e98ce7df61d74f56d7a1bff Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 11 Apr 2009 23:07:38 -0500 Subject: Fixing some pedantic little bugs to try and figure out what's causing 359018 --- libindicate/server.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'libindicate/server.c') diff --git a/libindicate/server.c b/libindicate/server.c index 9e33516..f2ebdd2 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); } } -- cgit v1.2.3 From f0fa474c673c0af91bc3d08f881ab9040ff72d45 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 13 Apr 2009 10:09:20 -0500 Subject: Adding in call to the parent class' finalize function as well, this should free all the way up to the top. --- libindicate/indicator.c | 1 + libindicate/listener.c | 1 + libindicate/server.c | 2 ++ 3 files changed, 4 insertions(+) (limited to 'libindicate/server.c') diff --git a/libindicate/indicator.c b/libindicate/indicator.c index 7e0c986..dfcba67 100644 --- a/libindicate/indicator.c +++ b/libindicate/indicator.c @@ -141,6 +141,7 @@ indicate_indicator_finalize (GObject * obj) g_object_unref(priv->server); priv->server = NULL; + G_OBJECT_CLASS (indicate_indicator_parent_class)->finalize (obj); return; } diff --git a/libindicate/listener.c b/libindicate/listener.c index 4c754ac..3cc84b6 100644 --- a/libindicate/listener.c +++ b/libindicate/listener.c @@ -274,6 +274,7 @@ indicate_listener_finalize (GObject * obj) { /* IndicateListener * listener = INDICATE_LISTENER(obj); */ + G_OBJECT_CLASS (indicate_listener_parent_class)->finalize (obj); return; } diff --git a/libindicate/server.c b/libindicate/server.c index f2ebdd2..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; } -- cgit v1.2.3