From 925b03c373fc79ccd56ab718a0ab97ab92c06115 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 9 Nov 2011 12:35:00 +0100 Subject: Make it fully build --- plugins/attachment-reminder/attachment-reminder.c | 2 +- plugins/itip-formatter/itip-formatter.c | 13 ++++++++++--- plugins/templates/templates.c | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) (limited to 'plugins') diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index f2d7382314..988d3aa290 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -220,7 +220,7 @@ commit_changes (UIData *ui) { GtkTreeModel *model = NULL; GVariantBuilder b; - GVariant v; + GVariant *v; GtkTreeIter iter; gboolean valid; diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index d9ec622f6e..c6852b7baf 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -2949,9 +2949,12 @@ static void delete_toggled_cb (GtkWidget *widget, gpointer data) { + GSettings *settings; EMConfigTargetPrefs *target = data; - g_settings_set_boolean (target->settings, CONF_KEY_DELETE, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))); + settings = g_settings_new ("org.gnome.evolution.eplugin.itip"); + g_settings_set_boolean (settings, CONF_KEY_DELETE, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))); + g_object_unref (settings); } static void @@ -3022,6 +3025,7 @@ itip_formatter_page_factory (EPlugin *ep, GtkWidget *scrolledwin; ESourceList *source_list; gchar *str; + GSettings *settings; /* Create a new notebook page */ page = gtk_vbox_new (FALSE, 0); @@ -3050,12 +3054,15 @@ itip_formatter_page_factory (EPlugin *ep, gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0); /* Delete message after acting */ - /* FIXME Need a schema for this */ + settings = g_settings_new ("org.gnome.evolution.eplugin.itip"); + check = gtk_check_button_new_with_mnemonic (_("_Delete message after acting")); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), g_settings_get_boolean (target->settings, CONF_KEY_DELETE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), g_settings_get_boolean (settings, CONF_KEY_DELETE)); g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (delete_toggled_cb), target); gtk_box_pack_start (GTK_BOX (inner_vbox), check, FALSE, FALSE, 0); + g_object_unref (settings); + /* "Conflict searching" */ frame = gtk_vbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (page), frame, TRUE, TRUE, 24); diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index b3e112edb5..4010eb7d5a 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -47,7 +47,7 @@ #include -#define KEY_TEMPLATE_PLACEHOLDERS "template-placeholders" +#define CONF_KEY_TEMPLATE_PLACEHOLDERS "template-placeholders" typedef struct _AsyncContext AsyncContext; -- cgit v1.2.3