aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-09-03 14:08:03 -0500
committerTed Gould <ted@gould.cx>2010-09-03 14:08:03 -0500
commita7e5917060f44676433afcf59a3ab1144e6570c2 (patch)
treecae31a861f1fef4665fd5dc39748c409faef6c3c
parent7fcfb3fb447e59bd3dcbc708bd138db5e6cd161e (diff)
parent9522939474e8e6b19b1af712d1507ed3b9200b22 (diff)
downloadayatana-indicator-messages-a7e5917060f44676433afcf59a3ab1144e6570c2.tar.gz
ayatana-indicator-messages-a7e5917060f44676433afcf59a3ab1144e6570c2.tar.bz2
ayatana-indicator-messages-a7e5917060f44676433afcf59a3ab1144e6570c2.zip
* Upstream Merge
* Fixing triangles by passing data to callback (LP: #623453)
-rw-r--r--debian/changelog7
-rw-r--r--src/indicator-messages.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 1a3ce06..632e529 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-messages (0.3.10-0ubuntu1~ppa2) UNRELEASED; urgency=low
+
+ * Upstream Merge
+ * Fixing triangles by passing data to callback (LP: #623453)
+
+ -- Ted Gould <ted@ubuntu.com> Fri, 03 Sep 2010 14:04:10 -0500
+
indicator-messages (0.3.10-0ubuntu1~ppa1) maverick; urgency=low
* New upstream release.
diff --git a/src/indicator-messages.c b/src/indicator-messages.c
index 302b9e5..b29edce 100644
--- a/src/indicator-messages.c
+++ b/src/indicator-messages.c
@@ -453,7 +453,7 @@ new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbu
/* Make sure we can handle the label changing */
g_signal_connect(G_OBJECT(newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(application_prop_change_cb), label);
g_signal_connect(G_OBJECT(newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(application_icon_change_cb), icon);
- g_signal_connect_after(G_OBJECT (gmi), "expose_event", G_CALLBACK (application_triangle_draw_cb), NULL);
+ g_signal_connect_after(G_OBJECT (gmi), "expose_event", G_CALLBACK (application_triangle_draw_cb), newitem);
return TRUE;
}