pidgin/pidgin

Stop reaching into the PidginBuddyList struct from other files

2022-01-13, Gary Kramlich
d2a2cc448987
Parents 53eea15447bd
Children 227e14fae1c2
Stop reaching into the PidginBuddyList struct from other files

Testing Done:
Compiled

Reviewed at https://reviews.imfreedom.org/r/1220/
2 files changed, 4 insertions(+), 13 deletions(-)
  • +0 -10
    pidgin/gtkaccount.c
  • +4 -3
    pidgin/pidginapplication.c
    • --- a/pidgin/gtkaccount.c Thu Jan 13 22:34:37 2022 -0600
    +++ b/pidgin/gtkaccount.c Thu Jan 13 22:37:16 2022 -0600
    @@ -1302,16 +1302,6 @@
    return;
    }
    - if(purple_account_manager_get_all(manager) == NULL) {
    - /* We're adding our first account. Be polite and show the buddy
    - * list.
    - */
    - PidginBuddyList *blist = pidgin_blist_get_default_gtk_blist();
    - if(blist != NULL && blist->window != NULL) {
    - gtk_window_present(GTK_WINDOW(blist->window));
    - }
    - }
    -
    account = purple_account_new(username, dialog->protocol_id);
    new_acct = TRUE;
    }
    --- a/pidgin/pidginapplication.c Thu Jan 13 22:34:37 2022 -0600
    +++ b/pidgin/pidginapplication.c Thu Jan 13 22:37:16 2022 -0600
    @@ -43,6 +43,7 @@
    #include "gtksavedstatuses.h"
    #include "gtkxfer.h"
    #include "pidginabout.h"
    +#include "pidginconversationwindow.h"
    #include "pidgincore.h"
    #include "pidgindebug.h"
    #include "pidginmooddialog.h"
    @@ -663,10 +664,10 @@
    static void
    pidgin_application_activate(GApplication *application) {
    - PidginBuddyList *blist = pidgin_blist_get_default_gtk_blist();
    + GtkWidget *convwin = pidgin_conversation_window_get_default();
    - if(blist != NULL && blist->window != NULL) {
    - gtk_window_present(GTK_WINDOW(blist->window));
    + if(GTK_IS_WINDOW(convwin)) {
    + gtk_window_present(GTK_WINDOW(convwin));
    }
    }