From 8fd93c9042bb30e53ce88303f8a0789a6ca688eb Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 5 Oct 2011 18:19:33 +0200 Subject: First successful build --- calendar/gui/alarm-notify/config-data.c | 26 +++++++++++++------------- calendar/gui/dialogs/comp-editor.c | 19 ++++++++++++------- calendar/importers/icalendar-importer.c | 2 +- 3 files changed, 26 insertions(+), 21 deletions(-) (limited to 'calendar') diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index 4f30a4e4f3..f44a832b4c 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -34,7 +34,7 @@ * the data from the configuration engine. */ static gboolean inited = FALSE; static GConfClient *conf_client = NULL; -static GSetting *calendar_settings = NULL; +static GSettings *calendar_settings = NULL; static ESourceList *calendar_source_list = NULL, *tasks_source_list = NULL; /* Copied from ../calendar-config.c; returns whether the locale has 'am' and @@ -123,11 +123,11 @@ config_data_get_calendars (const gchar *key) return cal_sources; } - state = g_settings_get_boolean (calendar_settings, "notify-with-tray", NULL); + state = g_settings_get_boolean (calendar_settings, "notify-with-tray"); if (!state) /* Should be old client */ { GSList *source; - g_settings_set_boolean (calendar_settings, "notify-with-tray", TRUE, NULL); + g_settings_set_boolean (calendar_settings, "notify-with-tray", TRUE); source = gconf_client_get_list (conf_client, "/apps/evolution/calendar/sources", GCONF_VALUE_STRING, @@ -226,7 +226,7 @@ config_data_get_24_hour_format (void) ensure_inited (); if (locale_supports_12_hour_format ()) { - return g_settings_get_boolean (calendar_client, "use-24hour-format"); + return g_settings_get_boolean (calendar_settings, "use-24hour-format"); } return TRUE; @@ -237,7 +237,7 @@ config_data_get_notify_with_tray (void) { ensure_inited (); - return g_settings_get_boolean (calendar_client, "notify-with-tray"); + return g_settings_get_boolean (calendar_settings, "notify-with-tray"); } /** @@ -286,7 +286,7 @@ config_data_set_last_notification_time (ECalClient *cal, * than the already stored one */ current_t = g_settings_get_int (calendar_settings, "last-notification-time"); if (t > current_t || current_t > now) - g_settings_set_int (calendar_settings "last-notification-time", t); + g_settings_set_int (calendar_settings, "last-notification-time", t); } /** @@ -313,21 +313,21 @@ config_data_get_last_notification_time (ECalClient *cal) if (last_notified && *last_notified && g_time_val_from_iso8601 (last_notified, &tmval)) { - time_t now = time (NULL), val = (time_t) tmval.tv_sec; + time_t now = time (NULL), value = (time_t) tmval.tv_sec; - if (val > now) - val = now; - return val; + if (value > now) + value = now; + return value; } } } value = g_settings_get_int (calendar_settings, "last-notification-time"); now = time (NULL); - if (val > now) - val = now; + if (value > now) + value = now; - return val; + return value; } /** diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 033b1323f9..73bf421a65 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include @@ -1664,22 +1663,28 @@ comp_editor_bind_settings (CompEditor *editor) g_return_if_fail (editor != NULL); action = comp_editor_get_action (editor, "view-categories"); - g_settings_bind (priv->calendar_settings, "editor-show-categories", G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT); + g_settings_bind (editor->priv->calendar_settings, "editor-show-categories", + G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT); action = comp_editor_get_action (editor, "view-role"); - g_settings_bind (priv->calendar_settings, "editor-show-role", G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT); + g_settings_bind (editor->priv->calendar_settings, "editor-show-role", + G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT); action = comp_editor_get_action (editor, "view-rsvp"); - g_settings_bind (priv->calendar_settings, "editor-show-rsvp", G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT); + g_settings_bind (editor->priv->calendar_settings, "editor-show-rsvp", + G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT); action = comp_editor_get_action (editor, "view-status"); - g_settings_bind (priv->calendar_settings, "editor-show-status", G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT); + g_settings_bind (editor->priv->calendar_settings, "editor-show-status", + G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT); action = comp_editor_get_action (editor, "view-time-zone"); - g_settings_bind (priv->calendar_settings, "editor-show-timezone", G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT); + g_settings_bind (editor->priv->calendar_settings, "editor-show-timezone", + G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT); action = comp_editor_get_action (editor, "view-type"); - g_settings_bind (priv->calendar_settings, "editor-show-type", G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT); + g_settings_bind (editor->priv->calendar_settings, "editor-show-type", + G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT); } static gboolean diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 4a7b942ba6..96fce86260 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -1382,7 +1382,7 @@ get_users_timezone (void) } else { GSettings *settings = g_settings_new ("org.gnome.evolution.calendar"); - location = g_settings_get_string (settings, "timezone", NULL); + location = g_settings_get_string (settings, "timezone"); g_object_unref (settings); } -- cgit v1.2.3