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

[Ted Gould]

Mem fix

=== modified file 'AUTHORS'
--- AUTHORS	2011-08-25 14:01:27 +0000
+++ AUTHORS	2011-09-28 16:00:33 +0000
@@ -1,6 +1,7 @@
 # Generated by Makefile. Do not edit.
 
  Andrea Cimitan 
+ Chow Loong Jin 
  Chris Coulson 
  cody 
  David Barth 
 
=== modified file 'ChangeLog'
--- ChangeLog	2011-08-25 14:01:27 +0000
+++ ChangeLog	2011-09-28 16:00:33 +0000
@@ -1,5 +1,17 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Ted Gould  <[e-mail]>
+
+	0.5.0
+
[phone]  Ted Gould  <[e-mail]>
+
+	Memory leak on pixbufs
+
[phone]  Chow Loong Jin  <[e-mail]>
+
+	Memory leaks fixes
+
 2011-08-25  Ted Gould  <[e-mail]>
 
 	0.4.95
 
=== modified file 'configure'
--- configure	2011-08-25 14:04:37 +0000
+++ configure	2011-09-28 16:00:33 +0000
@@ -2758,7 +2758,7 @@
 
 # Define the identity of the package.
  PACKAGE=indicator-messages
- VERSION=0.4.95
+ VERSION=0.5.0
 
 
 cat >>confdefs.h <<_ACEOF
 
=== modified file 'configure.ac'
--- configure.ac	2011-08-25 13:45:34 +0000
+++ configure.ac	2011-09-28 16:00:33 +0000
@@ -4,7 +4,7 @@
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-messages, 0.4.95)
+AM_INIT_AUTOMAKE(indicator-messages, 0.5.0)
 
 AM_MAINTAINER_MODE
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-08-25 17:19:32 +0000
+++ debian/changelog	2011-09-28 16:00:33 +0000
@@ -1,3 +1,11 @@
+indicator-messages (0.5.0-0ubuntu1~ppa1) oneiric; urgency=low
+
+  * New upstream release.
+    * Fix memory leak (LP: #690668)
+  * Drop debian/patches/lp_690668.patch: Merged upstream
+
+ -- Ted Gould <[e-mail]>  Wed, 28 Sep 2011 10:39:26 -0500
+
 indicator-messages (0.4.95-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.
 
=== removed file 'debian/patches/lp_690668.patch'
--- debian/patches/lp_690668.patch	2011-08-25 14:07:53 +0000
+++ debian/patches/lp_690668.patch	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-=== modified file 'src/indicator-messages.c'
---- old/src/indicator-messages.c	2011-01-14 19:10:10 +0000
-+++ new/src/indicator-messages.c	2011-01-21 20:08:53 +0000
-@@ -571,6 +571,7 @@
- 				                                         width,
- 				                                         height,
- 				                                         GDK_INTERP_BILINEAR);
-+				g_object_unref(pixbuf);
- 			} else {
- 				g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
- 				resized_pixbuf = pixbuf;
-@@ -578,10 +579,7 @@
- 	  
- 			gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf);
- 
--			/* The other pixbuf should be free'd by the dbusmenu. */
--			if (resized_pixbuf != pixbuf) {
--				g_object_unref(resized_pixbuf);
--			}
-+			g_object_unref(resized_pixbuf);
- 
- 			gtk_widget_show(mi_data->icon);
- 		} else {
-@@ -633,6 +631,7 @@
- 			                                         width,
- 			                                         height,
- 			                                         GDK_INTERP_BILINEAR);
-+			g_object_unref(pixbuf);
- 		} else {
- 			g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
- 			resized_pixbuf = pixbuf;
-@@ -640,10 +639,7 @@
-   
- 		gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf);
- 
--		/* The other pixbuf should be free'd by the dbusmenu. */
--		if (resized_pixbuf != pixbuf) {
--			g_object_unref(resized_pixbuf);
--		}
-+		g_object_unref(resized_pixbuf);
- 	}
- 	gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5);
- 	gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, 0);
-
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-02-24 17:41:07 +0000
+++ debian/patches/series	2011-09-28 16:00:33 +0000
@@ -1,1 +0,0 @@
-lp_690668.patch
 
=== modified file 'src/indicator-messages.c'
--- src/indicator-messages.c	2011-08-25 02:29:38 +0000
+++ src/indicator-messages.c	2011-09-28 16:00:33 +0000
@@ -653,6 +653,7 @@
 				                                         width,
 				                                         height,
 				                                         GDK_INTERP_BILINEAR);
+				g_object_unref(pixbuf);
 			} else {
 				g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
 				resized_pixbuf = pixbuf;
@@ -660,10 +661,7 @@
 	  
 			gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf);
 
-			/* The other pixbuf should be free'd by the dbusmenu. */
-			if (resized_pixbuf != pixbuf) {
-				g_object_unref(resized_pixbuf);
-			}
+			g_object_unref(resized_pixbuf);
 
 			gtk_widget_show(mi_data->icon);
 		} else {
@@ -715,6 +713,7 @@
 			                                         width,
 			                                         height,
 			                                         GDK_INTERP_BILINEAR);
+			g_object_unref(pixbuf);
 		} else {
 			g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
 			resized_pixbuf = pixbuf;
@@ -722,10 +721,7 @@
   
 		gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf);
 
-		/* The other pixbuf should be free'd by the dbusmenu. */
-		if (resized_pixbuf != pixbuf) {
-			g_object_unref(resized_pixbuf);
-		}
+		g_object_unref(resized_pixbuf);
 	}
 	gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5);
 	gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, 0);