aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-10-18 14:47:31 -0500
committerCharles Kerr <charles.kerr@canonical.com>2013-10-18 14:47:31 -0500
commit1e0cfb884a92540d8fbcac662c75633ff6eb1e2a (patch)
tree5be1fc8b6a448db8270cc1613f2e822aabd8b550
parent88b1dfa508e3e7bba4487d0a41c9b56a943ca5f2 (diff)
downloadayatana-indicator-datetime-1e0cfb884a92540d8fbcac662c75633ff6eb1e2a.tar.gz
ayatana-indicator-datetime-1e0cfb884a92540d8fbcac662c75633ff6eb1e2a.tar.bz2
ayatana-indicator-datetime-1e0cfb884a92540d8fbcac662c75633ff6eb1e2a.zip
fix a trio of pedantic gcc warnings
-rw-r--r--src/service.c2
-rw-r--r--src/timezone-geoclue.c2
-rw-r--r--src/utils.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/service.c b/src/service.c
index 9123866..fedc809 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1529,7 +1529,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);
}
diff --git a/src/timezone-geoclue.c b/src/timezone-geoclue.c
index d49d586..ac23b93 100644
--- a/src/timezone-geoclue.c
+++ b/src/timezone-geoclue.c
@@ -70,7 +70,7 @@ on_address_changed_sig (GeoclueAddress * address G_GNUC_UNUSED,
GeoclueAccuracy * accuracy G_GNUC_UNUSED,
gpointer gself)
{
- return on_address_changed(address, timestamp, addy_data, accuracy, NULL, gself);
+ on_address_changed(address, timestamp, addy_data, accuracy, NULL, gself);
}
static void
diff --git a/src/utils.c b/src/utils.c
index 00209c8..d1e1fbf 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -100,9 +100,9 @@ get_current_zone_name (const gchar * location, GSettings * settings)
split_settings_location (tz_name, &old_zone, &old_name);
g_free (tz_name);
- // new_name is always just a sanitized version of a timezone.
- // old_name is potentially a saved "pretty" version of a timezone name from
- // geonames. So we prefer to use it if available and the zones match.
+ /* new_name is always just a sanitized version of a timezone.
+ old_name is potentially a saved "pretty" version of a timezone name from
+ geonames. So we prefer to use it if available and the zones match. */
if (g_strcmp0 (old_zone, new_zone) == 0) {
rv = old_name;