diff options
author | Adrien Plazas <kekun.plazas@laposte.net> | 2019-06-19 09:54:32 +0200 |
---|---|---|
committer | Jan-Michael Brummer <jan.brummer@tabos.org> | 2019-06-22 14:48:33 +0000 |
commit | 96ad3e9aa02b81ac90cc745ce7f8938e79b9a6c1 (patch) | |
tree | fee2b5b9cc0e00d7625fb3a87a90fc519b42a0b2 /src/ephy-history-dialog.c | |
parent | 035a8fd3730f08e3bc8857fbf81332e29e9b646a (diff) | |
download | epiphany-96ad3e9aa02b81ac90cc745ce7f8938e79b9a6c1.tar.gz |
history-dialog: Drop explicit comparisons
This makes the code more in line with the coding style.
Diffstat (limited to 'src/ephy-history-dialog.c')
-rw-r--r-- | src/ephy-history-dialog.c | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/src/ephy-history-dialog.c b/src/ephy-history-dialog.c index 4ffeee64c..c71d6097b 100644 --- a/src/ephy-history-dialog.c +++ b/src/ephy-history-dialog.c @@ -99,7 +99,7 @@ clear_listbox (GtkWidget *listbox) children = gtk_container_get_children (GTK_CONTAINER (listbox)); - for (iter = children; iter != NULL; iter = g_list_next (iter)) { + for (iter = children; iter; iter = g_list_next (iter)) { gtk_widget_destroy (GTK_WIDGET (iter->data)); } @@ -114,10 +114,9 @@ on_find_urls_cb (gpointer service, { EphyHistoryDialog *self = EPHY_HISTORY_DIALOG (user_data); - if (success != TRUE) + if (!success) return; - self->urls = (GList *)result_data; clear_listbox (self->listbox); @@ -132,7 +131,7 @@ substrings_filter (EphyHistoryDialog *self) char **tokens, **p; GList *substrings = NULL; - if (self->search_text == NULL) + if (!self->search_text) return NULL; tokens = p = g_strsplit (self->search_text, " ", -1); @@ -155,7 +154,7 @@ remove_pending_sorter_source (EphyHistoryDialog *self, self->sorter_source = 0; } - if (free_urls && self->urls != NULL) { + if (free_urls && self->urls) { g_list_free_full (self->urls, (GDestroyNotify)ephy_history_url_free); self->urls = NULL; } @@ -191,10 +190,10 @@ get_selection (EphyHistoryDialog *self) GList *list = NULL; GList *tmp; - for (tmp = selected_rows; tmp != NULL; tmp = tmp->next) { + for (tmp = selected_rows; tmp; tmp = tmp->next) { EphyHistoryURL *url = get_url_from_row (tmp->data); - if (url == NULL) { + if (!url) { continue; } @@ -212,7 +211,7 @@ on_browse_history_deleted_cb (gpointer service, { EphyHistoryDialog *self = EPHY_HISTORY_DIALOG (user_data); - if (success != TRUE) + if (!success) return; filter_now (self); @@ -306,7 +305,7 @@ add_urls_source (EphyHistoryDialog *self) } g_list_free (children); - if (self->urls == NULL || !self->num_fetch) { + if (!self->urls || !self->num_fetch) { self->sorter_source = 0; gtk_widget_queue_draw (self->listbox); return G_SOURCE_REMOVE; @@ -389,7 +388,7 @@ forget_all (GSimpleAction *action, { EphyHistoryDialog *self = EPHY_HISTORY_DIALOG (user_data); - if (self->confirmation_dialog == NULL) { + if (!self->confirmation_dialog) { GtkWidget **confirmation_dialog; self->confirmation_dialog = confirmation_dialog_construct (self); @@ -545,7 +544,7 @@ on_listbox_row_selected (GtkListBox *box, GtkListBoxRow *row, EphyHistoryDialog *self) { - update_selection_actions (self->action_group, row != NULL); + update_selection_actions (self->action_group, !!row); } static void @@ -559,7 +558,7 @@ on_listbox_row_activated (GtkListBox *box, window = EPHY_WINDOW (get_target_window (self)); url = get_url_from_row (row); - g_assert (url != NULL); + g_assert (url); embed = ephy_shell_new_tab (ephy_shell_get_default (), window, NULL, EPHY_NEW_TAB_JUMP); @@ -616,14 +615,14 @@ set_history_service (EphyHistoryDialog *self, if (history_service == self->history_service) return; - if (self->history_service != NULL) { + if (self->history_service) { g_signal_handlers_disconnect_by_func (self->history_service, on_urls_visited_cb, self); g_clear_object (&self->history_service); } - if (history_service != NULL) { + if (history_service) { self->history_service = g_object_ref (history_service); g_signal_connect_after (self->history_service, "urls-visited", G_CALLBACK (on_urls_visited_cb), @@ -682,7 +681,7 @@ ephy_history_dialog_dispose (GObject *object) g_clear_object (&self->cancellable); } - if (self->history_service != NULL) + if (self->history_service) g_signal_handlers_disconnect_by_func (self->history_service, on_urls_visited_cb, self); @@ -770,7 +769,7 @@ ephy_history_dialog_new (EphyHistoryService *history_service) { EphyHistoryDialog *self; - g_assert (history_service != NULL); + g_assert (history_service); self = g_object_new (EPHY_TYPE_HISTORY_DIALOG, "history-service", history_service, |