diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/external-editor/external-editor.c | 52 | ||||
| -rw-r--r-- | plugins/prefer-plain/prefer-plain.c | 27 | ||||
| -rw-r--r-- | plugins/save-calendar/rdf-format.c | 8 |
3 files changed, 35 insertions, 52 deletions
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index b9386caa87..d2d74797b8 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -43,15 +43,8 @@ #include <stdlib.h> #include <string.h> -#include <gconf/gconf-client.h> - #define d(x) -#define EDITOR_GCONF_KEY_COMMAND \ - "/apps/evolution/eplugin/external-editor/editor-command" -#define EDITOR_GCONF_KEY_IMMEDIATE \ - "/apps/evolution/eplugin/external-editor/launch-on-key-press" - gboolean e_plugin_ui_init (GtkUIManager *manager, EMsgComposer *composer); GtkWidget * e_plugin_lib_get_configure_widget @@ -82,29 +75,29 @@ void ee_editor_command_changed (GtkWidget *textbox) { const gchar *editor; - GConfClient *gconf; + GSettings *settings; editor = gtk_entry_get_text (GTK_ENTRY (textbox)); d(printf ("\n\aeditor is : [%s] \n\a", editor)); - /* gconf access for every key-press. Sucky ? */ - gconf = gconf_client_get_default (); - gconf_client_set_string (gconf, EDITOR_GCONF_KEY_COMMAND, editor, NULL); - g_object_unref (gconf); + /* GSettings access for every key-press. Sucky ? */ + settings = g_settings_new ("org.gnome.evolution.eplugin.external-editor"); + g_settings_set_string (settings, "command", editor); + g_object_unref (settings); } void ee_editor_immediate_launch_changed (GtkWidget *checkbox) { gboolean immediately; - GConfClient *gconf; + GSettings *settings; immediately = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)); d(printf ("\n\aimmediate launch is : [%d] \n\a", immediately)); - gconf = gconf_client_get_default (); - gconf_client_set_bool (gconf, EDITOR_GCONF_KEY_IMMEDIATE, immediately, NULL); - g_object_unref (gconf); + settings = g_settings_new ("org.gnome.evolution.eplugin.external-editor"); + g_settings_set_boolean (settings, "launch-on-key-press", immediately); + g_object_unref (settings); } GtkWidget * @@ -112,7 +105,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) { GtkWidget *vbox, *textbox, *label, *help; GtkWidget *checkbox; - GConfClient *gconf; + GSettings *settings; gchar *editor; gboolean checked; @@ -120,9 +113,9 @@ 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\"")); - gconf = gconf_client_get_default (); + settings = g_settings_new ("org.gnome.evolution.eplugin.external-editor"); - editor = gconf_client_get_string (gconf, EDITOR_GCONF_KEY_COMMAND, NULL); + editor = g_settings_get_string (settings, "command"); if (editor) { gtk_entry_set_text (GTK_ENTRY (textbox), editor); g_free (editor); @@ -130,10 +123,10 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) checkbox = gtk_check_button_new_with_label ( _("Automatically launch when a new mail is edited")); - checked = gconf_client_get_bool (gconf, EDITOR_GCONF_KEY_IMMEDIATE, NULL); + checked = g_settings_get_boolean (settings, "launch-on-key-press"); if (checked) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), TRUE); - g_object_unref (gconf); + g_object_unref (settings); gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), textbox, FALSE, FALSE, 0); @@ -261,7 +254,7 @@ async_external_editor (EMsgComposer *composer) { gchar *filename = NULL; gint status = 0; - GConfClient *gconf; + GSettings *settings; gchar *editor_cmd_line = NULL, *editor_cmd = NULL, *content; gint fd, position = -1, offset = -1; @@ -289,9 +282,8 @@ async_external_editor (EMsgComposer *composer) return; } - gconf = gconf_client_get_default (); - editor_cmd = gconf_client_get_string ( - gconf, EDITOR_GCONF_KEY_COMMAND, NULL); + settings = g_settings_new ("org.gnome.evolution.eplugin.external-editor"); + editor_cmd = g_settings_get_string (settings, "command"); if (!editor_cmd) { if (!(editor_cmd = g_strdup (g_getenv ("EDITOR"))) ) /* Make gedit the default external editor, @@ -299,7 +291,7 @@ async_external_editor (EMsgComposer *composer) * and no $EDITOR is set. */ editor_cmd = g_strdup ("gedit"); } - g_object_unref (gconf); + g_object_unref (settings); if (g_strrstr (editor_cmd, "vim") != NULL && gtk_html_get_cursor_pos ( @@ -410,7 +402,7 @@ key_press_cb (GtkWidget *widget, GdkEventKey *event, EMsgComposer *composer) { - GConfClient *gconf; + GSettings *settings; gboolean immediately; /* we don't want to start the editor on any modifier keys */ @@ -426,9 +418,9 @@ key_press_cb (GtkWidget *widget, break; } - gconf = gconf_client_get_default (); - immediately = gconf_client_get_bool (gconf, EDITOR_GCONF_KEY_IMMEDIATE, NULL); - g_object_unref (gconf); + settings = g_settings_new ("org.gnome.evolution.eplugin.external-editor"); + immediately = g_settings_get_boolean (settings, "launch-on-key-press"); + g_object_unref (settings); if (!immediately) return FALSE; diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c index 55f62f8e3d..907e562c29 100644 --- a/plugins/prefer-plain/prefer-plain.c +++ b/plugins/prefer-plain/prefer-plain.c @@ -26,7 +26,6 @@ #include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#include <gconf/gconf-client.h> #include <string.h> #include <stdio.h> @@ -44,7 +43,7 @@ enum { EPP_TEXT }; -static GConfClient *epp_gconf = NULL; +static GSettings *epp_settings = NULL; static gint epp_mode = -1; static gboolean epp_show_suppressed = TRUE; @@ -281,7 +280,7 @@ epp_mode_changed (GtkComboBox *dropdown, if (epp_mode > 2) epp_mode = 0; - gconf_client_set_string(epp_gconf, "/apps/evolution/eplugin/prefer_plain/mode", epp_options[epp_mode].key, NULL); + g_settings_set_string (epp_settings, "mode", epp_options[epp_mode].key); update_info_label (info_label, epp_mode); } @@ -292,7 +291,7 @@ epp_show_suppressed_toggled (GtkToggleButton *check, g_return_if_fail (check != NULL); epp_show_suppressed = gtk_toggle_button_get_active (check); - gconf_client_set_bool (epp_gconf, "/apps/evolution/eplugin/prefer_plain/show_suppressed", epp_show_suppressed, NULL); + g_settings_set_boolean (epp_settings, "show-suppressed", epp_show_suppressed); } GtkWidget * @@ -363,14 +362,13 @@ e_plugin_lib_enable (EPlugin *ep, gchar *key; gint i; - if (epp_gconf || epp_mode != -1) + if (epp_settings || epp_mode != -1) return 0; if (enable) { - GConfValue *val; - epp_gconf = gconf_client_get_default (); - key = gconf_client_get_string(epp_gconf, "/apps/evolution/eplugin/prefer_plain/mode", NULL); + epp_settings = g_settings_new ("org.gnome.evolution.eplugin.prefer-plain"); + key = g_settings_get_string (epp_settings, "mode"); if (key) { for (i = 0; i < G_N_ELEMENTS (epp_options); i++) { if (!strcmp (epp_options[i].key, key)) { @@ -383,16 +381,11 @@ e_plugin_lib_enable (EPlugin *ep, epp_mode = 0; } - val = gconf_client_get (epp_gconf, "/apps/evolution/eplugin/prefer_plain/show_suppressed", NULL); - if (val) { - epp_show_suppressed = gconf_value_get_bool (val); - gconf_value_free (val); - } else - epp_show_suppressed = TRUE; + epp_show_suppressed = g_settings_get_boolean (epp_settings, "show-suppressed"); } else { - if (epp_gconf) { - g_object_unref (epp_gconf); - epp_gconf = NULL; + if (epp_settings) { + g_object_unref (epp_settings); + epp_settings = NULL; } } diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index c93eb1fb59..ed9cf18bb6 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -59,13 +59,11 @@ static GConfClient *config = NULL; static gchar * calendar_config_get_timezone (void) { - + GSettings *settings; gchar *retval = NULL; - if (!config) - config = gconf_client_get_default (); - - retval = gconf_client_get_string (config, CALENDAR_CONFIG_TIMEZONE, NULL); + settings = g_settings_new ("org.gnome.evolution.calendar"); + retval = g_settings_get_string (settings, "timezone"); if (!retval) retval = g_strdup ("UTC"); |