From 4503c052d04822edb3105e639b824ed88013a810 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 6 Jun 2008 15:12:53 +0000 Subject: ** Allow evolution to build with G_DISABLE_SINGLE_INCLUDES and 2008-06-06 Matthew Barnes ** Allow evolution to build with G_DISABLE_SINGLE_INCLUDES and GTK_DISABLE_SINGLE_INCLUDES defined. (#536637) svn path=/trunk/; revision=35606 --- plugins/external-editor/external-editor.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'plugins/external-editor') diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index aaa06d3c73..698b39ffb9 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -201,8 +201,6 @@ show_composer_dialog (EMsgComposer *composer) void org_gnome_external_editor (EPlugin *ep, EMMenuTargetSelect *select) { - d(printf ("\n\nexternal_editor plugin is launched \n\n")); - /* The template to be used in the external editor */ /* README: I have not marked this for translation. @@ -212,6 +210,11 @@ void org_gnome_external_editor (EPlugin *ep, EMMenuTargetSelect *select) gint fd; char *filename = NULL; + char *editor = NULL; + GConfClient *gconf; + GArray *array; + + d(printf ("\n\nexternal_editor plugin is launched \n\n")); fd = g_file_open_tmp (NULL, &filename, NULL); if (fd > 0) { @@ -225,9 +228,6 @@ void org_gnome_external_editor (EPlugin *ep, EMMenuTargetSelect *select) return ; } - char *editor = NULL; - GConfClient *gconf; - gconf = gconf_client_get_default (); editor = gconf_client_get_string (gconf, EDITOR_GCONF_KEY, NULL); if (!editor) { @@ -240,7 +240,6 @@ void org_gnome_external_editor (EPlugin *ep, EMMenuTargetSelect *select) } g_object_unref (gconf); - GArray *array; array = g_array_sized_new (TRUE, TRUE, sizeof (gpointer), 2 * sizeof(gpointer)); array = g_array_append_val (array, editor); array = g_array_append_val (array, filename); -- cgit