Merge lp:~jjardon/indicator-datetime/fix-794312 into lp:indicator-datetime/0.3

[Javier Jardón]

[Charles Kerr (charlesk)]

I appreciate this patch, especially since the ticket was (incorrectly) closed as a duplicate of an unrelated ticket :) But, I don't think it addresses the OP's crash -- the retrace shows the final two steps were:

> g_type_check_instance_cast (type_instance=0x2849cb0, iface_type=42195904)
> ido_calendar_menu_item_set_date (menuitem=0x27d7440, year=2011, month=5, day=7) at idocalendarmenuitem.c:383

menuitem wasn't NULL in this trace, so guarding against NULL in the calling code probably won't help. In fact, ido_calendar_menu_item_set_date() is already safeguarding against NULL pointers in its first line that calls IDO_IS_CALENDAR_MENU_ITEM(). That's already null-safe -- but, unfortunately, not corrupt-pointer safe, which is why g_type_check_instance_cast() is crashing. ;)

review: Needs Fixing

Unmerged revisions

142. By Javier Jardón on 2011-10-14

indicator-datetime.c: Do not connect the signal before the menu is created

Fixes https://bugs.launchpad.net/ubuntu/+source/indicator-datetime/+bug/794312

=== modified file 'src/indicator-datetime.c'
--- src/indicator-datetime.c	2011-09-21 20:19:53 +0000
+++ src/indicator-datetime.c	2011-10-14 17:23:25 +0000
@@ -277,7 +277,8 @@
 	g_date_time_unref (datetime);
 
   	// Set the calendar to todays date
-	ido_calendar_menu_item_set_date (self->priv->ido_calendar, y, m-1, d);
+	if (self->priv->ido_calendar)
+		ido_calendar_menu_item_set_date (self->priv->ido_calendar, y, m-1, d);
 
 	// Make sure the day-selected signal is sent so the menu updates - may duplicate
 	/*GVariant *variant = g_variant_new_uint32((guint)curtime);
@@ -367,13 +368,13 @@
 
 	self->priv->menu = dbusmenu_gtkmenu_new(SERVICE_NAME, MENU_OBJ);
 
-	g_signal_connect(self->priv->menu, "notify::visible", G_CALLBACK(menu_visible_notfy_cb), self);
-	
 	DbusmenuGtkClient *client = dbusmenu_gtkmenu_get_client(self->priv->menu);
 	dbusmenu_client_add_type_handler_full(DBUSMENU_CLIENT(client), DBUSMENU_CALENDAR_MENUITEM_TYPE, new_calendar_item, self, NULL);
 	dbusmenu_client_add_type_handler_full(DBUSMENU_CLIENT(client), APPOINTMENT_MENUITEM_TYPE, new_appointment_item, self, NULL);
 	dbusmenu_client_add_type_handler_full(DBUSMENU_CLIENT(client), TIMEZONE_MENUITEM_TYPE, new_timezone_item, self, NULL);
 
+	g_signal_connect(self->priv->menu, "notify::visible", G_CALLBACK(menu_visible_notfy_cb), self);
+
 	self->priv->service_proxy_cancel = g_cancellable_new();
 
 	g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,