pidgin/pidgin

Remove the gtkblist visibility manager stuff as it won't be used in the future

2021-12-30, Gary Kramlich
83adf4630025
Parents 32a7796a2a36
Children a51ff7ecf053
Remove the gtkblist visibility manager stuff as it won't be used in the future

Testing Done:
Ran and made sure nothing broke.

Reviewed at https://reviews.imfreedom.org/r/1202/
3 files changed, 6 insertions(+), 50 deletions(-)
  • +2 -0
    ChangeLog.API
  • +4 -30
    pidgin/gtkblist.c
  • +0 -20
    pidgin/gtkblist.h
    • --- a/ChangeLog.API Thu Dec 30 20:36:44 2021 -0600
    +++ b/ChangeLog.API Thu Dec 30 23:00:39 2021 -0600
    @@ -806,6 +806,8 @@
    * pidgin_blist_theme_set_unread_message_text_info
    * pidgin_blist_tooltip_destroy
    * pidgin_blist_update_account_error_state
    + * pidgin_blist_visibility_manager_add
    + * pidgin_blist_visibility_manager_remove
    * PidginBlistLayout
    * PidginBuddyList.connection_errors
    * PidginButtonStyle
    --- a/pidgin/gtkblist.c Thu Dec 30 20:36:44 2021 -0600
    +++ b/pidgin/gtkblist.c Thu Dec 30 23:00:39 2021 -0600
    @@ -145,7 +145,6 @@
    (gdk_window_get_state(gtk_widget_get_window(GTK_WIDGET(x))) & \
    GDK_WINDOW_STATE_MAXIMIZED)
    -static guint visibility_manager_count = 0;
    static GdkVisibilityState gtk_blist_visibility = GDK_VISIBILITY_UNOBSCURED;
    static gboolean gtk_blist_focused = FALSE;
    static gboolean editing_blist = FALSE;
    @@ -231,10 +230,7 @@
    static gboolean gtk_blist_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data)
    {
    - if(visibility_manager_count)
    - purple_blist_set_visible(FALSE);
    - else
    - purple_core_quit();
    + purple_core_quit();
    /* we handle everything, event should not propagate further */
    return TRUE;
    @@ -4759,7 +4755,6 @@
    /* OK... let's show this bad boy. */
    pidgin_blist_refresh(list);
    gtk_widget_show_all(GTK_WIDGET(gtkblist->vbox));
    - gtk_widget_realize(GTK_WIDGET(gtkblist->window));
    purple_blist_set_visible(purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/list_visible"));
    /* start the refresh timer */
    @@ -5442,13 +5437,9 @@
    if (show) {
    gtk_widget_show(gtkblist->window);
    } else {
    - if(visibility_manager_count) {
    - gtk_widget_hide(gtkblist->window);
    - } else {
    - if (!gtk_widget_get_visible(gtkblist->window))
    - gtk_widget_show(gtkblist->window);
    - gtk_window_iconify(GTK_WINDOW(gtkblist->window));
    - }
    + if (!gtk_widget_get_visible(gtkblist->window))
    + gtk_widget_show(gtkblist->window);
    + gtk_window_iconify(GTK_WINDOW(gtkblist->window));
    }
    }
    @@ -5873,23 +5864,6 @@
    }
    }
    -void
    -pidgin_blist_visibility_manager_add()
    -{
    - visibility_manager_count++;
    - purple_debug_info("gtkblist", "added visibility manager: %d\n", visibility_manager_count);
    -}
    -
    -void
    -pidgin_blist_visibility_manager_remove()
    -{
    - if (visibility_manager_count)
    - visibility_manager_count--;
    - if (!visibility_manager_count)
    - purple_blist_set_visible(TRUE);
    - purple_debug_info("gtkblist", "removed visibility manager: %d\n", visibility_manager_count);
    -}
    -
    void pidgin_blist_add_alert(GtkWidget *widget)
    {
    gtk_container_add(GTK_CONTAINER(gtkblist->scrollbook), widget);
    --- a/pidgin/gtkblist.h Thu Dec 30 20:36:44 2021 -0600
    +++ b/pidgin/gtkblist.h Thu Dec 30 23:00:39 2021 -0600
    @@ -219,26 +219,6 @@
    void pidgin_blist_toggle_visibility(void);
    /**
    - * pidgin_blist_visibility_manager_add:
    - *
    - * Increases the reference count of visibility managers. Callers should
    - * call the complementary remove function when no longer managing
    - * visibility.
    - *
    - * A visibility manager is something that provides some method for
    - * showing the buddy list after it is hidden (e.g. docklet plugin).
    - */
    -void pidgin_blist_visibility_manager_add(void);
    -
    -/**
    - * pidgin_blist_visibility_manager_remove:
    - *
    - * Decreases the reference count of visibility managers. If the count
    - * drops below zero, the buddy list is shown.
    - */
    -void pidgin_blist_visibility_manager_remove(void);
    -
    -/**
    * pidgin_blist_add_alert:
    * @widget: The widget to add
    *