aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@canonical.com>2009-04-14 11:36:10 +0200
committerMartin Pitt <martin.pitt@canonical.com>2009-04-14 11:36:10 +0200
commit4959fae25c9f5f416ab95be98cec1c900eccaae1 (patch)
tree387e69034a54444bff2ab71a2b3314db579c9460
parentdf604ba78746b932c269d6c5b1b455ef28e2a319 (diff)
parentcb60d3fd9dc8a771259fcfedaa9c5eae16c6fb0f (diff)
downloadlibayatana-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.
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog9
-rw-r--r--libindicate/indicator.c9
-rw-r--r--libindicate/listener.c5
-rw-r--r--libindicate/server.c11
5 files changed, 26 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index b86656d..6e5d253 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(src/applet-main.c)
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-applet, 0.1.5)
+AM_INIT_AUTOMAKE(indicator-applet, 0.1.6)
AM_MAINTAINER_MODE
diff --git a/debian/changelog b/debian/changelog
index 38f10e1..40955cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+indicator-applet (0.1.6-0ubuntu1) UNRELEASED; urgency=low
+
+ * 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.
+
+ -- Ted Gould <ted@ubuntu.com> Mon, 13 Apr 2009 11:29:58 -0500
+
indicator-applet (0.1.5-0ubuntu1) jaunty; urgency=low
* debian/control: Switching libindicate0 to libindicate1 to express
diff --git a/libindicate/indicator.c b/libindicate/indicator.c
index 9427d03..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;
}
@@ -261,7 +262,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 +309,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 +317,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 +336,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);
}
diff --git a/libindicate/listener.c b/libindicate/listener.c
index 381a5f9..3cc84b6 100644
--- a/libindicate/listener.c
+++ b/libindicate/listener.c
@@ -272,8 +272,9 @@ indicate_listener_init (IndicateListener * listener)
static void
indicate_listener_finalize (GObject * obj)
{
- IndicateListener * listener = INDICATE_LISTENER(obj);
+ /* IndicateListener * listener = INDICATE_LISTENER(obj); */
+ G_OBJECT_CLASS (indicate_listener_parent_class)->finalize (obj);
return;
}
@@ -833,7 +834,7 @@ gboolean
_indicate_listener_get_indicator_servers (IndicateListener * listener, GList * servers)
{
-
+ return TRUE;
}
static void
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);
}
}