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

[Javier Jardón]

[Antti Kaijanmäki (kaijanmaki)]

Thank you for your time and energy Javier to make Ubuntu better!

You are correct that the timer is not needed anymore, but I suggest we don't remove the timer from Oneiric code at this late of the cycle as the timer does not introduce any regression or unwanted behavior.

I'm now working on upgrading the code of indicator-datetime for Precise to use the newer EDS API and will in the process also clean up all the unnecessary old code, including the timer.

Unmerged revisions

140. By Javier Jardón on 2011-10-06

Remove ecal timer

It's not needed as we are using the "changed" signal in the ESource
to update the menu when and event changed

=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2011-09-29 19:57:50 +0000
+++ src/datetime-service.c	2011-10-06 03:02:23 +0000
@@ -426,41 +426,12 @@
 	return TRUE;
 }
 
-static guint ecaltimer = 0;
-
-static void
-start_ecal_timer(void)
-{
-	if (ecaltimer != 0) {
-		g_source_remove(ecaltimer);
-		ecaltimer = 0;
-	}
-	if (update_appointment_menu_items(NULL))
-		ecaltimer = g_timeout_add_seconds(60*5, update_appointment_menu_items, NULL); 	
-}
-
-static void
-stop_ecal_timer(void)
-{
-	if (ecaltimer != 0) {
-		g_source_remove(ecaltimer);
-		ecaltimer = 0;
-	}
-}
-static gboolean
-idle_start_ecal_timer (gpointer data)
-{
-	start_ecal_timer();
-	return FALSE;
-}
-
 static void
 show_events_changed (void)
 {
 	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();
 	} 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);
@@ -475,7 +446,6 @@
 				dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(litem), DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
 			}
 		}
-		stop_ecal_timer();
 	}
 }
 
@@ -508,11 +478,9 @@
 		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);
-			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);
-			stop_ecal_timer();
 		}
 		
 		// Connect to calendar events