aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/addressbook/e-book-shell-view-actions.c25
-rw-r--r--modules/backup-restore/evolution-backup-tool.c7
-rw-r--r--modules/calendar/e-cal-shell-sidebar.c6
-rw-r--r--modules/calendar/e-cal-shell-view-actions.c3
-rw-r--r--modules/calendar/e-cal-shell-view-private.c35
-rw-r--r--modules/calendar/e-memo-shell-sidebar.c6
-rw-r--r--modules/calendar/e-task-shell-sidebar.c6
-rw-r--r--modules/itip-formatter/itip-view.c161
-rw-r--r--modules/mail/e-mail-shell-view-actions.c24
-rw-r--r--modules/offline-alert/evolution-offline-alert.c7
-rw-r--r--modules/settings/e-settings-deprecated.c12
11 files changed, 146 insertions, 146 deletions
diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c
index d2fe86e0ca..125f3c36d6 100644
--- a/modules/addressbook/e-book-shell-view-actions.c
+++ b/modules/addressbook/e-book-shell-view-actions.c
@@ -212,17 +212,22 @@ address_book_refresh_done_cb (GObject *source_object,
client = E_CLIENT (source_object);
- if (!e_client_refresh_finish (client, result, &error)) {
- ESource *source = e_client_get_source (client);
+ e_client_refresh_finish (client, result, &error);
- if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) &&
- !g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED))
- g_warning (
- "%s: Failed to refresh '%s', %s",
- G_STRFUNC, e_source_get_display_name (source),
- error ? error->message : "Unknown error");
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ g_error_free (error);
+
+ } else if (error != NULL) {
+ ESource *source;
+
+ source = e_client_get_source (client);
- g_clear_error (&error);
+ g_warning (
+ "%s: Failed to refresh '%s', %s",
+ G_STRFUNC, e_source_get_display_name (source),
+ error ? error->message : "Unknown error");
+
+ g_error_free (error);
}
}
@@ -267,7 +272,7 @@ contact_editor_contact_modified_cb (EABEditor *editor,
EContactMap *map;
const gchar *contact_uid;
- if (error) {
+ if (error != NULL) {
g_warning ("Error modifying contact: %s", error->message);
return;
}
diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c
index 93a56bd672..4b8ad9f8cb 100644
--- a/modules/backup-restore/evolution-backup-tool.c
+++ b/modules/backup-restore/evolution-backup-tool.c
@@ -242,7 +242,8 @@ replace_in_file (const gchar *filename,
}
g_free (content);
- } else if (error) {
+
+ } else if (error != NULL) {
g_warning (
"%s: Cannot read file content, error: %s",
G_STRFUNC, error->message);
@@ -296,7 +297,7 @@ write_dir_file (void)
g_file_set_contents (filename->str, content->str, content->len, &error);
- if (error) {
+ if (error != NULL) {
g_warning ("Failed to write file '%s': %s\n", filename->str, error->message);
g_error_free (error);
}
@@ -389,7 +390,7 @@ extract_backup_data (const gchar *filename,
key_file = g_key_file_new ();
g_key_file_load_from_file (key_file, filename, G_KEY_FILE_NONE, &error);
- if (error) {
+ if (error != NULL) {
g_warning ("Failed to read '%s': %s", filename, error->message);
g_error_free (error);
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index 295b6de60d..ff8bc955e9 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -208,16 +208,10 @@ cal_shell_sidebar_handle_connect_error (EActivity *activity,
const GError *error)
{
EAlertSink *alert_sink;
- gboolean cancelled = FALSE;
gboolean offline_error;
alert_sink = e_activity_get_alert_sink (activity);
- cancelled |= g_error_matches (
- error, G_IO_ERROR, G_IO_ERROR_CANCELLED);
- cancelled |= g_error_matches (
- error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED);
-
offline_error = g_error_matches (
error, E_CLIENT_ERROR, E_CLIENT_ERROR_REPOSITORY_OFFLINE);
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index aa890c26ef..7d3315b020 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -1000,8 +1000,7 @@ action_event_occurrence_movable_cb (GtkAction *action,
g_object_unref (recurring_component);
icalcomp = e_cal_component_get_icalcomponent (exception_component);
- if (e_cal_client_create_object_sync (client, icalcomp, &uid, NULL, NULL))
- g_free (uid);
+ e_cal_client_create_object_sync (client, icalcomp, NULL, NULL, NULL);
g_object_unref (exception_component);
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index 6b93828f65..46f89e8b4d 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -1015,8 +1015,11 @@ add_timezone_to_cal_cb (icalparameter *param,
if (!tzid || !*tzid)
return;
- if (e_cal_client_get_timezone_sync (ftd->source_client, tzid, &tz, NULL, NULL) && tz)
- e_cal_client_add_timezone_sync (ftd->dest_client, tz, NULL, NULL);
+ e_cal_client_get_timezone_sync (
+ ftd->source_client, tzid, &tz, NULL, NULL);
+ if (tz != NULL)
+ e_cal_client_add_timezone_sync (
+ ftd->dest_client, tz, NULL, NULL);
}
void
@@ -1367,9 +1370,9 @@ cal_searching_got_instance_cb (ECalComponent *comp,
if (dt.tzid && dt.value) {
icaltimezone *zone = NULL;
- if (!e_cal_client_get_timezone_sync (gid->client, dt.tzid, &zone, gid->cancellable, NULL)) {
- zone = NULL;
- }
+
+ e_cal_client_get_timezone_sync (
+ gid->client, dt.tzid, &zone, gid->cancellable, NULL);
if (g_cancellable_is_cancelled (gid->cancellable))
return FALSE;
@@ -1405,14 +1408,17 @@ cal_search_get_object_list_cb (GObject *source,
g_return_if_fail (result != NULL);
g_return_if_fail (cal_shell_view != NULL);
- if (!e_cal_client_get_object_list_finish (client, result, &icalcomps, &error) || !icalcomps) {
- if (g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED) ||
- g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
- g_clear_error (&error);
- return;
- }
+ e_cal_client_get_object_list_finish (
+ client, result, &icalcomps, &error);
+
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ g_warn_if_fail (icalcomps == NULL);
+ g_error_free (error);
+
+ } else if (error != NULL) {
+ g_warn_if_fail (icalcomps == NULL);
+ g_error_free (error);
- g_clear_error (&error);
cal_shell_view->priv->search_pending_count--;
if (!cal_shell_view->priv->search_pending_count) {
cal_shell_view->priv->search_hit_cache =
@@ -1421,6 +1427,7 @@ cal_search_get_object_list_cb (GObject *source,
cal_time_t_ptr_compare);
cal_iterate_searching (cal_shell_view);
}
+
} else {
GSList *iter;
GCancellable *cancellable;
@@ -1478,7 +1485,9 @@ cal_searching_check_candidates (ECalShellView *cal_shell_view)
if (!e_calendar_view_get_selected_time_range (calendar_view, &value, NULL))
return FALSE;
- if (cal_shell_view->priv->search_direction > 0 && (view_type == GNOME_CAL_WEEK_VIEW || view_type == GNOME_CAL_MONTH_VIEW))
+ if (cal_shell_view->priv->search_direction > 0 &&
+ (view_type == GNOME_CAL_WEEK_VIEW ||
+ view_type == GNOME_CAL_MONTH_VIEW))
value = time_add_day (value, 1);
for (iter = cal_shell_view->priv->search_hit_cache; iter; iter = iter->next) {
diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c
index 1654e1096c..eeab5f53b5 100644
--- a/modules/calendar/e-memo-shell-sidebar.c
+++ b/modules/calendar/e-memo-shell-sidebar.c
@@ -206,16 +206,10 @@ memo_shell_sidebar_handle_connect_error (EActivity *activity,
const GError *error)
{
EAlertSink *alert_sink;
- gboolean cancelled = FALSE;
gboolean offline_error;
alert_sink = e_activity_get_alert_sink (activity);
- cancelled |= g_error_matches (
- error, G_IO_ERROR, G_IO_ERROR_CANCELLED);
- cancelled |= g_error_matches (
- error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED);
-
offline_error = g_error_matches (
error, E_CLIENT_ERROR, E_CLIENT_ERROR_REPOSITORY_OFFLINE);
diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c
index 8dc20d4b84..f1837f82cf 100644
--- a/modules/calendar/e-task-shell-sidebar.c
+++ b/modules/calendar/e-task-shell-sidebar.c
@@ -206,16 +206,10 @@ task_shell_sidebar_handle_connect_error (EActivity *activity,
const GError *error)
{
EAlertSink *alert_sink;
- gboolean cancelled = FALSE;
gboolean offline_error;
alert_sink = e_activity_get_alert_sink (activity);
- cancelled |= g_error_matches (
- error, G_IO_ERROR, G_IO_ERROR_CANCELLED);
- cancelled |= g_error_matches (
- error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED);
-
offline_error = g_error_matches (
error, E_CLIENT_ERROR, E_CLIENT_ERROR_REPOSITORY_OFFLINE);
diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c
index 1e4a549a82..45f0b1d393 100644
--- a/modules/itip-formatter/itip-view.c
+++ b/modules/itip-formatter/itip-view.c
@@ -3501,7 +3501,7 @@ adjust_item (EMailPartItip *pitip,
static gboolean
same_attendee_status (EMailPartItip *pitip,
- ECalComponent *received_comp)
+ ECalComponent *received_comp)
{
ECalComponent *saved_comp;
GSList *received_attendees = NULL, *saved_attendees = NULL, *riter, *siter;
@@ -3527,7 +3527,7 @@ same_attendee_status (EMailPartItip *pitip,
}
/* no need to create a hash table for quicker searches, there might
- be one attendee in the received component only */
+ * be one attendee in the received component only */
for (siter = saved_attendees; siter; siter = g_slist_next (siter)) {
const ECalComponentAttendee *sattendee = siter->data;
@@ -3614,8 +3614,7 @@ itip_view_cal_opened_cb (GObject *source_object,
((client == NULL) && (error != NULL)));
/* Ignore cancellations. */
- if (g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED) ||
- g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
g_error_free (error);
goto exit;
@@ -3941,11 +3940,9 @@ get_object_without_rid_ready_cb (GObject *source_object,
icalcomponent *icalcomp = NULL;
GError *error = NULL;
- if (!e_cal_client_get_object_finish (cal_client, result, &icalcomp, &error))
- icalcomp = NULL;
+ e_cal_client_get_object_finish (cal_client, result, &icalcomp, &error);
- if (g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED) ||
- g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) ||
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) ||
g_cancellable_is_cancelled (fd->cancellable)) {
g_clear_error (&error);
find_cal_update_ui (fd, cal_client);
@@ -3992,11 +3989,9 @@ get_object_with_rid_ready_cb (GObject *source_object,
icalcomponent *icalcomp = NULL;
GError *error = NULL;
- if (!e_cal_client_get_object_finish (cal_client, result, &icalcomp, &error))
- icalcomp = NULL;
+ e_cal_client_get_object_finish (cal_client, result, &icalcomp, &error);
- if (g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED) ||
- g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) ||
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) ||
g_cancellable_is_cancelled (fd->cancellable)) {
g_clear_error (&error);
find_cal_update_ui (fd, cal_client);
@@ -4048,8 +4043,8 @@ get_object_list_ready_cb (GObject *source_object,
GSList *objects = NULL;
GError *error = NULL;
- if (!e_cal_client_get_object_list_finish (cal_client, result, &objects, &error))
- objects = NULL;
+ e_cal_client_get_object_list_finish (
+ cal_client, result, &objects, &error);
if (g_cancellable_is_cancelled (fd->cancellable)) {
g_clear_error (&error);
@@ -4057,21 +4052,24 @@ get_object_list_ready_cb (GObject *source_object,
return;
}
- if (error) {
- if (g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED) ||
- g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
- g_error_free (error);
- decrease_find_data (fd);
- return;
- }
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ g_error_free (error);
+ decrease_find_data (fd);
+ return;
+ } else if (error != NULL) {
g_error_free (error);
+
} else {
- g_hash_table_insert (fd->conflicts, cal_client, GINT_TO_POINTER (g_slist_length (objects)));
+ g_hash_table_insert (
+ fd->conflicts, cal_client,
+ GINT_TO_POINTER (g_slist_length (objects)));
e_cal_client_free_icalcomp_slist (objects);
}
- e_cal_client_get_object (cal_client, fd->uid, fd->rid, fd->cancellable, get_object_with_rid_ready_cb, fd);
+ e_cal_client_get_object (
+ cal_client, fd->uid, fd->rid, fd->cancellable,
+ get_object_with_rid_ready_cb, fd);
}
static void
@@ -4098,8 +4096,7 @@ find_cal_opened_cb (GObject *source_object,
((client == NULL) && (error != NULL)));
/* Ignore cancellations. */
- if (g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED) ||
- g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
decrease_find_data (fd);
g_error_free (error);
return;
@@ -4111,7 +4108,7 @@ find_cal_opened_cb (GObject *source_object,
return;
}
- if (error) {
+ if (error != NULL) {
/* FIXME Do we really want to warn here? If we fail
* to find the item, this won't be cleared but the
* selector might be shown */
@@ -4643,17 +4640,18 @@ receive_objects_ready_cb (GObject *ecalclient,
e_cal_client_receive_objects_finish (client, result, &error);
- if (error != NULL) {
- if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) &&
- !g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED)) {
- update_item_progress_info (pitip, view, NULL);
- pitip->update_item_error_info_id =
- itip_view_add_lower_info_item_printf (
- view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
- _("Unable to send item to calendar '%s'. %s"),
- e_source_get_display_name (source),
- error->message);
- }
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ g_error_free (error);
+ return;
+
+ } else if (error != NULL) {
+ update_item_progress_info (pitip, view, NULL);
+ pitip->update_item_error_info_id =
+ itip_view_add_lower_info_item_printf (
+ view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
+ _("Unable to send item to calendar '%s'. %s"),
+ e_source_get_display_name (source),
+ error->message);
g_error_free (error);
return;
}
@@ -4999,13 +4997,10 @@ modify_object_cb (GObject *ecalclient,
e_cal_client_modify_object_finish (client, result, &error);
- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) ||
- g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED)) {
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
g_error_free (error);
- return;
- }
- if (error != NULL) {
+ } else if (error != NULL) {
update_item_progress_info (pitip, view, NULL);
pitip->update_item_error_info_id =
itip_view_add_lower_info_item_printf (
@@ -5013,6 +5008,7 @@ modify_object_cb (GObject *ecalclient,
_("Unable to update attendee. %s"),
error->message);
g_error_free (error);
+
} else {
update_item_progress_info (pitip, view, NULL);
itip_view_add_lower_info_item (
@@ -5187,24 +5183,25 @@ update_attendee_status_get_object_without_rid_cb (GObject *ecalclient,
icalcomponent *icalcomp = NULL;
GError *error = NULL;
- if (!e_cal_client_get_object_finish (client, result, &icalcomp, &error)) {
- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) ||
- g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED)) {
- g_clear_error (&error);
- return;
- }
+ e_cal_client_get_object_finish (client, result, &icalcomp, &error);
- g_clear_error (&error);
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ g_error_free (error);
+
+ } else if (error != NULL) {
+ g_error_free (error);
update_item_progress_info (pitip, view, NULL);
- pitip->update_item_error_info_id = itip_view_add_lower_info_item (
- view,
- ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
- _("Attendee status can not be updated because the item no longer exists"));
- return;
- }
+ pitip->update_item_error_info_id =
+ itip_view_add_lower_info_item (
+ view,
+ ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
+ _("Attendee status can not be updated "
+ "because the item no longer exists"));
- update_attendee_status_icalcomp (pitip, view, icalcomp);
+ } else {
+ update_attendee_status_icalcomp (pitip, view, icalcomp);
+ }
}
static void
@@ -5218,45 +5215,43 @@ update_attendee_status_get_object_with_rid_cb (GObject *ecalclient,
icalcomponent *icalcomp = NULL;
GError *error = NULL;
- if (!e_cal_client_get_object_finish (client, result, &icalcomp, &error)) {
+ e_cal_client_get_object_finish (client, result, &icalcomp, &error);
+
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ g_error_free (error);
+
+ } else if (error != NULL) {
const gchar *uid;
gchar *rid;
- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) ||
- g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED)) {
- g_clear_error (&error);
- return;
- }
-
- g_clear_error (&error);
+ g_error_free (error);
e_cal_component_get_uid (pitip->comp, &uid);
rid = e_cal_component_get_recurid_as_string (pitip->comp);
- if (!rid || !*rid) {
- g_free (rid);
-
+ if (rid == NULL || *rid == '\0') {
update_item_progress_info (pitip, view, NULL);
- pitip->update_item_error_info_id = itip_view_add_lower_info_item (
- view,
- ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
- _("Attendee status can not be updated because the item no longer exists"));
- return;
+ pitip->update_item_error_info_id =
+ itip_view_add_lower_info_item (
+ view,
+ ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
+ _("Attendee status can not be updated "
+ "because the item no longer exists"));
+ } else {
+ e_cal_client_get_object (
+ pitip->current_client,
+ uid,
+ NULL,
+ pitip->cancellable,
+ update_attendee_status_get_object_without_rid_cb,
+ view);
}
- e_cal_client_get_object (
- pitip->current_client,
- uid,
- NULL,
- pitip->cancellable,
- update_attendee_status_get_object_without_rid_cb,
- view);
-
g_free (rid);
- return;
- }
- update_attendee_status_icalcomp (pitip, view, icalcomp);
+ } else {
+ update_attendee_status_icalcomp (pitip, view, icalcomp);
+ }
}
static void
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index e451574ecf..a0191effa3 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -112,21 +112,25 @@ account_refresh_folder_info_received_cb (GObject *source,
GError *error = NULL;
store = CAMEL_STORE (source);
- activity = user_data;
+ activity = E_ACTIVITY (user_data);
+
info = camel_store_get_folder_info_finish (store, result, &error);
- if (info) {
- /* provider takes care of notifications of new/removed folders,
- * thus it's enough to free the returned list */
+
+ if (info != NULL) {
+ /* Provider takes care of notifications of new/removed
+ * folders, thus it's enough to free the returned list. */
camel_store_free_folder_info (store, info);
}
- if (error && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
- g_message ("%s: Failed: %s", G_STRFUNC, error->message);
+ if (e_activity_handle_cancellation (activity, error)) {
+ g_error_free (error);
- g_clear_error (&error);
+ } else if (error != NULL) {
+ g_warning ("%s: %s", G_STRFUNC, error->message);
+ g_error_free (error);
+ }
- if (activity)
- g_object_unref (activity);
+ g_clear_object (&activity);
}
static void
@@ -458,7 +462,7 @@ mark_all_read_thread (GSimpleAsyncResult *simple,
g_object_unref (folder);
}
- if (error)
+ if (error != NULL)
g_simple_async_result_take_error (simple, error);
}
diff --git a/modules/offline-alert/evolution-offline-alert.c b/modules/offline-alert/evolution-offline-alert.c
index 767f41a757..d6cb0463bc 100644
--- a/modules/offline-alert/evolution-offline-alert.c
+++ b/modules/offline-alert/evolution-offline-alert.c
@@ -108,6 +108,7 @@ offline_alert_window_added_cb (GtkApplication *application,
{
EShell *shell = E_SHELL (application);
GtkAction *action;
+ const gchar *alert_id;
if (!E_IS_SHELL_WINDOW (window))
return;
@@ -137,7 +138,11 @@ offline_alert_window_added_cb (GtkApplication *application,
action = E_SHELL_WINDOW_ACTION_WORK_ONLINE (window);
- extension->alert = e_alert_new (e_shell_get_network_available (shell) ? "offline-alert:offline" : "offline-alert:no-network", NULL);
+ if (e_shell_get_network_available (shell))
+ alert_id = "offline-alert:offline";
+ else
+ alert_id = "offline-alert:no-network";
+ extension->alert = e_alert_new (alert_id, NULL);
e_alert_add_action (extension->alert, action, GTK_RESPONSE_NONE);
g_object_add_weak_pointer (
diff --git a/modules/settings/e-settings-deprecated.c b/modules/settings/e-settings-deprecated.c
index 1249288d92..902e6bf42f 100644
--- a/modules/settings/e-settings-deprecated.c
+++ b/modules/settings/e-settings-deprecated.c
@@ -99,8 +99,8 @@ settings_deprecated_header_start_element (GMarkupParseContext *context,
static void
e_settings_deprecated_set_int_with_change_test (GSettings *settings,
- const gchar *key,
- gint value)
+ const gchar *key,
+ gint value)
{
if (g_settings_get_int (settings, key) != value)
g_settings_set_int (settings, key, value);
@@ -108,8 +108,8 @@ e_settings_deprecated_set_int_with_change_test (GSettings *settings,
static void
e_settings_deprecated_set_string_with_change_test (GSettings *settings,
- const gchar *key,
- const gchar *value)
+ const gchar *key,
+ const gchar *value)
{
gchar *stored = g_settings_get_string (settings, key);
@@ -121,8 +121,8 @@ e_settings_deprecated_set_string_with_change_test (GSettings *settings,
static void
e_settings_deprecated_set_strv_with_change_test (GSettings *settings,
- const gchar *key,
- const gchar * const *value)
+ const gchar *key,
+ const gchar * const *value)
{
gchar **stored = g_settings_get_strv (settings, key);
gboolean changed;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 15:41:04 +0800