* "system-$COMPONENT" but since the data directories are already
* split out by component, we'll continue to use the old "system"
* directories for these particular data sources. */
- if (builtin_source != NULL && e_source_equal (source, builtin_source))
+ if (e_source_equal (source, builtin_source))
uid = "system";
switch (path_type) {
g_warn_if_reached ();
}
- if (builtin_source)
- g_object_unref (builtin_source);
+ g_object_unref (builtin_source);
return filename;
}
g_return_val_if_fail (E_IS_BOOK_CLIENT (client), FALSE);
source = e_source_registry_ref_builtin_address_book (registry);
- g_return_val_if_fail (source != NULL, FALSE);
*client = e_book_client_new (source, &local_error);
g_object_unref (source);
* "system-$COMPONENT" but since the data directories are already
* split out by component, we'll continue to use the old "system"
* directories for these particular data sources. */
- if (builtin_source != NULL && e_source_equal (source, builtin_source))
+ if (e_source_equal (source, builtin_source))
uid = "system";
filename = g_build_filename (user_data_dir, component_type, uid, NULL);
e_cal_backend_set_cache_dir (backend, filename);
g_free (filename);
- if (builtin_source)
- g_object_unref (builtin_source);
+ g_object_unref (builtin_source);
}
/* Class initialization function for the file backend */
uid = E_SOURCE_BUILTIN_ADDRESS_BOOK_UID;
source = e_source_registry_ref_source (registry, uid);
+ g_return_val_if_fail (source != NULL, NULL);
return source;
}
source = e_source_registry_ref_source (registry, uid);
g_free (uid);
- /* The built-in source is present in normal EDS installations. */
+ /* The built-in source is always present. */
if (source == NULL)
source = e_source_registry_ref_builtin_address_book (registry);
+ g_return_val_if_fail (E_IS_SOURCE (source), NULL);
+
return source;
}
uid = E_SOURCE_BUILTIN_CALENDAR_UID;
source = e_source_registry_ref_source (registry, uid);
+ g_return_val_if_fail (source != NULL, NULL);
return source;
}
source = e_source_registry_ref_source (registry, uid);
g_free (uid);
- /* The built-in source is present in normal EDS installations. */
+ /* The built-in source is always present. */
if (source == NULL)
source = e_source_registry_ref_builtin_calendar (registry);
+ g_return_val_if_fail (E_IS_SOURCE (source), NULL);
+
return source;
}
main_initialize ();
source = e_source_registry_ref_builtin_address_book (registry);
- g_return_val_if_fail (source != NULL, NULL);
book_client = e_book_client_new (source, &error);
g_object_unref (source);