diff options
| -rw-r--r-- | modules/mail/em-account-prefs.c | 2 | ||||
| -rw-r--r-- | modules/mail/em-mailer-prefs.c | 8 | ||||
| -rw-r--r-- | modules/mail/em-mailer-prefs.h | 1 | ||||
| -rw-r--r-- | plugins/attachment-reminder/attachment-reminder.c | 2 | ||||
| -rw-r--r-- | plugins/itip-formatter/itip-formatter.c | 13 | ||||
| -rw-r--r-- | plugins/templates/templates.c | 2 |
6 files changed, 17 insertions, 11 deletions
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c index 4bd6c1c968..ddf51d815e 100644 --- a/modules/mail/em-account-prefs.c +++ b/modules/mail/em-account-prefs.c @@ -117,7 +117,6 @@ account_prefs_disable_account_cb (EAccountTreeView *tree_view, EMAccountPrefs *prefs) { EAccountList *account_list; - EMailSession *session; EAccount *account; EMailSession *session; gpointer parent; @@ -326,7 +325,6 @@ account_prefs_delete_account (EAccountManager *manager) EMAccountPrefsPrivate *priv; EAccountTreeView *tree_view; EAccountList *account_list; - EMailSession *session; EAccount *account; EMailSession *session; gboolean has_proxies; diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c index b04c35b088..4dabd0dacf 100644 --- a/modules/mail/em-mailer-prefs.c +++ b/modules/mail/em-mailer-prefs.c @@ -212,7 +212,7 @@ jh_add_cb (GtkWidget *widget, tok = g_strdup_printf ("%s=%s", name, value); g_ptr_array_add (array, tok); g_ptr_array_add (array, NULL); - g_settings_set_strv (prefs->settings, "junk-custom-header", array->pdata); + g_settings_set_strv (prefs->settings, "junk-custom-header", (const gchar * const*) array->pdata); g_ptr_array_free (array, TRUE); g_strfreev (strv); @@ -260,7 +260,7 @@ jh_remove_cb (GtkWidget *widget, g_ptr_array_add (array, NULL); - g_settings_set_strv (prefs->settings, "junk-custom-header", array->pdata); + g_settings_set_strv (prefs->settings, "junk-custom-header", (const gchar * const*) array->pdata); g_strfreev (strv); g_ptr_array_free (array, TRUE); @@ -534,8 +534,8 @@ toggle_button_init (EMMailerPrefs *prefs, g_signal_connect (toggle, "toggled", toggled, prefs); } - if (!g_settings_is_writable (prefs->settings, key) - gtk_widget_set_sensitive ((GtkWidget *) toggle, FALSE); + if (!g_settings_is_writable (prefs->settings, key)) + gtk_widget_set_sensitive (GTK_WIDGET (toggle), FALSE); } static void diff --git a/modules/mail/em-mailer-prefs.h b/modules/mail/em-mailer-prefs.h index eee2d248ac..b8e01b360d 100644 --- a/modules/mail/em-mailer-prefs.h +++ b/modules/mail/em-mailer-prefs.h @@ -55,6 +55,7 @@ struct _EMMailerPrefs { GtkVBox parent_object; GtkBuilder *builder; + GConfClient *gconf; GSettings *settings; /* General tab */ 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 <composer/e-msg-composer.h> -#define KEY_TEMPLATE_PLACEHOLDERS "template-placeholders" +#define CONF_KEY_TEMPLATE_PLACEHOLDERS "template-placeholders" typedef struct _AsyncContext AsyncContext; |