diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-06-21 15:01:54 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-06-21 15:01:54 +0000 |
| commit | 854fb1a47bed41e41e6fed9c5e498dc81146302a (patch) | |
| tree | c0db59a66b90162a7f8ae2519430249ce5a5ffb6 /src/utils.h | |
| parent | 05ba6fa097260473c774d0d077d4e3add3db134b (diff) | |
| parent | 51bd7465ac148a34ec37cb8760daf3b282b5ed6a (diff) | |
| download | ayatana-indicator-datetime-854fb1a47bed41e41e6fed9c5e498dc81146302a.tar.gz ayatana-indicator-datetime-854fb1a47bed41e41e6fed9c5e498dc81146302a.tar.bz2 ayatana-indicator-datetime-854fb1a47bed41e41e6fed9c5e498dc81146302a.zip | |
This push extracts geoclue to its own self-contained module, fixes an errant g_critical, and merges ryan's timedate1 changes from the 13.04 branch.
Approved by PS Jenkins bot, Lars Uebernickel.
Diffstat (limited to 'src/utils.h')
| -rw-r--r-- | src/utils.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/utils.h b/src/utils.h index 788d516..8dc2964 100644 --- a/src/utils.h +++ b/src/utils.h @@ -30,9 +30,8 @@ G_BEGIN_DECLS gboolean is_locale_12h (void); void split_settings_location (const gchar * location, gchar ** zone, gchar ** name); gchar * get_current_zone_name (const gchar * location); -gchar * read_timezone (); gchar * generate_format_string_full (gboolean show_day, gboolean show_date); -gchar * generate_format_string_at_time (GDateTime * time); +gchar * generate_format_string_at_time (GDateTime * now, GDateTime * time); G_END_DECLS |