diff options
| author | Michael Catanzaro <mcatanzaro@gnome.org> | 2019-12-20 09:00:47 -0600 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2019-12-23 20:57:13 +0000 |
| commit | 763eca11a9641be70fb77bd91e4dd171111cec9d (patch) | |
| tree | ecb9eb226bd14aa327e11a914c139276165931d4 /src/ephy-action-bar-start.c | |
| parent | c6582bbca79c72676d446a8f9e5d7d184fcb0a43 (diff) | |
| download | epiphany-763eca11a9641be70fb77bd91e4dd171111cec9d.tar.gz | |
Use g_clear_handler() when possible
Just a cleanup commit. Also, improve weirdness in a couple related
places. E.g. EphyLocationEntry was using the wrong type for its timeout
ID.
Diffstat (limited to 'src/ephy-action-bar-start.c')
| -rw-r--r-- | src/ephy-action-bar-start.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/ephy-action-bar-start.c b/src/ephy-action-bar-start.c index 328bbfec0..eb0821e09 100644 --- a/src/ephy-action-bar-start.c +++ b/src/ephy-action-bar-start.c @@ -356,10 +356,7 @@ navigation_button_release_event_cb (GtkButton *button, EphyNavigationHistoryDirection direction; const gchar *action_name; - if (action_bar_start->navigation_buttons_menu_timeout > 0) { - g_source_remove (action_bar_start->navigation_buttons_menu_timeout); - action_bar_start->navigation_buttons_menu_timeout = 0; - } + g_clear_handle_id (&action_bar_start->navigation_buttons_menu_timeout, g_source_remove); action_name = gtk_actionable_get_action_name (GTK_ACTIONABLE (button)); action_group = gtk_widget_get_action_group (gtk_widget_get_ancestor (GTK_WIDGET (action_bar_start), EPHY_TYPE_WINDOW), "toolbar"); @@ -439,10 +436,7 @@ navigation_leave_notify_event_cb (GtkButton *button, { EphyActionBarStart *action_bar_start = EPHY_ACTION_BAR_START (user_data); - if (action_bar_start->navigation_buttons_menu_timeout > 0) { - g_source_remove (action_bar_start->navigation_buttons_menu_timeout); - action_bar_start->navigation_buttons_menu_timeout = 0; - } + g_clear_handle_id (&action_bar_start->navigation_buttons_menu_timeout, g_source_remove); return GDK_EVENT_PROPAGATE; } @@ -467,10 +461,7 @@ ephy_action_bar_start_dispose (GObject *object) { EphyActionBarStart *action_bar_start = EPHY_ACTION_BAR_START (object); - if (action_bar_start->navigation_buttons_menu_timeout > 0) { - g_source_remove (action_bar_start->navigation_buttons_menu_timeout); - action_bar_start->navigation_buttons_menu_timeout = 0; - } + g_clear_handle_id (&action_bar_start->navigation_buttons_menu_timeout, g_source_remove); G_OBJECT_CLASS (ephy_action_bar_start_parent_class)->dispose (object); } |