pidgin/pidgin

Remove PidginBuddyList->timeout.

2021-06-08, Elliott Sales de Andrade
1c25eac61c19
Parents 2405744f8193
Children bf7c5e88e5e7
Remove PidginBuddyList->timeout.

It's claimed to be for tooltips, but the only code that references it removes the timeout source, and nothing sets one up.

Testing Done:
Compile only.

Reviewed at https://reviews.imfreedom.org/r/733/
2 files changed, 0 insertions(+), 28 deletions(-)
  • +0 -26
    pidgin/gtkblist.c
  • +0 -2
    pidgin/gtkblist.h
    • --- a/pidgin/gtkblist.c Mon Jun 07 23:10:41 2021 -0500
    +++ b/pidgin/gtkblist.c Tue Jun 08 01:45:21 2021 -0500
    @@ -1920,14 +1920,6 @@
    #ifdef _WIN32
    pidgin_blist_tooltip_destroy();
    -
    - /* Unhook the tooltip-timeout since we don't want a tooltip
    - * to appear and obscure the context menu we are about to show
    - This is a workaround for GTK+ bug 107320. */
    - if (gtkblist->timeout) {
    - g_source_remove(gtkblist->timeout);
    - gtkblist->timeout = 0;
    - }
    #endif
    /* Now display the menu */
    @@ -2150,15 +2142,6 @@
    GdkDragContext *drag_context, gpointer user_data)
    {
    pidgin_blist_tooltip_destroy();
    -
    -
    - /* Unhook the tooltip-timeout since we don't want a tooltip
    - * to appear and obscure the dragging operation.
    - * This is a workaround for GTK+ bug 107320. */
    - if (gtkblist->timeout) {
    - g_source_remove(gtkblist->timeout);
    - gtkblist->timeout = 0;
    - }
    }
    #endif
    @@ -3242,11 +3225,6 @@
    static gboolean pidgin_blist_leave_cb (GtkWidget *w, GdkEventCrossing *e, gpointer n)
    {
    - if (gtkblist->timeout) {
    - g_source_remove(gtkblist->timeout);
    - gtkblist->timeout = 0;
    - }
    -
    if (gtkblist->drag_timeout) {
    g_source_remove(gtkblist->drag_timeout);
    gtkblist->drag_timeout = 0;
    @@ -6714,10 +6692,6 @@
    g_source_remove(gtkblist->refresh_timer);
    gtkblist->refresh_timer = 0;
    }
    - if (gtkblist->timeout) {
    - g_source_remove(gtkblist->timeout);
    - gtkblist->timeout = 0;
    - }
    if (gtkblist->drag_timeout) {
    g_source_remove(gtkblist->drag_timeout);
    gtkblist->drag_timeout = 0;
    --- a/pidgin/gtkblist.h Mon Jun 07 23:10:41 2021 -0500
    +++ b/pidgin/gtkblist.h Tue Jun 08 01:45:21 2021 -0500
    @@ -60,7 +60,6 @@
    * @menutray: The menu tray widget.
    * @menutrayicon: The menu tray icon.
    * @refresh_timer: The timer for refreshing every 30 seconds
    - * @timeout: The timeout for the tooltip.
    * @drag_timeout: The timeout for expanding contacts on drags
    * @drag_rect: This is the bounding rectangle of the cell we're
    * currently hovering over. This is used for drag'n'drop.
    @@ -103,7 +102,6 @@
    guint refresh_timer;
    - guint timeout;
    guint drag_timeout;
    GdkRectangle drag_rect;
    GdkRectangle contact_rect;