aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog9
-rw-r--r--addressbook/gui/component/autocompletion-config.c36
2 files changed, 22 insertions, 23 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 439f299237..c6d15f22fa 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,12 @@
+2004-04-07 Jeffrey Stedfast <fejj@ximian.com>
+
+ * gui/component/autocompletion-config.c
+ (source_selection_changed): Sync the changes here rather than
+ setting 'changed' on the config control (since that no longer
+ exists).
+ (autocompletion_config_control_new): Don't connect to an apply
+ signal, no such signal.
+
2004-04-06 Chris Toshok <toshok@ximian.com>
* util/e-destination.[ch]: old name, new trimmed down
diff --git a/addressbook/gui/component/autocompletion-config.c b/addressbook/gui/component/autocompletion-config.c
index db9904ec7a..b61ec72725 100644
--- a/addressbook/gui/component/autocompletion-config.c
+++ b/addressbook/gui/component/autocompletion-config.c
@@ -51,25 +51,6 @@ static void
source_selection_changed (ESourceSelector *selector,
AutocompletionConfig *ac)
{
- evolution_config_control_changed (ac->config_control);
-}
-
-static void
-config_control_destroy_notify (void *data,
- GObject *where_the_config_control_was)
-{
- AutocompletionConfig *ac = (AutocompletionConfig *) data;
-
- g_object_unref (ac->source_list);
-
- g_free (ac);
-}
-
-
-static void
-config_control_apply_callback (EvolutionConfigControl *config_control,
- AutocompletionConfig *ac)
-{
GSList *selection;
GSList *l;
GSList *groups;
@@ -87,7 +68,7 @@ config_control_apply_callback (EvolutionConfigControl *config_control,
/* then we loop over the selector's selection, setting the
property on those sources */
- selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (ac->control_widget));
+ selection = e_source_selector_get_selection (selector);
for (l = selection; l; l = l->next) {
e_source_set_property (E_SOURCE (l->data), "completion", "true");
}
@@ -97,6 +78,17 @@ config_control_apply_callback (EvolutionConfigControl *config_control,
}
static void
+config_control_destroy_notify (void *data,
+ GObject *where_the_config_control_was)
+{
+ AutocompletionConfig *ac = (AutocompletionConfig *) data;
+
+ g_object_unref (ac->source_list);
+
+ g_free (ac);
+}
+
+static void
initialize_selection (AutocompletionConfig *ac)
{
GSList *groups;
@@ -149,9 +141,7 @@ autocompletion_config_control_new (void)
g_signal_connect (ac->control_widget, "selection_changed",
G_CALLBACK (source_selection_changed), ac);
- g_signal_connect (ac->config_control, "apply",
- G_CALLBACK (config_control_apply_callback), ac);
-
+
g_object_weak_ref (G_OBJECT (ac->config_control), config_control_destroy_notify, ac);
CORBA_exception_free (&ev);