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

Proposed by Ted Gould on 2011-09-28
Status: Merged
Merged at revision: 205
Proposed branch: lp:~indicator-applet-developers/indicator-messages/ubuntu
Merge into: lp:~ubuntu-desktop/indicator-messages/ubuntu
Diff against target: 174 lines (+27/-55)
8 files modified
AUTHORS (+1/-0)
ChangeLog (+12/-0)
configure (+1/-1)
configure.ac (+1/-1)
debian/changelog (+8/-0)
debian/patches/lp_690668.patch (+0/-44)
debian/patches/series (+0/-1)
src/indicator-messages.c (+4/-8)
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-messages/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine 2011-09-28 Pending
Review via email: mp+77351@code.launchpad.net

Description of the change

Mem fix

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
1=== modified file 'AUTHORS'
2--- AUTHORS 2011-08-25 14:01:27 +0000
3+++ AUTHORS 2011-09-28 16:00:33 +0000
4@@ -1,6 +1,7 @@
5 # Generated by Makefile. Do not edit.
6
7 Andrea Cimitan
8+ Chow Loong Jin
9 Chris Coulson
10 cody
11 David Barth
12
13=== modified file 'ChangeLog'
14--- ChangeLog 2011-08-25 14:01:27 +0000
15+++ ChangeLog 2011-09-28 16:00:33 +0000
16@@ -1,5 +1,17 @@
17 # Generated by Makefile. Do not edit.
18
19+2011-09-28 Ted Gould <ted@gould.cx>
20+
21+ 0.5.0
22+
23+2011-09-21 Ted Gould <ted@gould.cx>
24+
25+ Memory leak on pixbufs
26+
27+2011-01-21 Chow Loong Jin <hyperair@ubuntu.com>
28+
29+ Memory leaks fixes
30+
31 2011-08-25 Ted Gould <ted@gould.cx>
32
33 0.4.95
34
35=== modified file 'configure'
36--- configure 2011-08-25 14:04:37 +0000
37+++ configure 2011-09-28 16:00:33 +0000
38@@ -2758,7 +2758,7 @@
39
40 # Define the identity of the package.
41 PACKAGE=indicator-messages
42- VERSION=0.4.95
43+ VERSION=0.5.0
44
45
46 cat >>confdefs.h <<_ACEOF
47
48=== modified file 'configure.ac'
49--- configure.ac 2011-08-25 13:45:34 +0000
50+++ configure.ac 2011-09-28 16:00:33 +0000
51@@ -4,7 +4,7 @@
52 AC_PREREQ(2.53)
53
54 AM_CONFIG_HEADER(config.h)
55-AM_INIT_AUTOMAKE(indicator-messages, 0.4.95)
56+AM_INIT_AUTOMAKE(indicator-messages, 0.5.0)
57
58 AM_MAINTAINER_MODE
59
60
61=== modified file 'debian/changelog'
62--- debian/changelog 2011-08-25 17:19:32 +0000
63+++ debian/changelog 2011-09-28 16:00:33 +0000
64@@ -1,3 +1,11 @@
65+indicator-messages (0.5.0-0ubuntu1~ppa1) oneiric; urgency=low
66+
67+ * New upstream release.
68+ * Fix memory leak (LP: #690668)
69+ * Drop debian/patches/lp_690668.patch: Merged upstream
70+
71+ -- Ted Gould <ted@ubuntu.com> Wed, 28 Sep 2011 10:39:26 -0500
72+
73 indicator-messages (0.4.95-0ubuntu1) oneiric; urgency=low
74
75 * New upstream release.
76
77=== removed file 'debian/patches/lp_690668.patch'
78--- debian/patches/lp_690668.patch 2011-08-25 14:07:53 +0000
79+++ debian/patches/lp_690668.patch 1970-01-01 00:00:00 +0000
80@@ -1,44 +0,0 @@
81-=== modified file 'src/indicator-messages.c'
82---- old/src/indicator-messages.c 2011-01-14 19:10:10 +0000
83-+++ new/src/indicator-messages.c 2011-01-21 20:08:53 +0000
84-@@ -571,6 +571,7 @@
85- width,
86- height,
87- GDK_INTERP_BILINEAR);
88-+ g_object_unref(pixbuf);
89- } else {
90- g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
91- resized_pixbuf = pixbuf;
92-@@ -578,10 +579,7 @@
93-
94- gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf);
95-
96-- /* The other pixbuf should be free'd by the dbusmenu. */
97-- if (resized_pixbuf != pixbuf) {
98-- g_object_unref(resized_pixbuf);
99-- }
100-+ g_object_unref(resized_pixbuf);
101-
102- gtk_widget_show(mi_data->icon);
103- } else {
104-@@ -633,6 +631,7 @@
105- width,
106- height,
107- GDK_INTERP_BILINEAR);
108-+ g_object_unref(pixbuf);
109- } else {
110- g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
111- resized_pixbuf = pixbuf;
112-@@ -640,10 +639,7 @@
113-
114- gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf);
115-
116-- /* The other pixbuf should be free'd by the dbusmenu. */
117-- if (resized_pixbuf != pixbuf) {
118-- g_object_unref(resized_pixbuf);
119-- }
120-+ g_object_unref(resized_pixbuf);
121- }
122- gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5);
123- gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, 0);
124-
125
126=== modified file 'debian/patches/series'
127--- debian/patches/series 2011-02-24 17:41:07 +0000
128+++ debian/patches/series 2011-09-28 16:00:33 +0000
129@@ -1,1 +0,0 @@
130-lp_690668.patch
131
132=== modified file 'src/indicator-messages.c'
133--- src/indicator-messages.c 2011-08-25 02:29:38 +0000
134+++ src/indicator-messages.c 2011-09-28 16:00:33 +0000
135@@ -653,6 +653,7 @@
136 width,
137 height,
138 GDK_INTERP_BILINEAR);
139+ g_object_unref(pixbuf);
140 } else {
141 g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
142 resized_pixbuf = pixbuf;
143@@ -660,10 +661,7 @@
144
145 gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf);
146
147- /* The other pixbuf should be free'd by the dbusmenu. */
148- if (resized_pixbuf != pixbuf) {
149- g_object_unref(resized_pixbuf);
150- }
151+ g_object_unref(resized_pixbuf);
152
153 gtk_widget_show(mi_data->icon);
154 } else {
155@@ -715,6 +713,7 @@
156 width,
157 height,
158 GDK_INTERP_BILINEAR);
159+ g_object_unref(pixbuf);
160 } else {
161 g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
162 resized_pixbuf = pixbuf;
163@@ -722,10 +721,7 @@
164
165 gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf);
166
167- /* The other pixbuf should be free'd by the dbusmenu. */
168- if (resized_pixbuf != pixbuf) {
169- g_object_unref(resized_pixbuf);
170- }
171+ g_object_unref(resized_pixbuf);
172 }
173 gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5);
174 gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, 0);

Subscribers

People subscribed via source and target branches

to all changes: