diff options
| author | Ted Gould <ted@gould.cx> | 2013-10-31 11:40:41 -0700 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2013-10-31 11:40:41 -0700 |
| commit | eb47d698341bc8f1b46433c48fc280d5a4906ad3 (patch) | |
| tree | 04e18a96bcad6c22f5079a517c5c8927d1ac49cd /src/service.c | |
| parent | a4a5562fd93fdd6d9cb4b9cde98126fdca3ea21d (diff) | |
| parent | 0439dc69bfd71c42d01b7d11cb586ef056503b28 (diff) | |
| download | ayatana-indicator-datetime-eb47d698341bc8f1b46433c48fc280d5a4906ad3.tar.gz ayatana-indicator-datetime-eb47d698341bc8f1b46433c48fc280d5a4906ad3.tar.bz2 ayatana-indicator-datetime-eb47d698341bc8f1b46433c48fc280d5a4906ad3.zip | |
Merge trunk
Diffstat (limited to 'src/service.c')
| -rw-r--r-- | src/service.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/service.c b/src/service.c index 5fffc11..4edcd1c 100644 --- a/src/service.c +++ b/src/service.c @@ -18,8 +18,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <string.h> /* strstr() */ #include <glib/gi18n.h> @@ -668,7 +666,8 @@ get_header_label_format_string (IndicatorDatetimeService * self) { gboolean show_day = g_settings_get_boolean (s, SETTINGS_SHOW_DAY_S); gboolean show_date = g_settings_get_boolean (s, SETTINGS_SHOW_DATE_S); - fmt = generate_full_format_string (show_day, show_date, s); + gboolean show_year = show_date && g_settings_get_boolean (s, SETTINGS_SHOW_YEAR_S); + fmt = generate_full_format_string (show_day, show_date, show_year, s); } p->header_label_format_string = fmt; @@ -1531,7 +1530,7 @@ on_activate_appointment (GSimpleAction * a G_GNUC_UNUSED, } /* if that appointment's an alarm, dispatch its url */ - g_debug ("%s: uri '%s'; matching appt is %p", G_STRFUNC, uid, appt); + g_debug ("%s: uri '%s'; matching appt is %p", G_STRFUNC, uid, (void*)appt); if (appt && appointment_has_alarm_url (appt)) dispatch_alarm_url (appt); } @@ -2184,6 +2183,7 @@ my_constructed (GObject * gself) SETTINGS_SHOW_SECONDS_S, SETTINGS_SHOW_DAY_S, SETTINGS_SHOW_DATE_S, + SETTINGS_SHOW_YEAR_S, SETTINGS_CUSTOM_TIME_FORMAT_S }; const char * const calendar_settings[] = { |