diff -r 82415d67612f -r dd2d26e6c6f9 pidgin/pidginapplication.c --- a/pidgin/pidginapplication.c Fri Nov 22 00:58:21 2024 -0600 +++ b/pidgin/pidginapplication.c Fri Nov 22 01:26:06 2024 -0600 @@ -105,11 +105,11 @@ * Since: 3.0 */ static GtkWidget * -pidgin_application_get_account_manager(void) { +pidgin_application_get_account_manager(PidginApplication *application) { static GtkWidget *manager = NULL; if(!PIDGIN_IS_ACCOUNT_MANAGER(manager)) { - manager = pidgin_account_manager_new(); + manager = pidgin_account_manager_new(GTK_APPLICATION(application)); g_object_add_weak_pointer(G_OBJECT(manager), (gpointer)&manager); } @@ -303,7 +303,7 @@ static GtkWidget *about = NULL; if(!GTK_IS_WIDGET(about)) { - about = pidgin_about_dialog_new(); + about = pidgin_about_dialog_new(GTK_APPLICATION(application)); g_object_add_weak_pointer(G_OBJECT(about), (gpointer)&about); } @@ -315,7 +315,7 @@ G_GNUC_UNUSED GVariant *parameter, gpointer data) { PidginApplication *application = data; - GtkWidget *manager = pidgin_application_get_account_manager(); + GtkWidget *manager = pidgin_application_get_account_manager(application); pidgin_account_manager_show_overview(PIDGIN_ACCOUNT_MANAGER(manager)); @@ -415,7 +415,9 @@ account = purple_account_manager_find_by_id(manager, id); if(PURPLE_IS_ACCOUNT(account)) { - GtkWidget *account_manager = pidgin_application_get_account_manager(); + GtkWidget *account_manager = NULL; + + account_manager = pidgin_application_get_account_manager(application); pidgin_account_manager_edit_account(PIDGIN_ACCOUNT_MANAGER(account_manager), account); @@ -467,7 +469,7 @@ static GtkWidget *dialog = NULL; if(!GTK_IS_WIDGET(dialog)) { - dialog = pidgin_channel_join_dialog_new(); + dialog = pidgin_channel_join_dialog_new(GTK_APPLICATION(application)); g_object_add_weak_pointer(G_OBJECT(dialog), (gpointer)&dialog); } @@ -495,7 +497,10 @@ static GtkWidget *preferences = NULL; if(!GTK_IS_WIDGET(preferences)) { - preferences = g_object_new(PIDGIN_TYPE_PREFS_WINDOW, NULL); + preferences = g_object_new( + PIDGIN_TYPE_PREFS_WINDOW, + "application", application, + NULL); g_object_add_weak_pointer(G_OBJECT(preferences), (gpointer)&preferences); } @@ -851,11 +856,11 @@ } static void -pidgin_application_activate(G_GNUC_UNUSED GApplication *application) { +pidgin_application_activate(GApplication *application) { static GtkWidget *default_window = NULL; if(!GTK_IS_WIDGET(default_window)) { - default_window = pidgin_display_window_new(); + default_window = pidgin_display_window_new(GTK_APPLICATION(application)); g_object_add_weak_pointer(G_OBJECT(default_window), (gpointer)&default_window); }