diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-08-11 03:58:39 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-08-11 04:13:08 +0800 |
| commit | 15376b6657c77d4f701367c4f14bed653201fe26 (patch) | |
| tree | acb7081ff7f41653e8684738bf1677ec896721fb /modules/addressbook | |
| parent | 90e4a46478e5c39b51bfd36bc252c10e9cd60865 (diff) | |
| download | gsoc2013-evolution-15376b6657c77d4f701367c4f14bed653201fe26.tar gsoc2013-evolution-15376b6657c77d4f701367c4f14bed653201fe26.tar.gz gsoc2013-evolution-15376b6657c77d4f701367c4f14bed653201fe26.tar.bz2 gsoc2013-evolution-15376b6657c77d4f701367c4f14bed653201fe26.tar.lz gsoc2013-evolution-15376b6657c77d4f701367c4f14bed653201fe26.tar.xz gsoc2013-evolution-15376b6657c77d4f701367c4f14bed653201fe26.tar.zst gsoc2013-evolution-15376b6657c77d4f701367c4f14bed653201fe26.zip | |
EConfig: Broadcast abort/commit events by way of signals.
Remove the clumsy abortfunc and commitfunc callback arguments from
e_config_add_items().
Diffstat (limited to 'modules/addressbook')
| -rw-r--r-- | modules/addressbook/addressbook-config.c | 9 | ||||
| -rw-r--r-- | modules/addressbook/autocompletion-config.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c index 3686fa60bd..a41651459a 100644 --- a/modules/addressbook/addressbook-config.c +++ b/modules/addressbook/addressbook-config.c @@ -1076,9 +1076,9 @@ static EConfigItem eabc_new_items[] = { }; static void -eabc_commit (EConfig *ec, GSList *items, gpointer data) +eabc_commit (EConfig *ec, + AddressbookSourceDialog *sdialog) { - AddressbookSourceDialog *sdialog = data; xmlNodePtr xml; #if d(!)0 gchar *txt; @@ -1262,8 +1262,11 @@ addressbook_config_edit_source (GtkWidget *parent, ESource *source) items = g_slist_prepend (items, &eabc_items[i]); } - e_config_add_items ((EConfig *) ec, items, eabc_commit, NULL, eabc_free, sdialog); + e_config_add_items ((EConfig *) ec, items, eabc_free, sdialog); e_config_add_page_check ((EConfig *) ec, NULL, eabc_check_complete, sdialog); + g_signal_connect ( + ec, "commit", + G_CALLBACK (eabc_commit), sdialog); target = eab_config_target_new_source (ec, sdialog->source); e_config_set_target ((EConfig *) ec, (EConfigTarget *) target); diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c index c78b958022..d4124193a6 100644 --- a/modules/addressbook/autocompletion-config.c +++ b/modules/addressbook/autocompletion-config.c @@ -265,7 +265,7 @@ autocompletion_config_new (EPreferencesWindow *window) l = NULL; for (ii = 0; ii < G_N_ELEMENTS (acc_items); ii++) l = g_slist_prepend (l, &acc_items[ii]); - e_config_add_items ((EConfig *) eab, l, NULL, NULL, acc_free, shell); + e_config_add_items ((EConfig *) eab, l, acc_free, shell); gconf = gconf_client_get_default (); |