Merge lp:~3v1n0/ido/parent-signals-disconnection-trusty into lp:ido

[Marco Trevisan (Treviño)]

IdoCalendarMenuItem: disconnect from parent signals on item destruction

Unmerged revisions

187. By Marco Trevisan (Treviño) on 2016-10-28

IdoCalendarMenuItem: disconnect from parent signals on item destruction

186. By CI Train Bot Account on 2015-10-21

Releasing 13.10.0+14.04.20151021-0ubuntu1

185. By Marco Trevisan (Treviño) on 2015-10-21

IdoCalendarMenuItem: add crash guard on ido_calendar_menu_item_key_press

It's quite weird that data is NULL at this point (considering how the callback is
initialized), but it does happen, so it's just better to warn here instead of crashing. Fixes: #1350821
Approved by: Andrea Azzarone

=== modified file 'debian/changelog'
--- debian/changelog	2016-10-28 22:42:17 +0000
+++ debian/changelog	2017-04-03 16:05:56 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ido (13.10.0+17.04.20161028-0ubuntu1) zesty; urgency=medium
 
   * IdoCalendarMenuItem: disconnect from parent signals on item
@@ -49,6 +50,22 @@
 
  -- Ubuntu daily release <[e-mail]>  Mon, 03 Nov 2014 20:57:41 +0000
 
+=======
+ido (13.10.0+14.04.20151021-0ubuntu2) UNRELEASED; urgency=medium
+
+  * IdoCalendarMenuItem: disconnect from parent signals on item
+    destruction (LP: #1506427)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Mon, 03 Apr 2017 23:58:23 +0800
+
+ido (13.10.0+14.04.20151021-0ubuntu1) trusty; urgency=medium
+
+  * IdoCalendarMenuItem: add crash guard on
+    ido_calendar_menu_item_key_press (LP: #1350821)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Wed, 21 Oct 2015 15:52:32 +0000
+
+>>>>>>> MERGE-SOURCE
 ido (13.10.0+14.04.20140423-0ubuntu1) trusty; urgency=low
 
   [ Lars Uebernickel ]