libgnt/libgnt

64c9db40a5a4
Parents 2ada3822ba2e
Children 741097e10968
remove is_buddylist from the irssi window manager

remove the is_buddylist function and usage from the irssi window manager. Fixes LIBGNT-6

Testing Done:
Ran most of the demos, namely multiwin with the irssi window manager to make sure everything was still working.

Bugs closed: LIBGNT-6

Reviewed at https://reviews.imfreedom.org/r/199/
  • +2 -40
    wms/irssi.c
  • --- a/wms/irssi.c Thu Nov 05 20:28:47 2020 -0600
    +++ b/wms/irssi.c Thu Nov 05 20:29:54 2020 -0600
    @@ -115,15 +115,6 @@
    }
    }
    -static gboolean
    -is_buddylist(GntWidget *win)
    -{
    - const char *name = gnt_widget_get_name(win);
    - if (name && strcmp(name, "buddylist") == 0)
    - return TRUE;
    - return FALSE;
    -}
    -
    static void
    remove_border_set_position_size(G_GNUC_UNUSED GntWM *wm, GntWidget *win, int x,
    int y, int w, int h)
    @@ -178,29 +169,6 @@
    GNT_WM_CLASS(gnt_irssi_wm_parent_class)->new_window(wm, win);
    }
    -static void
    -irssi_window_resized(GntWM *wm, GntNode *node)
    -{
    - GntIrssiWM *irssi = NULL;
    - if (!is_buddylist(node->me)) {
    - return;
    - }
    -
    - irssi = GNT_IRSSI_WM(wm);
    - gnt_widget_get_size(node->me, &irssi->buddylistwidth, NULL);
    - draw_line_separators(irssi);
    -}
    -
    -static gboolean
    -irssi_close_window(GntWM *wm, GntWidget *win)
    -{
    - if (is_buddylist(win)) {
    - GntIrssiWM *irssi = GNT_IRSSI_WM(wm);
    - irssi->buddylistwidth = 0;
    - }
    - return FALSE;
    -}
    -
    static gboolean
    update_conv_window_title(GntNode *node)
    {
    @@ -265,11 +233,11 @@
    GntWidget *win;
    ws = gnt_wm_get_current_workspace(wm);
    - if (gnt_ws_is_empty(ws) ||
    - is_buddylist(win = gnt_ws_get_top_widget(ws))) {
    + if (gnt_ws_is_empty(ws)) {
    return FALSE;
    }
    + win = gnt_ws_get_top_widget(ws);
    find_window_position(irssi, win, &hor, &vert);
    switch (GPOINTER_TO_INT(list->data)) {
    @@ -303,10 +271,6 @@
    if (!GNT_IS_WINDOW(widget))
    return;
    - if (is_buddylist(widget)) {
    - return;
    - }
    -
    name = gnt_widget_get_name(widget);
    if (name && strstr(name, "conversation-window")) {
    int cx, cy, cw, ch;
    @@ -348,8 +312,6 @@
    GntWMClass *pclass = GNT_WM_CLASS(klass);
    pclass->new_window = irssi_new_window;
    - pclass->window_resized = irssi_window_resized;
    - pclass->close_window = irssi_close_window;
    pclass->window_update = irssi_update_window;
    pclass->terminal_refresh = irssi_terminal_refresh;