aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/lp_690668.patch
diff options
context:
space:
mode:
authorEvgeni Golov <evgeni@debian.org>2011-03-31 14:09:07 +0200
committerEvgeni Golov <evgeni@debian.org>2011-03-31 14:09:07 +0200
commit38a90ca64a3d976218be46f7f5241805854d9ef1 (patch)
tree2b24bdb39e61fce6999511da451261daff1db7e2 /debian/patches/lp_690668.patch
parent36559fd986e3226f8c926c69f9c253d4da46cb19 (diff)
parentcb170c0fb193360740cc543816e6f00d46a480c7 (diff)
downloadayatana-indicator-messages-38a90ca64a3d976218be46f7f5241805854d9ef1.tar.gz
ayatana-indicator-messages-38a90ca64a3d976218be46f7f5241805854d9ef1.tar.bz2
ayatana-indicator-messages-38a90ca64a3d976218be46f7f5241805854d9ef1.zip
Merge Ubuntu up to 0.3.92-0ubuntu3
* Merge new upstream from Ubuntu. * debian/patches/lp_690668.patch - Memory leak fixes (LP: #690668) * debian/control - Bump standards version to 3.9.1 * debian/source/format - Use source format 3.0 (quilt) * src/launcher-menu-item.c - Make sure menu entries are displayed for launchers that aren't running (LP: #723873) * New upstream release. * Adding in accessible description support * debian/control: libindicator version 0.3.19 * New upstream release. * Fixing the service file * Adding a log domain * Fixing type handler for dbusmenu 0.3.94 * debian/control: dbusmenu to 0.3.94 [ Ted Gould ] * New upstream release. * GDBus Port * New libindicate and dbusmenu [ Ken VanDine ] * debian/control - Build depends on libindicate-dev to 0.4.91 - Build depends on dbusmenu to 0.3.91 - Set Vcs to ~ubuntu-desktop * data/indicator-messages.service.in - Fixed dbus interface name * debian/control - Bump build depends for libdbusmenu-* to >= 0.3.90 * debian/control: package description spelling (LP: #658096) * Rebuild for libindicator ABI change (LP: #637692) * debian/control: depends on latest libindicator-dev * New upstream release. * Fixing triangles by passing data to callback (LP: #623453) * New upstream release. * Shifting icons into the gutter and adjusting the arrow padding. * New upstream release. * Remove parens from counts * New upstream release. - running apps triangle indicator overlay - message counters are now rendered with a nice rounded background
Diffstat (limited to 'debian/patches/lp_690668.patch')
-rw-r--r--debian/patches/lp_690668.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/debian/patches/lp_690668.patch b/debian/patches/lp_690668.patch
new file mode 100644
index 0000000..48ee7f5
--- /dev/null
+++ b/debian/patches/lp_690668.patch
@@ -0,0 +1,44 @@
+=== 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, padding);
+