diff options
| author | Ted Gould <ted@gould.cx> | 2011-09-28 10:38:02 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-09-28 10:38:02 -0500 |
| commit | 1ca4f3a8a93790b6e702c180e437ae08fec79050 (patch) | |
| tree | 2b1b464d8d4a3e7f98de4c23df8aedbd81c33256 | |
| parent | cf3acf865a0a6e53389f331191ed0a6d89954c3c (diff) | |
| download | ayatana-indicator-messages-1ca4f3a8a93790b6e702c180e437ae08fec79050.tar.gz ayatana-indicator-messages-1ca4f3a8a93790b6e702c180e437ae08fec79050.tar.bz2 ayatana-indicator-messages-1ca4f3a8a93790b6e702c180e437ae08fec79050.zip | |
Drop debian/patches/lp_690668.patch: Merged upstream
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/lp_690668.patch | 44 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 2 insertions, 46 deletions
diff --git a/debian/changelog b/debian/changelog index 0309ad7..b5687a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ indicator-messages (0.5.0-0ubuntu1~ppa1) UNRELEASED; urgency=low * New upstream release. * Fix memory leak (LP: #690668) + * Drop debian/patches/lp_690668.patch: Merged upstream - -- Ted Gould <ted@ubuntu.com> Wed, 28 Sep 2011 10:36:29 -0500 + -- Ted Gould <ted@ubuntu.com> Wed, 28 Sep 2011 10:37:19 -0500 indicator-messages (0.4.95-0ubuntu1) oneiric; urgency=low diff --git a/debian/patches/lp_690668.patch b/debian/patches/lp_690668.patch deleted file mode 100644 index d7f2ec2..0000000 --- a/debian/patches/lp_690668.patch +++ /dev/null @@ -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); - diff --git a/debian/patches/series b/debian/patches/series index 6badc75..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -lp_690668.patch |