From 2e60b6a4a21105bb4a1e2badd1be51b3e684d165 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 22 Nov 2011 17:53:07 -0500 Subject: Tweak GSettings schemas. - Don't use the term "eplugin" for modules. - Use the term "plugin" instead of "eplugin" for plugins. - Split SpamAssassin settings into a separate schema. --- plugins/attachment-reminder/attachment-reminder.c | 4 ++-- plugins/bbdb/bbdb.h | 2 +- plugins/external-editor/external-editor.c | 10 +++++----- plugins/face/face.c | 4 ++-- plugins/itip-formatter/itip-formatter.c | 6 +++--- plugins/mail-notification/mail-notification.c | 10 +++++----- plugins/prefer-plain/prefer-plain.c | 2 +- plugins/templates/templates.c | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) (limited to 'plugins') diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index 988d3aa290..9f2837d923 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -151,7 +151,7 @@ check_for_attachment_clues (gchar *msg) gboolean ret_val = FALSE; guint msg_length; - settings = g_settings_new ("org.gnome.evolution.eplugin.attachment-reminder"); + settings = g_settings_new ("org.gnome.evolution.plugin.attachment-reminder"); /* Get the list from GSettings */ clue_list = g_settings_get_strv (settings, CONF_KEY_ATTACH_REMINDER_CLUES); @@ -452,7 +452,7 @@ e_plugin_lib_get_configure_widget (EPlugin *plugin) gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_remove); gtk_widget_set_can_default (clue_remove, TRUE); - ui->settings = g_settings_new ("org.gnome.evolution.eplugin.attachment-reminder"); + ui->settings = g_settings_new ("org.gnome.evolution.plugin.attachment-reminder"); ui->treeview = clue_treeview; diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h index 3bd8cce880..9104e0896b 100644 --- a/plugins/bbdb/bbdb.h +++ b/plugins/bbdb/bbdb.h @@ -22,7 +22,7 @@ #define __BBDB_H__ /* Where to store the config values */ -#define CONF_SCHEMA "org.gnome.evolution.eplugin.autocontacts" +#define CONF_SCHEMA "org.gnome.evolution.plugin.autocontacts" #define CONF_KEY_ENABLE "enable" #define CONF_KEY_ENABLE_GAIM "auto-sync-gaim" #define CONF_KEY_WHICH_ADDRESSBOOK "addressbook-source" diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index d2d74797b8..7d67faa5b6 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -81,7 +81,7 @@ ee_editor_command_changed (GtkWidget *textbox) d(printf ("\n\aeditor is : [%s] \n\a", editor)); /* GSettings access for every key-press. Sucky ? */ - settings = g_settings_new ("org.gnome.evolution.eplugin.external-editor"); + settings = g_settings_new ("org.gnome.evolution.plugin.external-editor"); g_settings_set_string (settings, "command", editor); g_object_unref (settings); } @@ -95,7 +95,7 @@ ee_editor_immediate_launch_changed (GtkWidget *checkbox) immediately = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)); d(printf ("\n\aimmediate launch is : [%d] \n\a", immediately)); - settings = g_settings_new ("org.gnome.evolution.eplugin.external-editor"); + settings = g_settings_new ("org.gnome.evolution.plugin.external-editor"); g_settings_set_boolean (settings, "launch-on-key-press", immediately); g_object_unref (settings); } @@ -113,7 +113,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) textbox = gtk_entry_new (); label = gtk_label_new (_("Command to be executed to launch the editor: ")); help = gtk_label_new (_("For Emacs use \"xemacs\"\nFor VI use \"gvim -f\"")); - settings = g_settings_new ("org.gnome.evolution.eplugin.external-editor"); + settings = g_settings_new ("org.gnome.evolution.plugin.external-editor"); editor = g_settings_get_string (settings, "command"); if (editor) { @@ -282,7 +282,7 @@ async_external_editor (EMsgComposer *composer) return; } - settings = g_settings_new ("org.gnome.evolution.eplugin.external-editor"); + settings = g_settings_new ("org.gnome.evolution.plugin.external-editor"); editor_cmd = g_settings_get_string (settings, "command"); if (!editor_cmd) { if (!(editor_cmd = g_strdup (g_getenv ("EDITOR"))) ) @@ -418,7 +418,7 @@ key_press_cb (GtkWidget *widget, break; } - settings = g_settings_new ("org.gnome.evolution.eplugin.external-editor"); + settings = g_settings_new ("org.gnome.evolution.plugin.external-editor"); immediately = g_settings_get_boolean (settings, "launch-on-key-press"); g_object_unref (settings); if (!immediately) diff --git a/plugins/face/face.c b/plugins/face/face.c index d344548e45..18a1a2d978 100644 --- a/plugins/face/face.c +++ b/plugins/face/face.c @@ -40,7 +40,7 @@ static gboolean get_include_face_by_default (void) { - GSettings *settings = g_settings_new ("org.gnome.evolution.eplugin.face-picture"); + GSettings *settings = g_settings_new ("org.gnome.evolution.plugin.face-picture"); gboolean res; res = g_settings_get_boolean (settings, SETTINGS_KEY); @@ -53,7 +53,7 @@ get_include_face_by_default (void) static void set_include_face_by_default (gboolean value) { - GSettings *settings = g_settings_new ("org.gnome.evolution.eplugin.face-picture"); + GSettings *settings = g_settings_new ("org.gnome.evolution.plugin.face-picture"); g_settings_set_boolean (settings, SETTINGS_KEY, value); diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index ba649ea5e3..e4f32010bd 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -2906,7 +2906,7 @@ format_itip (EPlugin *ep, em_format_html_add_pobject ((EMFormatHTML *) target->format, sizeof (EMFormatHTMLPObject), classid, target->part, format_itip_object); - settings = g_settings_new ("org.gnome.evolution.eplugin.itip"); + settings = g_settings_new ("org.gnome.evolution.plugin.itip"); puri->delete_message = g_settings_get_boolean (settings, CONF_KEY_DELETE); puri->has_organizer = FALSE; puri->no_reply_wanted = FALSE; @@ -2952,7 +2952,7 @@ delete_toggled_cb (GtkWidget *widget, GSettings *settings; gboolean active; - settings = g_settings_new ("org.gnome.evolution.eplugin.itip"); + settings = g_settings_new ("org.gnome.evolution.plugin.itip"); active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); g_settings_set_boolean (settings, CONF_KEY_DELETE, active); g_object_unref (settings); @@ -3055,7 +3055,7 @@ itip_formatter_page_factory (EPlugin *ep, gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0); /* Delete message after acting */ - settings = g_settings_new ("org.gnome.evolution.eplugin.itip"); + settings = g_settings_new ("org.gnome.evolution.plugin.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 (settings, CONF_KEY_DELETE)); diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index f389a2e678..481cf24c97 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -85,7 +85,7 @@ is_part_enabled (const gchar *key) gboolean res = TRUE; GSettings *settings; - settings = g_settings_new ("org.gnome.evolution.eplugin.mail-notification"); + settings = g_settings_new ("org.gnome.evolution.plugin.mail-notification"); res = g_settings_get_boolean (settings, key); @@ -538,7 +538,7 @@ sound_file_set_cb (GtkFileChooser *file_chooser, gchar *file; GSettings *settings; - settings = g_settings_new ("org.gnome.evolution.eplugin.mail-notification"); + settings = g_settings_new ("org.gnome.evolution.plugin.mail-notification"); file = gtk_file_chooser_get_filename (file_chooser); g_settings_set_string (settings, CONF_KEY_SOUND_FILE, (file != NULL) ? file : ""); @@ -580,7 +580,7 @@ sound_notify_idle_cb (gpointer user_data) g_return_val_if_fail (data != NULL, FALSE); - settings = g_settings_new ("org.gnome.evolution.eplugin.mail-notification"); + settings = g_settings_new ("org.gnome.evolution.plugin.mail-notification"); file = g_settings_get_string (settings, CONF_KEY_SOUND_FILE); do_play_sound ( @@ -663,7 +663,7 @@ get_config_widget_sound (void) gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); gtk_widget_show (widget); - settings = g_settings_new ("org.gnome.evolution.eplugin.mail-notification"); + settings = g_settings_new ("org.gnome.evolution.plugin.mail-notification"); g_settings_bind (settings, CONF_KEY_ENABLED_SOUND, G_OBJECT (widget), "active", G_SETTINGS_BIND_DEFAULT); @@ -772,7 +772,7 @@ get_cfg_widget (void) GSettings *settings; const gchar *text; - settings = g_settings_new ("org.gnome.evolution.eplugin.mail-notification"); + settings = g_settings_new ("org.gnome.evolution.plugin.mail-notification"); widget = gtk_vbox_new (FALSE, 12); gtk_widget_show (widget); diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c index 907e562c29..c46e903ec0 100644 --- a/plugins/prefer-plain/prefer-plain.c +++ b/plugins/prefer-plain/prefer-plain.c @@ -367,7 +367,7 @@ e_plugin_lib_enable (EPlugin *ep, if (enable) { - epp_settings = g_settings_new ("org.gnome.evolution.eplugin.prefer-plain"); + epp_settings = g_settings_new ("org.gnome.evolution.plugin.prefer-plain"); key = g_settings_get_string (epp_settings, "mode"); if (key) { for (i = 0; i < G_N_ELEMENTS (epp_options); i++) { diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index 4010eb7d5a..593e5ec73d 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -449,7 +449,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) gtk_container_add (GTK_CONTAINER (vbuttonbox2), clue_remove); gtk_widget_set_can_default (clue_remove, TRUE); - ui->settings = g_settings_new ("org.gnome.evolution.eplugin.templates"); + ui->settings = g_settings_new ("org.gnome.evolution.plugin.templates"); ui->treeview = clue_treeview; -- cgit v1.2.3