Import upstream version 0.5.0

5 files changed, 19 insertions, 10 deletions

diff --git a/AUTHORS b/AUTHORS
index c7d95b6..e4e5efc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,7 @@
 # Generated by Makefile. Do not edit.
 
  Andrea Cimitan 
+ Chow Loong Jin 
  Chris Coulson 
  cody 
  David Barth 
diff --git a/ChangeLog b/ChangeLog
index 2cc3829..78146b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 # Generated by Makefile. Do not edit.
 
+2011-09-28  Ted Gould  <ted@gould.cx>
+
+	0.5.0
+
+2011-09-21  Ted Gould  <ted@gould.cx>
+
+	Memory leak on pixbufs
+
+2011-01-21  Chow Loong Jin  <hyperair@ubuntu.com>
+
+	Memory leaks fixes
+
 2011-08-25  Ted Gould  <ted@gould.cx>
 
 	0.4.95
diff --git a/configure b/configure
index 1d6fad3..0ba4932 100755
--- a/configure
+++ b/configure
@@ -2758,7 +2758,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-messages
- VERSION=0.4.95
+ VERSION=0.5.0
 
 
 cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index de4f91b..67445d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(src/indicator-messages.c)
 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
 
diff --git a/src/indicator-messages.c b/src/indicator-messages.c
index 2476d4d..1b96464 100644
--- a/src/indicator-messages.c
+++ b/src/indicator-messages.c
@@ -653,6 +653,7 @@ indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value,
 				                                         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 @@ indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value,
 	  
 			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 @@ new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusm
 			                                         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 @@ new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusm
   
 		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);