Skip to content
Snippets Groups Projects
Commit 19c32de8 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #37161: gnome: fix account config dialog's parent window

It's the account list dialog, not the main window. This was breaking
modal behaviour on certain window managers.
parent a5c35c56
Branches
Tags
No related merge requests found
...@@ -1511,13 +1511,13 @@ void update_account_from_dialog(GtkWidget *dialog, const gchar *accountID) ...@@ -1511,13 +1511,13 @@ void update_account_from_dialog(GtkWidget *dialog, const gchar *accountID)
} }
GtkWidget * GtkWidget *
show_account_window(const gchar *accountID, SFLPhoneClient *client, gboolean is_new) show_account_window(const gchar *accountID, GtkDialog *parent, SFLPhoneClient *client, gboolean is_new)
{ {
// First we reset // First we reset
reset(); reset();
GtkWidget *dialog = gtk_dialog_new_with_buttons(_("Account settings"), GtkWidget *dialog = gtk_dialog_new_with_buttons(_("Account settings"),
GTK_WINDOW(client->win), GTK_WINDOW(parent),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL, GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL, GTK_RESPONSE_CANCEL,
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
* @return The dialog with the pertinent account information * @return The dialog with the pertinent account information
*/ */
GtkWidget * GtkWidget *
show_account_window(const gchar *accountID, SFLPhoneClient *client, gboolean is_new); show_account_window(const gchar *accountID, GtkDialog *parent, SFLPhoneClient *client, gboolean is_new);
/* /*
* @param dialog The dialog the account will be update from * @param dialog The dialog the account will be update from
......
...@@ -160,7 +160,7 @@ static void account_store_fill(); ...@@ -160,7 +160,7 @@ static void account_store_fill();
static void static void
run_account_dialog(const gchar *selected_accountID, SFLPhoneClient *client, gboolean is_new) run_account_dialog(const gchar *selected_accountID, SFLPhoneClient *client, gboolean is_new)
{ {
GtkWidget *dialog = show_account_window(selected_accountID, client, is_new); GtkWidget *dialog = show_account_window(selected_accountID, account_list_dialog, client, is_new);
if (dialog) { if (dialog) {
update_account_from_dialog(dialog, selected_accountID); update_account_from_dialog(dialog, selected_accountID);
account_store_fill(); account_store_fill();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment