ayatana-commits team mailing list archive

[Javier Jardón <jjardon@xxxxxxxxx>]

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

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)

For more details, see:
https://code.launchpad.net/~jjardon/indicator-datetime/793450/+merge/72910

Fix for the 0.2 branch
-- 
https://code.launchpad.net/~jjardon/indicator-datetime/793450/+merge/72910
Your team ayatana-commits is subscribed to branch lp:indicator-datetime.

=== modified file 'src/indicator-datetime.c'
--- src/indicator-datetime.c	2011-08-17 15:50:43 +0000
+++ src/indicator-datetime.c	2011-08-25 15:04:24 +0000
@@ -275,6 +275,7 @@
 
 	g_debug("notify visible signal received");
 	
+<<<<<<< TREE
 	// we should only react if we're currently visible
 	gboolean visible;
 	g_object_get(G_OBJECT(menu), "visible", &visible, NULL);
@@ -285,6 +286,16 @@
 	g_date_time_get_ymd (datetime, &y, &m, &d);
 	g_date_time_unref (datetime);
 
+=======
+	time_t curtime;
+	
+	time(&curtime);
+  	struct tm *today = localtime(&curtime);
+  	int y = today->tm_year;
+  	int m = today->tm_mon;
+  	int d = today->tm_mday;
+  	
+>>>>>>> MERGE-SOURCE
   	// Set the calendar to todays date
 	ido_calendar_menu_item_set_date (self->priv->ido_calendar, y, m-1, d);