Merge lp:~indicator-applet-developers/indicator-datetime/ubuntu into lp:~ubuntu-desktop/indicator-datetime/ubuntu

[Ted Gould]

Fun fixes!

[Ken VanDine (ken-vandine)]

review: Approve

=== modified file 'AUTHORS'
--- AUTHORS	2011-08-11 16:29:05 +0000
+++ AUTHORS	2011-08-18 20:39:24 +0000
@@ -6,6 +6,7 @@
  Evgeni Golov 
  Gabor Kelemen 
  Javier Jardón 
+ Jeremy Bicha 
  karl-qdh 
  Ken VanDine 
  Kyle Nitzsche 

=== modified file 'ChangeLog'
--- ChangeLog	2011-08-11 16:29:05 +0000
+++ ChangeLog	2011-08-18 20:39:24 +0000
@@ -1,5 +1,46 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Ted Gould  <[e-mail]>
+
+	0.2.93
+
[phone]  Ted Gould  <[e-mail]>
+
+	Use cleaner gdatetime
+
[phone]  Javier Jardón  <[e-mail]>
+
+	Set the correct month number
+	
+	g_datetime_get_ymd() gets the Gregorian month number but
+	gtk_calendar_set_month() needs a value between [0,11]
+
[phone]  Javier Jardón  <[e-mail]>
+
+	Use the new GDateTime glib API to deal with time
+
[phone]  Ted Gould  <[e-mail]>
+
+	Use locale prefered date format
+
[phone]  Javier Jardón  <[e-mail]>
+
+	Show the preferred date representation for the current locale
+	
+	Fixes https://bugs.launchpad.net/indicator-datetime/+bug/729056
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fixing ellipsis to be true ellipsis
+
[phone]  Jeremy Bicha  <[e-mail]>
+
+	Use real ellipsis (LP: #621339)
+
[phone]  Jeremy Bicha  <[e-mail]>
+
+	Spell out "and" to match other System Settings panels
+
 2011-08-11  Ted Gould  <[e-mail]>
 
 	0.2.92

=== modified file 'configure'
--- configure	2011-08-11 16:29:05 +0000
+++ configure	2011-08-18 20:39:24 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for indicator-datetime 0.2.92.
+# Generated by GNU Autoconf 2.68 for indicator-datetime 0.2.93.
 #
 # Report bugs to <http://bugs.launchpad.net/indicator-datetime>.
 #
@@ -572,8 +572,8 @@
 # Identity of this package.
 PACKAGE_NAME='indicator-datetime'
 PACKAGE_TARNAME='indicator-datetime'
-PACKAGE_VERSION='0.2.92'
-PACKAGE_STRING='indicator-datetime 0.2.92'
+PACKAGE_VERSION='0.2.93'
+PACKAGE_STRING='indicator-datetime 0.2.93'
 PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-datetime'
 PACKAGE_URL='http://launchpad.net/indicator-datetime'
 
@@ -1375,7 +1375,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures indicator-datetime 0.2.92 to adapt to many kinds of systems.
+\`configure' configures indicator-datetime 0.2.93 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1446,7 +1446,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-datetime 0.2.92:";;
+     short | recursive ) echo "Configuration of indicator-datetime 0.2.93:";;
    esac
   cat <<\_ACEOF
 
@@ -1578,7 +1578,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-datetime configure 0.2.92
+indicator-datetime configure 0.2.93
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1949,7 +1949,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by indicator-datetime $as_me 0.2.92, which was
+It was created by indicator-datetime $as_me 0.2.93, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2773,7 +2773,7 @@
 
 # Define the identity of the package.
  PACKAGE='indicator-datetime'
- VERSION='0.2.92'
+ VERSION='0.2.93'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14609,7 +14609,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by indicator-datetime $as_me 0.2.92, which was
+This file was extended by indicator-datetime $as_me 0.2.93, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14676,7 +14676,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-indicator-datetime config.status 0.2.92
+indicator-datetime config.status 0.2.93
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2011-08-11 16:29:05 +0000
+++ configure.ac	2011-08-18 20:39:24 +0000
@@ -1,5 +1,5 @@
 AC_INIT([indicator-datetime],
-        [0.2.92],
+        [0.2.93],
         [http://bugs.launchpad.net/indicator-datetime],
         [indicator-datetime],
         [http://launchpad.net/indicator-datetime])

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-16 21:43:44 +0000
+++ debian/changelog	2011-08-18 20:39:24 +0000
@@ -1,3 +1,12 @@
+indicator-datetime (0.2.93-0ubuntu1~ppa1) oneiric; urgency=low
+
+  * New upstream release.
+    ∘ Use cleaner GDateTime API
+    ∘ Use locale preferred date format (LP: #729056)
+    ∘ Use real ellipsis (LP: #621339)
+
+ -- Ted Gould <[e-mail]>  Thu, 18 Aug 2011 15:36:21 -0500
+
 indicator-datetime (0.2.92-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.

=== modified file 'src/datetime-prefs.c'
--- src/datetime-prefs.c	2011-06-29 13:10:25 +0000
+++ src/datetime-prefs.c	2011-08-18 20:39:24 +0000
@@ -478,7 +478,7 @@
     }
   }
   else {
-    format = "%Y-%m-%d";
+    format = "%x";
   }
 
   GDateTime * datetime = g_date_time_new_from_unix_local (gtk_spin_button_get_value (GTK_SPIN_BUTTON (spinner)));

=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2011-08-11 16:29:05 +0000
+++ src/datetime-service.c	2011-08-18 20:39:24 +0000
@@ -299,25 +299,25 @@
 static gboolean
 update_datetime (gpointer user_data)
 {
+	GDateTime *datetime;
+	gchar *utf8;
+
 	g_debug("Updating Date/Time");
 
-	gchar longstr[128];
-	time_t t;
-	struct tm *ltime;
-
-	t = time(NULL);
-	ltime = localtime(&t);
-	if (ltime == NULL) {
+	datetime = g_date_time_new_now_local ();
+	if (datetime == NULL) {
 		g_warning("Error getting local time");
 		dbusmenu_menuitem_property_set(date, DBUSMENU_MENUITEM_PROP_LABEL, _("Error getting time"));
+		g_date_time_unref (datetime);
 		return FALSE;
 	}
 
-	/* Translators: strftime(3) style date format on top of the menu when you click on the clock */
-	strftime(longstr, 128, _("%A, %e %B %Y"), ltime);
-	
-	gchar * utf8 = g_locale_to_utf8(longstr, -1, NULL, NULL, NULL);
+	/* eranslators: strftime(3) style date format on top of the menu when you click on the clock */
+        utf8 = g_date_time_format (datetime, _("%A, %e %B %Y"));
+
 	dbusmenu_menuitem_property_set(date, DBUSMENU_MENUITEM_PROP_LABEL, utf8);
+
+	g_date_time_unref (datetime);
 	g_free(utf8);
 
 	return FALSE;
@@ -492,7 +492,7 @@
 		dbusmenu_menuitem_property_set(events_separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
 		dbusmenu_menuitem_child_add_position(root, events_separator, 2);
 		add_appointment = dbusmenu_menuitem_new();
-		dbusmenu_menuitem_property_set (add_appointment, DBUSMENU_MENUITEM_PROP_LABEL, _("Add Event..."));
+		dbusmenu_menuitem_property_set (add_appointment, DBUSMENU_MENUITEM_PROP_LABEL, _("Add Event…"));
 		dbusmenu_menuitem_property_set_bool(add_appointment, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
 		g_signal_connect(G_OBJECT(add_appointment), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), "evolution -c calendar");
 		dbusmenu_menuitem_child_add_position (root, add_appointment, 3);
@@ -701,7 +701,7 @@
 
 	// Get today & work out query times
 	time(&curtime);
-  	struct tm *today = localtime(&curtime);
+	struct tm *today = localtime(&curtime);
 	const int mday = today->tm_mday;
 	const int mon = today->tm_mon;
 	const int year = today->tm_year;
@@ -1064,7 +1064,7 @@
 	g_debug("Building Menus.");
 	if (date == NULL) {
 		date = dbusmenu_menuitem_new();
-		dbusmenu_menuitem_property_set     (date, DBUSMENU_MENUITEM_PROP_LABEL, _("No date yet..."));
+		dbusmenu_menuitem_property_set     (date, DBUSMENU_MENUITEM_PROP_LABEL, _("No date yet…"));
 		dbusmenu_menuitem_property_set_bool(date, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
 		dbusmenu_menuitem_child_append(root, date);
 
@@ -1116,7 +1116,7 @@
 		dbusmenu_menuitem_child_append(root, separator);
 
 		settings = dbusmenu_menuitem_new();
-		dbusmenu_menuitem_property_set     (settings, DBUSMENU_MENUITEM_PROP_LABEL, _("Time & Date Settings..."));
+		dbusmenu_menuitem_property_set     (settings, DBUSMENU_MENUITEM_PROP_LABEL, _("Time & Date Settings…"));
 		/* insensitive until we check for available apps */
 		dbusmenu_menuitem_property_set_bool(settings, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
 		g_signal_connect(G_OBJECT(settings), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), "gnome-control-center indicator-datetime");

=== modified file 'src/indicator-datetime.c'
--- src/indicator-datetime.c	2011-08-11 16:29:05 +0000
+++ src/indicator-datetime.c	2011-08-18 20:39:24 +0000
@@ -270,6 +270,9 @@
 menu_visible_notfy_cb(GtkWidget * menu, G_GNUC_UNUSED GParamSpec *pspec, gpointer user_data)
 {
 	IndicatorDatetime * self = INDICATOR_DATETIME(user_data);
+	GDateTime *datetime;
+	gint y, m, d;
+
 	g_debug("notify visible signal received");
 	
 	// we should only react if we're currently visible
@@ -277,18 +280,14 @@
 	g_object_get(G_OBJECT(menu), "visible", &visible, NULL);
 	if (visible) return;
 	g_debug("notify visible menu hidden, resetting date");
-	
-	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;
-  	
+
+	datetime = g_date_time_new_now_local ();
+	g_date_time_get_ymd (datetime, &y, &m, &d);
+	g_date_time_unref (datetime);
+
   	// Set the calendar to todays date
-	ido_calendar_menu_item_set_date (self->priv->ido_calendar, y+1900, m, d);
-	
+	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);
 	guint timestamp = (guint)time(NULL);