ayatana-commits team mailing list archive

[Javier Jardón <jjardon@xxxxxxxxx>]

Javier Jardón has proposed merging lp:~jjardon/indicator-datetime/fix-794312 into lp:indicator-datetime.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)
Related bugs:
  Bug #794312 in Indicator Date and Time: "unity-panel-service crashed with SIGSEGV in g_type_check_instance_cast()"
  https://bugs.launchpad.net/indicator-datetime/+bug/794312

For more details, see:
https://code.launchpad.net/~jjardon/indicator-datetime/fix-794312/+merge/79426
-- 
https://code.launchpad.net/~jjardon/indicator-datetime/fix-794312/+merge/79426
Your team ayatana-commits is subscribed to branch lp:indicator-datetime.

=== 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,