pidgin/pidgin

Remove some remaining remnants of the old infopane widget

2021-06-17, Gary Kramlich
c365ae7720ac
Parents 15f30be0fec9
Children f4023e6ebd5d
Remove some remaining remnants of the old infopane widget

Testing Done:
Ran locally with `G_DEBUG=fatal-warnings` to verify the warnings this was producing were fixed.

Reviewed at https://reviews.imfreedom.org/r/752/
2 files changed, 5 insertions(+), 8 deletions(-)
  • +5 -5
    pidgin/gtkconv.c
  • +0 -3
    pidgin/gtkconv.h
    • --- a/pidgin/gtkconv.c Tue Jun 15 00:29:01 2021 -0500
    +++ b/pidgin/gtkconv.c Thu Jun 17 20:12:48 2021 -0500
    @@ -3031,7 +3031,7 @@
    static GtkWidget *
    setup_common_pane(PidginConversation *gtkconv)
    {
    - GtkWidget *vbox, *input, *infopane;
    + GtkWidget *vbox, *input;
    PurpleConversation *conv = gtkconv->active_conv;
    gboolean chat = PURPLE_IS_CHAT_CONVERSATION(conv);
    @@ -3040,9 +3040,9 @@
    gtk_widget_show(vbox);
    /* Setup the info pane */
    - infopane = pidgin_info_pane_new(conv);
    - gtk_box_pack_start(GTK_BOX(vbox), infopane, FALSE, FALSE, 0);
    - gtk_widget_show(infopane);
    + gtkconv->infopane = pidgin_info_pane_new(conv);
    + gtk_box_pack_start(GTK_BOX(vbox), gtkconv->infopane, FALSE, FALSE, 0);
    + gtk_widget_show(gtkconv->infopane);
    /* Setup the history widget */
    gtkconv->history_sw = talkatu_scrolled_window_new(NULL, NULL);
    @@ -5221,7 +5221,7 @@
    } else {
    page_num = 0;
    to_right = pidgin_conv_xy_to_right_infopane(dest_win, e->x_root, e->y_root);
    - tab = pidgin_conv_window_get_gtkconv_at_index(dest_win, page_num)->infopane_hbox;
    + tab = pidgin_conv_window_get_gtkconv_at_index(dest_win, page_num)->infopane;
    }
    if (gtk_notebook_get_tab_pos(dest_notebook) == GTK_POS_TOP ||
    --- a/pidgin/gtkconv.h Tue Jun 15 00:29:01 2021 -0500
    +++ b/pidgin/gtkconv.h Thu Jun 17 20:12:48 2021 -0500
    @@ -124,10 +124,7 @@
    } u;
    time_t newday;
    - GtkWidget *infopane_hbox;
    GtkWidget *infopane;
    - GtkListStore *infopane_model;
    - GtkTreeIter infopane_iter;
    /* Used when attaching a PidginConversation to a PurpleConversation
    * with message history */