callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address some of the compiler and static analyzers warnings

Browse Source
This commit is contained in:
Milan Crha
2018-05-17 15:12:20 +02:00
parent 563e593451
commit ed7add9842
100 changed files with 667 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/shell/e-shell-backend.c
View File

@ -86,6 +86,7 @@ shell_backend_debug_list_activities (EShellBackend *shell_backend)
guint n_activities;
class = E_SHELL_BACKEND_GET_CLASS (shell_backend);
g_return_if_fail (class != NULL);
n_activities = g_queue_get_length (shell_backend->priv->activities);
@ -190,6 +191,8 @@ shell_backend_constructor (GType type,
/* Install a reference to ourselves in the
* corresponding EShellViewClass structure. */
class = E_SHELL_BACKEND_GET_CLASS (shell_backend);
g_return_val_if_fail (class != NULL, object);
shell_view_class = g_type_class_ref (class->shell_view_type);
shell_view_class->shell_backend = g_object_ref (shell_backend);
shell_backend->priv->shell_view_class = shell_view_class;
@ -289,6 +292,7 @@ shell_backend_get_config_dir (EShellBackend *shell_backend)
EShellBackendClass *class;
class = E_SHELL_BACKEND_GET_CLASS (shell_backend);
g_return_val_if_fail (class != NULL, NULL);
/* Determine the user config directory for this backend. */
if (G_UNLIKELY (shell_backend->priv->config_dir == NULL)) {
@ -309,6 +313,7 @@ shell_backend_get_data_dir (EShellBackend *shell_backend)
EShellBackendClass *class;
class = E_SHELL_BACKEND_GET_CLASS (shell_backend);
g_return_val_if_fail (class != NULL, NULL);
/* Determine the user data directory for this backend. */
if (G_UNLIKELY (shell_backend->priv->data_dir == NULL)) {
@ -416,10 +421,19 @@ gint
e_shell_backend_compare (EShellBackend *shell_backend_a,
EShellBackend *shell_backend_b)
{
gint a = E_SHELL_BACKEND_GET_CLASS (shell_backend_a)->sort_order;
gint b = E_SHELL_BACKEND_GET_CLASS (shell_backend_b)->sort_order;
EShellBackendClass *a_klass, *b_klass;
gint aa, bb;
return (a < b) ? -1 : (a > b);
a_klass = E_SHELL_BACKEND_GET_CLASS (shell_backend_a);
b_klass = E_SHELL_BACKEND_GET_CLASS (shell_backend_b);
g_return_val_if_fail (a_klass != NULL, 0);
g_return_val_if_fail (b_klass != NULL, 0);
aa = a_klass->sort_order;
bb = b_klass->sort_order;
return (aa < bb) ? -1 : (aa > bb) ? 1 : 0;
}
/**
@ -440,6 +454,7 @@ e_shell_backend_get_config_dir (EShellBackend *shell_backend)
g_return_val_if_fail (E_IS_SHELL_BACKEND (shell_backend), NULL);
class = E_SHELL_BACKEND_GET_CLASS (shell_backend);
g_return_val_if_fail (class != NULL, NULL);
g_return_val_if_fail (class->get_config_dir != NULL, NULL);
return class->get_config_dir (shell_backend);
@ -463,6 +478,7 @@ e_shell_backend_get_data_dir (EShellBackend *shell_backend)
g_return_val_if_fail (E_IS_SHELL_BACKEND (shell_backend), NULL);
class = E_SHELL_BACKEND_GET_CLASS (shell_backend);
g_return_val_if_fail (class != NULL, NULL);
g_return_val_if_fail (class->get_data_dir != NULL, NULL);
return class->get_data_dir (shell_backend);
@ -644,6 +660,7 @@ e_shell_backend_start (EShellBackend *shell_backend)
return;
class = E_SHELL_BACKEND_GET_CLASS (shell_backend);
g_return_if_fail (class != NULL);
if (class->start != NULL)
class->start (shell_backend);
@ -693,6 +710,7 @@ e_shell_backend_migrate (EShellBackend *shell_backend,
g_return_val_if_fail (E_IS_SHELL_BACKEND (shell_backend), TRUE);
class = E_SHELL_BACKEND_GET_CLASS (shell_backend);
g_return_val_if_fail (class != NULL, TRUE);
if (class->migrate == NULL)
return TRUE;

2
src/shell/e-shell-content.c
View File

@ -541,6 +541,7 @@ e_shell_content_check_state (EShellContent *shell_content)
g_return_val_if_fail (E_IS_SHELL_CONTENT (shell_content), 0);
shell_content_class = E_SHELL_CONTENT_GET_CLASS (shell_content);
g_return_val_if_fail (shell_content_class != NULL, 0);
g_return_val_if_fail (shell_content_class->check_state != NULL, 0);
return shell_content_class->check_state (shell_content);
@ -564,6 +565,7 @@ e_shell_content_focus_search_results (EShellContent *shell_content)
g_return_if_fail (E_IS_SHELL_CONTENT (shell_content));
shell_content_class = E_SHELL_CONTENT_GET_CLASS (shell_content);
g_return_if_fail (shell_content_class != NULL);
if (shell_content_class->focus_search_results != NULL)
shell_content_class->focus_search_results (shell_content);

1
src/shell/e-shell-sidebar.c
View File

@ -538,6 +538,7 @@ e_shell_sidebar_check_state (EShellSidebar *shell_sidebar)
g_return_val_if_fail (E_IS_SHELL_SIDEBAR (shell_sidebar), 0);
shell_sidebar_class = E_SHELL_SIDEBAR_GET_CLASS (shell_sidebar);
g_return_val_if_fail (shell_sidebar_class != NULL, 0);
g_return_val_if_fail (shell_sidebar_class->check_state != NULL, 0);
return shell_sidebar_class->check_state (shell_sidebar);

17
src/shell/e-shell-switcher.c
View File

@ -124,10 +124,13 @@ shell_switcher_layout_actions (EShellSwitcher *switcher)
btns_per_row--;
}
if (btns_per_row <= 0)
btns_per_row = 1;
/* Assign buttons to rows. */
rows = g_new0 (GList *, num_btns / btns_per_row + 1);
if (!icons_only && num_btns % btns_per_row != 0) {
if (!icons_only && num_btns % btns_per_row != 0 && switcher->priv->proxies) {
rows[0] = g_list_append (rows[0], switcher->priv->proxies->data);
p = switcher->priv->proxies->next;
@ -290,7 +293,7 @@ shell_switcher_get_preferred_width (GtkWidget *widget,
}
static void
shell_switcher_get_preferred_height (GtkWidget *widget,
shell_switcher_get_preferred_height (GtkWidget *switcher_widget,
gint *minimum,
gint *natural)
{
@ -298,11 +301,11 @@ shell_switcher_get_preferred_height (GtkWidget *widget,
GtkWidget *child;
GList *iter;
priv = E_SHELL_SWITCHER_GET_PRIVATE (widget);
priv = E_SHELL_SWITCHER_GET_PRIVATE (switcher_widget);
*minimum = *natural = 0;
child = gtk_bin_get_child (GTK_BIN (widget));
child = gtk_bin_get_child (GTK_BIN (switcher_widget));
if (child != NULL)
gtk_widget_get_preferred_height (child, minimum, natural);
@ -389,7 +392,7 @@ shell_switcher_screen_changed (GtkWidget *widget,
static void
shell_switcher_remove (GtkContainer *container,
GtkWidget *widget)
GtkWidget *remove_widget)
{
EShellSwitcherPrivate *priv;
GList *link;
@ -398,7 +401,7 @@ shell_switcher_remove (GtkContainer *container,
/* Look in the internal widgets first. */
link = g_list_find (priv->proxies, widget);
link = g_list_find (priv->proxies, remove_widget);
if (link != NULL) {
GtkWidget *widget = link->data;
@ -410,7 +413,7 @@ shell_switcher_remove (GtkContainer *container,
/* Chain up to parent's remove() method. */
GTK_CONTAINER_CLASS (e_shell_switcher_parent_class)->remove (
container, widget);
container, remove_widget);
}
static void

23
src/shell/e-shell-view.c
View File

@ -153,6 +153,7 @@ static void
shell_view_init_view_collection (EShellViewClass *class)
{
EShellBackend *shell_backend;
EShellBackendClass *backend_class;
const gchar *base_directory;
const gchar *name;
gchar *system_directory;
@ -160,7 +161,11 @@ shell_view_init_view_collection (EShellViewClass *class)
shell_backend = class->shell_backend;
g_return_if_fail (E_IS_SHELL_BACKEND (shell_backend));
name = E_SHELL_BACKEND_GET_CLASS (shell_backend)->name;
backend_class = E_SHELL_BACKEND_GET_CLASS (shell_backend);
g_return_if_fail (backend_class != NULL);
name = backend_class->name;
base_directory = EVOLUTION_GALVIEWSDIR;
system_directory = g_build_filename (base_directory, name, NULL);
@ -598,6 +603,7 @@ shell_view_constructed (GObject *object)
shell_view = E_SHELL_VIEW (object);
shell_view_class = E_SHELL_VIEW_GET_CLASS (shell_view);
g_return_if_fail (shell_view_class != NULL);
shell_backend = e_shell_view_get_shell_backend (shell_view);
shell = e_shell_backend_get_shell (shell_backend);
@ -653,6 +659,8 @@ shell_view_construct_searchbar (EShellView *shell_view)
shell_content = e_shell_view_get_shell_content (shell_view);
shell_view_class = E_SHELL_VIEW_GET_CLASS (shell_view);
g_return_val_if_fail (shell_view_class != NULL, NULL);
widget = shell_view_class->new_shell_searchbar (shell_view);
e_shell_content_set_searchbar (shell_content, widget);
gtk_widget_show (widget);
@ -690,6 +698,8 @@ shell_view_toggled (EShellView *shell_view)
gboolean view_is_active;
shell_view_class = E_SHELL_VIEW_GET_CLASS (shell_view);
g_return_if_fail (shell_view_class != NULL);
shell_window = e_shell_view_get_shell_window (shell_view);
ui_manager = e_shell_window_get_ui_manager (shell_window);
view_is_active = e_shell_view_is_active (shell_view);
@ -1210,8 +1220,12 @@ e_shell_view_set_title (EShellView *shell_view,
{
g_return_if_fail (E_IS_SHELL_VIEW (shell_view));
if (title == NULL)
title = E_SHELL_VIEW_GET_CLASS (shell_view)->label;
if (!title) {
EShellViewClass *klass = E_SHELL_VIEW_GET_CLASS (shell_view);
g_return_if_fail (klass != NULL);
title = klass->label;
}
if (g_strcmp0 (shell_view->priv->title, title) == 0)
return;
@ -1290,6 +1304,7 @@ e_shell_view_new_view_instance (EShellView *shell_view,
g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL);
class = E_SHELL_VIEW_GET_CLASS (shell_view);
g_return_val_if_fail (class != NULL, NULL);
view_collection = class->view_collection;
@ -1473,6 +1488,7 @@ e_shell_view_get_search_name (EShellView *shell_view)
g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL);
class = E_SHELL_VIEW_GET_CLASS (shell_view);
g_return_val_if_fail (class != NULL, NULL);
g_return_val_if_fail (class->get_search_name != NULL, NULL);
return class->get_search_name (shell_view);
@ -1605,6 +1621,7 @@ e_shell_view_get_shell_backend (EShellView *shell_view)
g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL);
class = E_SHELL_VIEW_GET_CLASS (shell_view);
g_return_val_if_fail (class != NULL, NULL);
g_return_val_if_fail (class->shell_backend != NULL, NULL);
return class->shell_backend;

1
src/shell/e-shell-window.c
View File

@ -1304,6 +1304,7 @@ e_shell_window_get_shell_view (EShellWindow *shell_window,
return shell_view;
class = E_SHELL_WINDOW_GET_CLASS (shell_window);
g_return_val_if_fail (class != NULL, NULL);
g_return_val_if_fail (class->create_shell_view != NULL, NULL);
shell_view = class->create_shell_view (shell_window, view_name);