Messaging Menu

Merge lp:~ted/indicator-messages/mem-leaks into lp:indicator-messages/0.5

  1. mem-leaks
  2. Merge into trunk
Proposed by Ted Gould
Status: Rejected
Rejected by: Ted Gould
Proposed branch: lp:~ted/indicator-messages/mem-leaks
Merge into: lp:indicator-messages/0.5
Diff against target: 43 lines (+4/-8)
1 file modified
src/indicator-messages.c (+4/-8)
To merge this branch: bzr merge lp:~ted/indicator-messages/mem-leaks
Reviewer Review Type Date Requested Status
Conor Curran (community) Approve
Review via email: mp+47088@code.launchpad.net

Description of the change

Patch from ~hyperair for bug 690668

To post a comment you must log in.
Revision history for this message
Conor Curran (cjcurran) :
review: Approve
Revision history for this message
Ted Gould (ted) wrote :

Rejected because of CA.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/indicator-messages.c'
2--- src/indicator-messages.c 2011-01-14 19:10:10 +0000
3+++ src/indicator-messages.c 2011-01-21 20:08:53 +0000
4@@ -571,6 +571,7 @@
5 width,
6 height,
7 GDK_INTERP_BILINEAR);
8+ g_object_unref(pixbuf);
9 } else {
10 g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
11 resized_pixbuf = pixbuf;
12@@ -578,10 +579,7 @@
13
14 gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf);
15
16- /* The other pixbuf should be free'd by the dbusmenu. */
17- if (resized_pixbuf != pixbuf) {
18- g_object_unref(resized_pixbuf);
19- }
20+ g_object_unref(resized_pixbuf);
21
22 gtk_widget_show(mi_data->icon);
23 } else {
24@@ -633,6 +631,7 @@
25 width,
26 height,
27 GDK_INTERP_BILINEAR);
28+ g_object_unref(pixbuf);
29 } else {
30 g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
31 resized_pixbuf = pixbuf;
32@@ -640,10 +639,7 @@
33
34 gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf);
35
36- /* The other pixbuf should be free'd by the dbusmenu. */
37- if (resized_pixbuf != pixbuf) {
38- g_object_unref(resized_pixbuf);
39- }
40+ g_object_unref(resized_pixbuf);
41 }
42 gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5);
43 gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, padding);

Subscribers

People subscribed via source and target branches

to all changes: