Ted Gould has proposed merging
lp:~indicator-applet-developers/indicator-applet/applet-packaging into
lp:~ubuntu-core-dev/indicator-applet/ubuntu.
Requested reviews:
Ubuntu Sponsors for main (ubuntu-main-sponsors)
--
https://code.launchpad.net/~indicator-applet-developers/indicator-applet/applet-packaging/+merge/5489
Your team Indicator Applet Developers is subscribed to branch
lp:~indicator-applet-developers/indicator-applet/applet-packaging.
=== modified file 'configure.ac'
--- configure.ac 2009-04-07 16:44:47 +0000
+++ configure.ac 2009-04-13 16:31:28 +0000
@@ -4,7 +4,7 @@
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
=== modified file 'debian/changelog'
--- debian/changelog 2009-04-08 08:57:41 +0000
+++ debian/changelog 2009-04-13 16:31:28 +0000
@@ -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 <[email protected]> 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
=== modified file 'libindicate/indicator.c'
--- libindicate/indicator.c 2009-04-08 02:13:07 +0000
+++ libindicate/indicator.c 2009-04-13 15:09:20 +0000
@@ -141,6 +141,7 @@
g_object_unref(priv->server);
priv->server = NULL;
+ G_OBJECT_CLASS (indicate_indicator_parent_class)->finalize (obj);
return;
}
@@ -261,7 +262,7 @@
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 @@
{
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 @@
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 @@
{
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);
}
=== modified file 'libindicate/listener.c'
--- libindicate/listener.c 2009-04-07 15:14:00 +0000
+++ libindicate/listener.c 2009-04-13 15:09:20 +0000
@@ -272,8 +272,9 @@
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 @@
_indicate_listener_get_indicator_servers (IndicateListener * listener, GList * servers)
{
-
+ return TRUE;
}
static void
=== modified file 'libindicate/server.c'
--- libindicate/server.c 2009-04-08 02:08:27 +0000
+++ libindicate/server.c 2009-04-13 15:09:20 +0000
@@ -297,6 +297,8 @@
g_free(priv->type);
}
+ G_OBJECT_CLASS (indicate_server_parent_class)->finalize (obj);
+
return;
}
@@ -307,6 +309,9 @@
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 @@
{
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 @@
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 @@
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);
}
}
_______________________________________________
Mailing list: https://launchpad.net/~dx-team
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dx-team
More help : https://help.launchpad.net/ListHelp
