Merge lp:~karl-qdh/indicator-datetime/resetdate into lp:indicator-datetime/0.3

[Karl Lattimer]

Used the suggested arrays for marking/unmarking days but there's no change, the signal is still not received by the indicator, restarted everything in various ways and nothing seems to get it working.

[lp:~karl-qdh/indicator-datetime/resetdate]

81. By Karl Lattimer on 2011-03-30

Made marking work when you change month, still needs more work to get it to do it on startup properly.

82. By Karl Lattimer on 2011-03-30

Move start timer into an idle so we have a chance to actually create the menu items

83. By Karl Lattimer on 2011-03-30

Potential fix for suspend issue suggested by njpatel

84. By Karl Lattimer on 2011-03-30

Might not like that signal notation

=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2011-03-29 16:58:28 +0000
+++ src/datetime-service.c	2011-03-30 15:04:58 +0000
@@ -316,6 +316,28 @@
 	return TRUE;
 }
 
+static gboolean
+close_menu_cb (DbusmenuMenuitem * menuitem, gchar *name, GVariant *variant) 
+{
+	if (calendar == NULL) return FALSE;
+	g_debug("Resetting date on menu close");
+	start_time_appointments = 0;
+	// TODO create a variant which will be an array of 3 ints {y,m,d}
+	GVariant *date_variant;
+	time_t curtime;
+	struct tm *t1;
+	time(&curtime);
+	t1 = localtime(&curtime);
+	GVariant *date[3];
+	date[0] = g_variant_new_uint32(t1->tm_year + 1900);
+	date[1] = g_variant_new_uint32(t1->tm_mon);
+	date[2] = g_variant_new_uint32(t1->tm_mday);
+	date_variant = g_variant_new_array(NULL, date, 3);
+	
+	dbusmenu_menuitem_property_set_variant (calendar, CALENDAR_MENUITEM_PROP_SET_DATE, date_variant);
+	return TRUE;
+}
+
 static guint ecaltimer = 0;
 
 static void
@@ -331,6 +353,12 @@
 {
 	if (ecaltimer != 0) g_source_remove(ecaltimer);
 }
+static gboolean
+idle_start_ecal_timer (gpointer data)
+{
+	start_ecal_timer();
+	return FALSE;
+}
 
 static void
 show_events_changed (void)
@@ -389,7 +417,7 @@
 		if (g_settings_get_boolean(conf, SETTINGS_SHOW_EVENTS_S)) {
 			dbusmenu_menuitem_property_set_bool(add_appointment, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
 			dbusmenu_menuitem_property_set_bool(events_separator, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
-			start_ecal_timer();
+			g_idle_add((GSourceFunc)idle_start_ecal_timer, NULL);
 		} else {
 			dbusmenu_menuitem_property_set_bool(add_appointment, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
 			dbusmenu_menuitem_property_set_bool(events_separator, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
@@ -600,16 +628,13 @@
 			month_start.tm_mon = start_tm->tm_mon;
 			month_start.tm_mday = 1;
 			t1 = mktime(&month_start);
-			highlightdays = days[mon];
+			highlightdays = days[start_month];
 		}
 	}
 	
 	g_debug("Will highlight %d days from %s", highlightdays, ctime(&t1));
 
-	t2 = t1 + (time_t) (highlightdays * 24 * 60 * 60); 
-	
-	// Remove all highlights from the calendar widget
-	dbusmenu_menuitem_property_set (calendar, CALENDAR_MENUITEM_PROP_CLEAR_MARKS, NULL);
+	t2 = t1 + (time_t) (highlightdays * 24 * 60 * 60);
 	
 	if (!e_cal_get_sources(&sources, E_CAL_SOURCE_TYPE_EVENT, &gerror)) {
 		g_debug("Failed to get ecal sources\n");
@@ -682,6 +707,9 @@
 		apt_output = SETTINGS_TIME_LOCALE;
 	}
 	
+	GVariantBuilder markeddays;
+	g_variant_builder_init (&markeddays, G_VARIANT_TYPE_ARRAY);
+	
 	i = 0;
 	for (l = sorted_comp_instances; l; l = l->next) {
 		struct comp_instance *ci = l->data;
@@ -703,9 +731,8 @@
 		const int dyear = due->tm_year;
 		
 		// Mark day
-		g_debug("Marking date %s", ctime(&ci->start));
-		dbusmenu_menuitem_property_set_int (calendar, CALENDAR_MENUITEM_PROP_MARK, due->tm_mday);
-
+		g_debug("Adding marked date %s, %d", ctime(&ci->start), dmday);
+		g_variant_builder_add (&markeddays, "i", dmday);
 
 		// If the appointment time is less than the selected date, 
 		// don't create an appointment item for it.
@@ -833,6 +860,9 @@
 	}
 	g_list_free(sorted_comp_instances);
 	
+	GVariant * marks = g_variant_builder_end (&markeddays);
+	dbusmenu_menuitem_property_set_variant (calendar, CALENDAR_MENUITEM_PROP_MARK, marks);
+	
 	updating_appointments = FALSE;
 	g_debug("End of objects");
 	return TRUE;
@@ -1219,6 +1249,9 @@
 	
 	build_menus(root);
 	
+	// Connect to the close signal to reset the calendar date 
+	g_signal_connect(root, "event::closed", G_CALLBACK(close_menu_cb), NULL);
+	
 	/* Cache the timezone */
 	update_current_timezone();
 
 
=== modified file 'src/indicator-datetime.c'
--- src/indicator-datetime.c	2011-03-29 15:43:58 +0000
+++ src/indicator-datetime.c	2011-03-30 15:04:58 +0000
@@ -169,7 +169,9 @@
 static void guess_label_size              (IndicatorDatetime * self);
 static void setup_timer                   (IndicatorDatetime * self, GDateTime * datetime);
 static void update_time                   (IndicatorDatetime * self);
+static void session_active_change_cb      (GDBusProxy * proxy, gchar * sender_name, gchar * signal_name, GVariant * parameters, gpointer user_data);
 static void receive_signal                (GDBusProxy * proxy, gchar * sender_name, gchar * signal_name, GVariant * parameters, gpointer user_data);
+static void system_proxy_cb  (GObject * object, GAsyncResult * res, gpointer user_data);
 static void service_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data);
 static gint generate_strftime_bitmask     (const char *time_str);
 static void timezone_update_labels        (indicator_item_t * mi_data);
@@ -352,8 +354,34 @@
 		                  service_proxy_cb,
                                   self);
 
+	g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
+		                  G_DBUS_PROXY_FLAGS_NONE,
+		                  NULL,
+		                  "org.freedesktop.ConsoleKit",
+		                  "/org/freedesktop/ConsoleKit/Manager",
+		                  "org.freedesktop.ConsoleKit.Manager",
+		                  NULL, system_proxy_cb, self);
 	return;
 }
+/* for hooking into console kit signal on wake from suspend */
+static void
+system_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data)
+{
+	GError * error = NULL;
+	
+	IndicatorDatetime * self = INDICATOR_DATETIME(user_data);
+	g_return_if_fail(self != NULL);
+	
+	GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish(res, &error);
+
+	if (error != NULL) {
+		g_warning("Could not grab DBus proxy for %s: %s", SERVICE_NAME, error->message);
+		g_error_free(error);
+		return;
+	}
+	g_signal_connect(proxy, "g-signal", G_CALLBACK(session_active_change_cb), self);
+
+}
 
 /* Callback from trying to create the proxy for the serivce, this
    could include starting the service.  Sometime it'll fail and
@@ -776,6 +804,18 @@
 	return;
 }
 
+static void
+session_active_change_cb (GDBusProxy * proxy, gchar * sender_name, gchar * signal_name,
+                GVariant * parameters, gpointer user_data)
+{
+	// Just returned from suspend
+	IndicatorDatetime * self = INDICATOR_DATETIME(user_data);
+	if (g_strcmp0(signal_name, "ActiveChanged") == 0) {
+		update_time(self);
+	}
+	return;
+}
+
 /* Receives all signals from the service, routed to the appropriate functions */
 static void
 receive_signal (GDBusProxy * proxy, gchar * sender_name, gchar * signal_name,
@@ -1148,18 +1188,45 @@
 		timezone_update_labels(mi_data);
 	} else if (!g_strcmp0(prop, TIMEZONE_MENUITEM_PROP_RADIO)) {
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mi_data->gmi), g_variant_get_boolean(value));
-		
-	// Properties for marking and unmarking the calendar
-	
-	} else if (!g_strcmp0(prop, CALENDAR_MENUITEM_PROP_MARK)) {
-		ido_calendar_menu_item_mark_day (IDO_CALENDAR_MENU_ITEM (mi_data), g_variant_get_int16(value));
+	} else {
+		g_warning("Indicator Item property '%s' unknown", prop);
+	}
+	return;
+}
+// Properties for marking and unmarking the calendar
+static void
+calendar_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant *value, IdoCalendarMenuItem * mi_data)
+{
+	g_debug("Changing calendar property");
+	if (!g_strcmp0(prop, CALENDAR_MENUITEM_PROP_MARK)) {
+		ido_calendar_menu_item_clear_marks (IDO_CALENDAR_MENU_ITEM (mi_data));
+		g_debug("Marks: Cleared");
+		GVariantIter *iter;
+		gint day;
+
+		g_variant_get (value, "ai", &iter);
+	  	while (g_variant_iter_loop (iter, "i", &day)) {
+			ido_calendar_menu_item_mark_day (IDO_CALENDAR_MENU_ITEM (mi_data), day);
+			g_debug("Marks: Marked day: %d", day);
+		}
+		g_variant_iter_free (iter);
 	} else if (!g_strcmp0(prop, CALENDAR_MENUITEM_PROP_UNMARK)) {
-		ido_calendar_menu_item_unmark_day (IDO_CALENDAR_MENU_ITEM (mi_data), g_variant_get_int16(value));
+		GVariantIter *iter;
+		gint day;
+
+		g_variant_get (value, "ai", &iter);
+	  	while (g_variant_iter_loop (iter, "i", &day)) {
+			g_debug("Unmarked day: %d", day);
+			ido_calendar_menu_item_unmark_day (IDO_CALENDAR_MENU_ITEM (mi_data), day);
+		}
+		g_variant_iter_free (iter);
 	} else if (!g_strcmp0(prop, CALENDAR_MENUITEM_PROP_CLEAR_MARKS)) {
 		ido_calendar_menu_item_clear_marks (IDO_CALENDAR_MENU_ITEM (mi_data));
+		g_debug("Cleared Marks");
 	} else if (!g_strcmp0(prop, CALENDAR_MENUITEM_PROP_SET_DATE)) {
 		gsize size = 3;
 		const gint * array = g_variant_get_fixed_array(value, &size, sizeof(gint));
+		g_debug("Setting date y-m-d: %d-%d-%d", array[0], array[1], array[2]);
 		ido_calendar_menu_item_set_date (IDO_CALENDAR_MENU_ITEM (mi_data), array[0], array[1], array[2]);
 	} else {
 		g_warning("Indicator Item property '%s' unknown", prop);
@@ -1239,8 +1306,6 @@
 	dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, GTK_MENU_ITEM(mi_data->gmi), parent);
 
 	g_signal_connect(G_OBJECT(newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(indicator_prop_change_cb), mi_data);
-	g_signal_connect_swapped(G_OBJECT(newitem), "destroyed", G_CALLBACK(g_free), mi_data);
-
 	return TRUE;
 }
 
@@ -1334,6 +1399,7 @@
 	g_signal_connect_after(ido, "day-selected", G_CALLBACK(day_selected_cb), (gpointer)newitem);
 	g_signal_connect_after(ido, "day-selected-double-click", G_CALLBACK(day_selected_double_click_cb), (gpointer)newitem);
 
+	g_signal_connect(G_OBJECT(newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(calendar_prop_change_cb), ido);
 	return TRUE;
 }