From e2096aa3f7d1a78ad0a8968a29529a6609a6fd5a Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sat, 7 Sep 2013 07:10:53 -0500 Subject: in the utils functions, add a GSettings argument for the functions that use a GSettings s.t. they don't have to keep reloading settings in a temporary every time they're called. --- src/utils.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/utils.h') diff --git a/src/utils.h b/src/utils.h index 3b0d0a2..fff9194 100644 --- a/src/utils.h +++ b/src/utils.h @@ -33,7 +33,8 @@ void split_settings_location (const char * location, char ** zone, char ** name); -gchar * get_current_zone_name (const char * location); +gchar * get_current_zone_name (const char * location, + GSettings * settings); gchar* join_date_and_time_format_strings (const char * date_fmt, const char * time_fmt); @@ -43,16 +44,18 @@ gchar* join_date_and_time_format_strings (const char * date_fmt, const gchar * get_terse_time_format_string (GDateTime * time); -const gchar * get_full_time_format_string (void); +const gchar * get_full_time_format_string (GSettings * settings); gchar * generate_terse_format_string_at_time (GDateTime * now, GDateTime * time); gchar * generate_full_format_string (gboolean show_day, - gboolean show_date); + gboolean show_date, + GSettings * settings); gchar * generate_full_format_string_at_time (GDateTime * now, - GDateTime * time); + GDateTime * time, + GSettings * settings); G_END_DECLS -- cgit v1.2.3 From 2bf6740a420f35942e9f74b7f7ef566de0ba736b Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 9 Sep 2013 11:53:10 -0500 Subject: in utils.h, include gio/gio.h to ensure GSettings struct is declared --- src/utils.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/utils.h') diff --git a/src/utils.h b/src/utils.h index fff9194..31a12bc 100644 --- a/src/utils.h +++ b/src/utils.h @@ -24,6 +24,7 @@ with this program. If not, see . #define __DATETIME_UTILS_H__ #include +#include /* GSettings */ G_BEGIN_DECLS -- cgit v1.2.3 From d9deaaaeb8c09db33539b498effe88b549d15b0f Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 3 Oct 2013 16:16:24 -0500 Subject: phone: show appointments at 1AM as '1 AM', clock times as '1:00 AM' --- src/service.c | 2 +- src/utils.c | 10 ++++++++-- src/utils.h | 2 ++ 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'src/utils.h') diff --git a/src/service.c b/src/service.c index 2528f41..ee00723 100644 --- a/src/service.c +++ b/src/service.c @@ -498,7 +498,7 @@ create_phone_header_state (IndicatorDatetimeService * self) /* label */ now = indicator_datetime_service_get_localtime (self); - fmt = get_terse_time_format_string (now); + fmt = get_terse_header_time_format_string (); label = g_date_time_format (now, fmt); /* icon */ diff --git a/src/utils.c b/src/utils.c index bbb24ac..60fd393 100644 --- a/src/utils.c +++ b/src/utils.c @@ -294,6 +294,13 @@ get_terse_date_format_string (date_proximity_t proximity) return fmt; } +const gchar* +get_terse_header_time_format_string (void) +{ + /* a strftime(3) fmt string for a H:MM 12 hour time, eg "6:59 PM" */ + return T_("%l:%M %p"); +} + const gchar * get_terse_time_format_string (GDateTime * time) { @@ -301,8 +308,7 @@ get_terse_time_format_string (GDateTime * time) if (g_date_time_get_minute (time) != 0) { - /* a strftime(3) fmt string for a H:MM 12 hour time, eg "6:59 PM" */ - fmt = T_("%l:%M %p"); + fmt = get_terse_header_time_format_string (); } else { diff --git a/src/utils.h b/src/utils.h index 31a12bc..24eddb6 100644 --- a/src/utils.h +++ b/src/utils.h @@ -45,6 +45,8 @@ gchar* join_date_and_time_format_strings (const char * date_fmt, const gchar * get_terse_time_format_string (GDateTime * time); +const gchar * get_terse_header_time_format_string (void); + const gchar * get_full_time_format_string (GSettings * settings); gchar * generate_terse_format_string_at_time (GDateTime * now, -- cgit v1.2.3