diff options
| author | Ted Gould <ted@gould.cx> | 2013-10-28 17:09:05 -0700 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2013-10-28 17:09:05 -0700 |
| commit | 26283de417c1c3cb3456f1a893fe339056517d56 (patch) | |
| tree | b6851a0f12bbeae649854fb5a4a8a85a54d800f1 /src/utils.h | |
| parent | 0fa8138427d8469eb2f6a90b0291dbdc4507c8fb (diff) | |
| parent | 19ba64b479fd14d5192f0ec3dcc37fe33bde238b (diff) | |
| download | ayatana-indicator-datetime-26283de417c1c3cb3456f1a893fe339056517d56.tar.gz ayatana-indicator-datetime-26283de417c1c3cb3456f1a893fe339056517d56.tar.bz2 ayatana-indicator-datetime-26283de417c1c3cb3456f1a893fe339056517d56.zip | |
Merge trunk
Diffstat (limited to 'src/utils.h')
| -rw-r--r-- | src/utils.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/utils.h b/src/utils.h index 3b0d0a2..24eddb6 100644 --- a/src/utils.h +++ b/src/utils.h @@ -24,6 +24,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #define __DATETIME_UTILS_H__ #include <glib.h> +#include <gio/gio.h> /* GSettings */ G_BEGIN_DECLS @@ -33,7 +34,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 +45,20 @@ 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_terse_header_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 |