diff options
author | Michael Meeks <michael.meeks@novell.com> | 2010-07-08 23:10:59 +0800 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2010-07-08 23:10:59 +0800 |
commit | 36f1f29b9a42c56a619e031b045db5a18f2b1dd7 (patch) | |
tree | d4408d7d298fce695a1c4d900cf48bf83b579ba2 /plugins/groupwise-features | |
parent | 400cd6c143383412fff1c3172abce9e48fef1fb4 (diff) | |
download | gsoc2013-evolution-36f1f29b9a42c56a619e031b045db5a18f2b1dd7.tar gsoc2013-evolution-36f1f29b9a42c56a619e031b045db5a18f2b1dd7.tar.gz gsoc2013-evolution-36f1f29b9a42c56a619e031b045db5a18f2b1dd7.tar.bz2 gsoc2013-evolution-36f1f29b9a42c56a619e031b045db5a18f2b1dd7.tar.lz gsoc2013-evolution-36f1f29b9a42c56a619e031b045db5a18f2b1dd7.tar.xz gsoc2013-evolution-36f1f29b9a42c56a619e031b045db5a18f2b1dd7.tar.zst gsoc2013-evolution-36f1f29b9a42c56a619e031b045db5a18f2b1dd7.zip |
Fix transience problems with ENameSelectorDialogs ...
Diffstat (limited to 'plugins/groupwise-features')
-rw-r--r-- | plugins/groupwise-features/proxy.c | 4 | ||||
-rw-r--r-- | plugins/groupwise-features/share-folder.c | 20 |
2 files changed, 6 insertions, 18 deletions
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 1507e08af0..c539974564 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -884,12 +884,10 @@ address_button_clicked (GtkButton *button, EAccount *account) { proxyDialog *prd; proxyDialogPrivate *priv; - ENameSelectorDialog *name_selector_dialog; prd = g_object_get_data ((GObject *)account, "prd"); priv = prd->priv; - name_selector_dialog = e_name_selector_peek_dialog (priv->proxy_name_selector); - gtk_widget_show (GTK_WIDGET (name_selector_dialog)); + e_name_selector_show_dialog (priv->proxy_name_selector, priv->main); } static void diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index 7470337995..365b7c1fb1 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -536,29 +536,19 @@ notification_clicked(GtkButton *button, ShareFolder *sf) } static void -addressbook_dialog_response (ENameSelectorDialog *name_selector_dialog, gint response, gpointer user_data) -{ - gtk_widget_hide (GTK_WIDGET (name_selector_dialog)); -} - -static void addressbook_entry_changed (GtkWidget *entry, gpointer user_data) { } static void -address_button_clicked_cb (GtkButton *button, gpointer data) +address_button_clicked_cb (GtkButton *button, ShareFolder *sf) { - ShareFolder *sf = data; - ENameSelectorDialog *name_selector_dialog; - - name_selector_dialog = e_name_selector_peek_dialog (sf->name_selector); - gtk_widget_show (GTK_WIDGET (name_selector_dialog)); + e_name_selector_show_dialog (sf->name_selector, sf->window); } - static void -user_selected(GtkTreeSelection *selection, ShareFolder *sf) +static void +user_selected (GtkTreeSelection *selection, ShareFolder *sf) { GtkTreeModel *model; @@ -695,7 +685,7 @@ share_folder_construct (ShareFolder *sf) sf->name_selector = e_name_selector_new (); name_selector_dialog = e_name_selector_peek_dialog (sf->name_selector); g_signal_connect (name_selector_dialog, "response", - G_CALLBACK (addressbook_dialog_response), sf); + G_CALLBACK (gtk_widget_hide), sf); name_selector_model = e_name_selector_peek_model (sf->name_selector); e_name_selector_model_add_section (name_selector_model, "Add User", _("Add User"), NULL); |