pidgin/pidgin

Replace GtkStack in PidginDisplayWindow with AdwViewStack

19 months ago, Gary Kramlich
43f994f7f9f2
Parents 9f6a2c90800e
Children 4289b30044ed
Replace GtkStack in PidginDisplayWindow with AdwViewStack

Testing Done:
Opened a few conversations, selected a bunch of things.

Bugs closed: PIDGIN-17659

Reviewed at https://reviews.imfreedom.org/r/1791/
2 files changed, 16 insertions(+), 11 deletions(-)
  • +13 -8
    pidgin/pidginconversationwindow.c
  • +3 -3
    pidgin/resources/Conversations/window.ui
    • --- a/pidgin/pidginconversationwindow.c Sun Sep 18 22:34:12 2022 -0500
    +++ b/pidgin/pidginconversationwindow.c Sun Sep 18 22:36:13 2022 -0500
    @@ -22,6 +22,8 @@
    #include <glib/gi18n-lib.h>
    +#include <adwaita.h>
    +
    #include "pidginconversationwindow.h"
    #include "gtkconv.h"
    @@ -305,7 +307,8 @@
    PIDGIN_DISPLAY_WINDOW_COLUMN_OBJECT, &obj,
    -1);
    - gtk_stack_set_visible_child_name(GTK_STACK(window->stack), name);
    + adw_view_stack_set_visible_child_name(ADW_VIEW_STACK(window->stack),
    + name);
    g_free(name);
    changed = TRUE;
    @@ -338,7 +341,8 @@
    }
    if(!changed) {
    - gtk_stack_set_visible_child_name(GTK_STACK(window->stack), "__conversations__");
    + adw_view_stack_set_visible_child_name(ADW_VIEW_STACK(window->stack),
    + "__conversations__");
    }
    }
    @@ -572,7 +576,8 @@
    gtk_widget_unparent(gtkconv->tab_cont);
    }
    - gtk_stack_add_named(GTK_STACK(window->stack), gtkconv->tab_cont, markup);
    + adw_view_stack_add_named(ADW_VIEW_STACK(window->stack),
    + gtkconv->tab_cont, markup);
    gtk_widget_show(gtkconv->tab_cont);
    if(GTK_IS_WIDGET(parent)) {
    @@ -632,8 +637,8 @@
    const gchar *name = NULL;
    name = purple_conversation_get_name(conversation);
    - child = gtk_stack_get_child_by_name(GTK_STACK(window->stack),
    - name);
    + child = adw_view_stack_get_child_by_name(ADW_VIEW_STACK(window->stack),
    + name);
    if(GTK_IS_WIDGET(child)) {
    gtk_widget_unparent(child);
    }
    @@ -656,7 +661,7 @@
    g_return_val_if_fail(PIDGIN_IS_DISPLAY_WINDOW(window), 0);
    - model = gtk_stack_get_pages(GTK_STACK(window->stack));
    + model = adw_view_stack_get_pages(ADW_VIEW_STACK(window->stack));
    count = g_list_model_get_n_items(G_LIST_MODEL(model));
    @@ -694,7 +699,7 @@
    g_return_if_fail(PURPLE_IS_CONVERSATION(conversation));
    name = purple_conversation_get_name(conversation);
    - gtk_stack_set_visible_child_name(GTK_STACK(window->stack), name);
    + adw_view_stack_set_visible_child_name(ADW_VIEW_STACK(window->stack), name);
    }
    void
    @@ -811,7 +816,7 @@
    g_return_val_if_fail(PURPLE_IS_CONVERSATION(conversation), FALSE);
    name = purple_conversation_get_name(conversation);
    - visible = gtk_stack_get_visible_child_name(GTK_STACK(window->stack));
    + visible = adw_view_stack_get_visible_child_name(ADW_VIEW_STACK(window->stack));
    return purple_strequal(name, visible);
    }
    --- a/pidgin/resources/Conversations/window.ui Sun Sep 18 22:34:12 2022 -0500
    +++ b/pidgin/resources/Conversations/window.ui Sun Sep 18 22:36:13 2022 -0500
    @@ -105,9 +105,9 @@
    </object>
    </child>
    <child>
    - <object class="GtkStack" id="stack">
    + <object class="AdwViewStack" id="stack">
    <child>
    - <object class="GtkStackPage">
    + <object class="AdwViewStackPage">
    <property name="name">__notifications__</property>
    <property name="child">
    <object class="GtkScrolledWindow">
    @@ -121,7 +121,7 @@
    </object>
    </child>
    <child>
    - <object class="GtkStackPage">
    + <object class="AdwViewStackPage">
    <property name="name">__conversations__</property>
    <property name="child">
    <object class="AdwStatusPage">