From 9a8fa88b6a3fe12409ff0358bed45187c9c743a5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 4 Feb 2010 12:55:42 +0100 Subject: Move some ESource-plugin common code to e-plugin-util.h/.c --- plugins/default-source/Makefile.am | 1 + plugins/default-source/default-source.c | 67 +++------------------------------ 2 files changed, 7 insertions(+), 61 deletions(-) (limited to 'plugins/default-source') diff --git a/plugins/default-source/Makefile.am b/plugins/default-source/Makefile.am index 6f4a9043d1..8afa604ec4 100644 --- a/plugins/default-source/Makefile.am +++ b/plugins/default-source/Makefile.am @@ -17,6 +17,7 @@ liborg_gnome_default_source_la_SOURCES = default-source.c liborg_gnome_default_source_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_default_source_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_CALENDAR_LIBS) \ $(EVOLUTION_ADDRESSBOOK_LIBS) \ $(GNOME_PLATFORM_LIBS) diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c index 1d8a7e0299..db8423aec6 100644 --- a/plugins/default-source/default-source.c +++ b/plugins/default-source/default-source.c @@ -22,12 +22,12 @@ #include #include +#include #include #include #include #include #include -#include #include #include @@ -62,71 +62,30 @@ commit_default_book (EPlugin *epl, EConfigTarget *target) } -static void -default_source_changed (GtkWidget *check_box, ESource *source) -{ - - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_box))) - e_source_set_property (source, "default", "true"); - else - e_source_set_property (source, "default", NULL); -} - -static void -autocomplete_book_changed (GtkWidget *check_box, ESource *source) -{ - - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_box))) - e_source_set_property (source, "completion", "true"); - else - e_source_set_property (source, "completion", NULL); -} - GtkWidget * org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data) { - GtkWidget *widget; - ESource *source; EABConfigTargetSource *book_target; if (data->old) return data->old; - widget = gtk_check_button_new_with_mnemonic (_("Mark as _default address book")); + book_target = (EABConfigTargetSource *) data->target; - source = book_target->source; - if (e_source_get_property (source, "default")) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - else - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); - gtk_container_add (GTK_CONTAINER (data->parent), widget); - - g_signal_connect (GTK_TOGGLE_BUTTON (widget), "toggled", G_CALLBACK (default_source_changed), source); - gtk_widget_show (widget); - return widget; + return e_plugin_util_add_check (data->parent, _("Mark as _default address book"), book_target->source, "default", "true", NULL); } GtkWidget * org_gnome_autocomplete_book (EPlugin *epl, EConfigHookItemFactoryData *data) { - GtkWidget *widget; - ESource *source; EABConfigTargetSource *book_target; if (data->old) return data->old; - widget = gtk_check_button_new_with_mnemonic (_("A_utocomplete with this address book")); book_target = (EABConfigTargetSource *) data->target; - source = book_target->source; - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), e_source_get_property (source, "completion") && g_str_equal (e_source_get_property (source, "completion"), "true")); - gtk_container_add (GTK_CONTAINER (data->parent), widget); - - g_signal_connect (GTK_TOGGLE_BUTTON (widget), "toggled", G_CALLBACK (autocomplete_book_changed), source); - gtk_widget_show (widget); - - return widget; + return e_plugin_util_add_check (data->parent, _("A_utocomplete with this address book"), book_target->source, "completion", "true", NULL); } static const gchar * @@ -149,26 +108,12 @@ GtkWidget *org_gnome_default_cal (EPlugin *epl, EConfigHookItemFactoryData *data GtkWidget * org_gnome_default_cal (EPlugin *epl, EConfigHookItemFactoryData *data) { - GtkWidget *widget; - ESource *source; ECalConfigTargetSource *cal_target; - gint i; if (data->old) return data->old; - cal_target = (ECalConfigTargetSource *) data->target; - source = cal_target->source; - widget = gtk_check_button_new_with_mnemonic (get_calendar_option_caption (cal_target->source_type)); - if (e_source_get_property (source, "default")) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - else - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); - - i = ((GtkTable *)data->parent)->nrows; - gtk_table_attach((GtkTable *)data->parent, widget, 1, 2, i, i+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); + cal_target = (ECalConfigTargetSource *) data->target; - g_signal_connect (GTK_TOGGLE_BUTTON (widget), "toggled", G_CALLBACK (default_source_changed), source); - gtk_widget_show (widget); - return widget; + return e_plugin_util_add_check (data->parent, get_calendar_option_caption (cal_target->source_type), cal_target->source, "default", "true", NULL); } -- cgit v1.2.3