Merge lp:~indicator-applet-developers/indicator-application/ubuntu into lp:~ubuntu-desktop/indicator-application/ubuntu

Proposed by Ted Gould on 2011-09-28
Status: Merged
Merged at revision: 274
Proposed branch: lp:~indicator-applet-developers/indicator-application/ubuntu
Merge into: lp:~ubuntu-desktop/indicator-application/ubuntu
Diff against target: 229 lines (+78/-14)
5 files modified
ChangeLog (+24/-0)
configure (+10/-10)
configure.ac (+2/-2)
debian/changelog (+7/-0)
src/application-service-appstore.c (+35/-2)
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-application/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine 2011-09-28 Pending
Review via email: mp+77347@code.launchpad.net

Description of the change

Mem leak

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2011-08-11 16:54:27 +0000
+++ ChangeLog 2011-09-28 15:30:47 +0000
@@ -1,5 +1,29 @@
1# Generated by Makefile. Do not edit.1# Generated by Makefile. Do not edit.
22
32011-09-28 Ted Gould <ted@gould.cx>
4
5 0.4.0
6
72011-09-16 Ted Gould <ted@gould.cx>
8
9 Memory leaks on double calls for properties
10
112011-09-16 Ted Gould <ted@gould.cx>
12
13 Pulling in mterry's additional fixes
14
152011-09-16 Michael Terry <michael.terry@canonical.com>
16
17 free application fields before resetting them to new values
18
192011-09-16 Ted Gould <ted@gould.cx>
20
21 Ensure we set a default value for aicon
22
232011-09-14 Ted Gould <ted@gould.cx>
24
25 Freeing properties on second run of building the app indicator
26
32011-08-11 Ted Gould <ted@gould.cx>272011-08-11 Ted Gould <ted@gould.cx>
428
5 0.3.9229 0.3.92
630
=== modified file 'configure'
--- configure 2011-08-11 16:55:25 +0000
+++ configure 2011-09-28 15:30:47 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.68 for indicator-application 0.3.92.3# Generated by GNU Autoconf 2.68 for indicator-application 0.4.0.
4#4#
5# Report bugs to <ted@canonical.com>.5# Report bugs to <ted@canonical.com>.
6#6#
@@ -572,8 +572,8 @@
572# Identity of this package.572# Identity of this package.
573PACKAGE_NAME='indicator-application'573PACKAGE_NAME='indicator-application'
574PACKAGE_TARNAME='indicator-application'574PACKAGE_TARNAME='indicator-application'
575PACKAGE_VERSION='0.3.92'575PACKAGE_VERSION='0.4.0'
576PACKAGE_STRING='indicator-application 0.3.92'576PACKAGE_STRING='indicator-application 0.4.0'
577PACKAGE_BUGREPORT='ted@canonical.com'577PACKAGE_BUGREPORT='ted@canonical.com'
578PACKAGE_URL=''578PACKAGE_URL=''
579579
@@ -1317,7 +1317,7 @@
1317 # Omit some internal or obsolete options to make the list less imposing.1317 # Omit some internal or obsolete options to make the list less imposing.
1318 # This message is too long to be a string in the A/UX 3.1 sh.1318 # This message is too long to be a string in the A/UX 3.1 sh.
1319 cat <<_ACEOF1319 cat <<_ACEOF
1320\`configure' configures indicator-application 0.3.92 to adapt to many kinds of systems.1320\`configure' configures indicator-application 0.4.0 to adapt to many kinds of systems.
13211321
1322Usage: $0 [OPTION]... [VAR=VALUE]...1322Usage: $0 [OPTION]... [VAR=VALUE]...
13231323
@@ -1388,7 +1388,7 @@
13881388
1389if test -n "$ac_init_help"; then1389if test -n "$ac_init_help"; then
1390 case $ac_init_help in1390 case $ac_init_help in
1391 short | recursive ) echo "Configuration of indicator-application 0.3.92:";;1391 short | recursive ) echo "Configuration of indicator-application 0.4.0:";;
1392 esac1392 esac
1393 cat <<\_ACEOF1393 cat <<\_ACEOF
13941394
@@ -1509,7 +1509,7 @@
1509test -n "$ac_init_help" && exit $ac_status1509test -n "$ac_init_help" && exit $ac_status
1510if $ac_init_version; then1510if $ac_init_version; then
1511 cat <<\_ACEOF1511 cat <<\_ACEOF
1512indicator-application configure 0.3.921512indicator-application configure 0.4.0
1513generated by GNU Autoconf 2.681513generated by GNU Autoconf 2.68
15141514
1515Copyright (C) 2010 Free Software Foundation, Inc.1515Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1789,7 +1789,7 @@
1789This file contains any messages produced by compilers while1789This file contains any messages produced by compilers while
1790running configure, to aid debugging if configure makes a mistake.1790running configure, to aid debugging if configure makes a mistake.
17911791
1792It was created by indicator-application $as_me 0.3.92, which was1792It was created by indicator-application $as_me 0.4.0, which was
1793generated by GNU Autoconf 2.68. Invocation command line was1793generated by GNU Autoconf 2.68. Invocation command line was
17941794
1795 $ $0 $@1795 $ $0 $@
@@ -2610,7 +2610,7 @@
26102610
2611# Define the identity of the package.2611# Define the identity of the package.
2612 PACKAGE=indicator-application2612 PACKAGE=indicator-application
2613 VERSION=0.3.922613 VERSION=0.4.0
26142614
26152615
2616cat >>confdefs.h <<_ACEOF2616cat >>confdefs.h <<_ACEOF
@@ -13365,7 +13365,7 @@
13365# report actual input values of CONFIG_FILES etc. instead of their13365# report actual input values of CONFIG_FILES etc. instead of their
13366# values after options handling.13366# values after options handling.
13367ac_log="13367ac_log="
13368This file was extended by indicator-application $as_me 0.3.92, which was13368This file was extended by indicator-application $as_me 0.4.0, which was
13369generated by GNU Autoconf 2.68. Invocation command line was13369generated by GNU Autoconf 2.68. Invocation command line was
1337013370
13371 CONFIG_FILES = $CONFIG_FILES13371 CONFIG_FILES = $CONFIG_FILES
@@ -13431,7 +13431,7 @@
13431cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=113431cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
13432ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"13432ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
13433ac_cs_version="\\13433ac_cs_version="\\
13434indicator-application config.status 0.3.9213434indicator-application config.status 0.4.0
13435configured by $0, generated by GNU Autoconf 2.68,13435configured by $0, generated by GNU Autoconf 2.68,
13436 with options \\"\$ac_cs_config\\"13436 with options \\"\$ac_cs_config\\"
1343713437
1343813438
=== modified file 'configure.ac'
--- configure.ac 2011-08-11 16:51:43 +0000
+++ configure.ac 2011-09-28 15:30:47 +0000
@@ -1,11 +1,11 @@
11
2AC_INIT(indicator-application, 0.3.92, ted@canonical.com)2AC_INIT(indicator-application, 0.4.0, ted@canonical.com)
3AC_COPYRIGHT([Copyright 2009, 2010 Canonical])3AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
44
5AC_PREREQ(2.53)5AC_PREREQ(2.53)
66
7AM_CONFIG_HEADER(config.h)7AM_CONFIG_HEADER(config.h)
8AM_INIT_AUTOMAKE(indicator-application, 0.3.92)8AM_INIT_AUTOMAKE(indicator-application, 0.4.0)
99
10AM_MAINTAINER_MODE10AM_MAINTAINER_MODE
1111
1212
=== modified file 'debian/changelog'
--- debian/changelog 2011-08-11 19:48:49 +0000
+++ debian/changelog 2011-09-28 15:30:47 +0000
@@ -1,3 +1,10 @@
1indicator-application (0.4.0-0ubuntu1~ppa1) oneiric; urgency=low
2
3 * New upstream release.
4 * Fix memory leak (LP: #829961)
5
6 -- Ted Gould <ted@ubuntu.com> Wed, 28 Sep 2011 10:02:11 -0500
7
1indicator-application (0.3.92-0ubuntu1) oneiric; urgency=low8indicator-application (0.3.92-0ubuntu1) oneiric; urgency=low
29
3 * debian/rules: 10 * debian/rules:
411
=== modified file 'src/application-service-appstore.c'
--- src/application-service-appstore.c 2011-08-11 16:55:25 +0000
+++ src/application-service-appstore.c 2011-09-28 15:30:47 +0000
@@ -508,6 +508,14 @@
508 else {508 else {
509 app->validated = TRUE;509 app->validated = TRUE;
510510
511 /* It is possible we're coming through a second time and
512 getting the properties. So we need to ensure we don't
513 already have them stored */
514 g_free(app->id);
515 g_free(app->category);
516 g_free(app->icon);
517 g_free(app->menu);
518
511 app->id = g_variant_dup_string(id, NULL);519 app->id = g_variant_dup_string(id, NULL);
512 app->category = g_variant_dup_string(category, NULL);520 app->category = g_variant_dup_string(category, NULL);
513 app->status = string_to_status(g_variant_get_string(status, NULL));521 app->status = string_to_status(g_variant_get_string(status, NULL));
@@ -516,10 +524,30 @@
516524
517 /* Now the optional properties */525 /* Now the optional properties */
518526
527 g_free(app->icon_desc);
528 if (icon_desc != NULL) {
529 app->icon_desc = g_variant_dup_string(icon_desc, NULL);
530 }
531 else {
532 app->icon_desc = g_strdup("");
533 }
534
535 g_free(app->aicon);
519 if (aicon_name != NULL) {536 if (aicon_name != NULL) {
520 app->aicon = g_variant_dup_string(aicon_name, NULL);537 app->aicon = g_variant_dup_string(aicon_name, NULL);
521 }538 } else {
522539 app->aicon = g_strdup("");
540 }
541
542 g_free(app->aicon_desc);
543 if (aicon_desc != NULL) {
544 app->aicon_desc = g_variant_dup_string(aicon_desc, NULL);
545 }
546 else {
547 app->aicon_desc = g_strdup("");
548 }
549
550 g_free(app->icon_theme_path);
523 if (icon_theme_path != NULL) {551 if (icon_theme_path != NULL) {
524 app->icon_theme_path = g_variant_dup_string(icon_theme_path, NULL);552 app->icon_theme_path = g_variant_dup_string(icon_theme_path, NULL);
525 } else {553 } else {
@@ -539,12 +567,14 @@
539 g_debug("'%s' ordering index is '%X'", app->id, app->ordering_index);567 g_debug("'%s' ordering index is '%X'", app->id, app->ordering_index);
540 app->appstore->priv->applications = g_list_sort_with_data(app->appstore->priv->applications, app_sort_func, NULL);568 app->appstore->priv->applications = g_list_sort_with_data(app->appstore->priv->applications, app_sort_func, NULL);
541569
570 g_free(app->label);
542 if (label != NULL) {571 if (label != NULL) {
543 app->label = g_variant_dup_string(label, NULL);572 app->label = g_variant_dup_string(label, NULL);
544 } else {573 } else {
545 app->label = g_strdup("");574 app->label = g_strdup("");
546 }575 }
547576
577 g_free(app->guide);
548 if (guide != NULL) {578 if (guide != NULL) {
549 app->guide = g_variant_dup_string(guide, NULL);579 app->guide = g_variant_dup_string(guide, NULL);
550 } else {580 } else {
@@ -736,6 +766,9 @@
736 if (app->icon_desc != NULL) {766 if (app->icon_desc != NULL) {
737 g_free(app->icon_desc);767 g_free(app->icon_desc);
738 }768 }
769 if (app->aicon != NULL) {
770 g_free(app->aicon);
771 }
739 if (app->aicon_desc != NULL) {772 if (app->aicon_desc != NULL) {
740 g_free(app->aicon_desc);773 g_free(app->aicon_desc);
741 }774 }

Subscribers

People subscribed via source and target branches

to all changes: