1 diff -urN aaa/vim62/src/container.c vim62/src/container.c
2 --- aaa/vim62/src/container.c 2003-08-08 00:48:17.000000000 +0200
3 +++ vim62/src/container.c 2003-08-08 11:38:21.000000000 +0200
5 +#include "auto/config.h"
7 +#ifdef FEAT_GUI_COMPONENT
15 +#endif /* FEAT_GUI_COMPONENT */
16 diff -urN aaa/vim62/src/fileio.c vim62/src/fileio.c
17 --- aaa/vim62/src/fileio.c 2003-08-08 00:48:17.000000000 +0200
18 +++ vim62/src/fileio.c 2003-08-08 13:59:35.000000000 +0200
19 @@ -3427,7 +3427,11 @@
20 * (this may happen when the user reached his quotum for number of files).
21 * Appending will fail if the file does not exist and forceit is FALSE.
23 +#ifdef FEAT_GUI_COMPONENT
24 while (write_pstream && (fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append
26 + while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append
28 ? (forceit ? (O_APPEND | O_CREAT) : O_APPEND)
29 : (O_CREAT | O_TRUNC))
31 diff -urN aaa/vim62/src/gtkhtml_editor.c vim62/src/gtkhtml_editor.c
32 --- aaa/vim62/src/gtkhtml_editor.c 2003-08-08 00:48:17.000000000 +0200
33 +++ vim62/src/gtkhtml_editor.c 2003-08-08 11:38:32.000000000 +0200
35 +#include "auto/config.h"
37 +#ifdef FEAT_GUI_COMPONENT
41 #include "gtkhtml_editor.h"
46 +#endif /* FEAT_GUI_COMPONENT */
47 diff -urN aaa/vim62/src/gtkhtml_editor_common.c vim62/src/gtkhtml_editor_common.c
48 --- aaa/vim62/src/gtkhtml_editor_common.c 2003-08-08 00:48:17.000000000 +0200
49 +++ vim62/src/gtkhtml_editor_common.c 2003-08-08 11:38:47.000000000 +0200
51 * This file was generated by orbit-idl-2 - DO NOT EDIT!
54 +#include "auto/config.h"
56 +#ifdef FEAT_GUI_COMPONENT
59 #define ORBIT2_STUBS_API
60 #define ORBIT_IDL_C_COMMON
63 {2, 2, GNOME_GtkHTML_Editor_Engine__base_itypes, FALSE}
65 +#endif /* FEAT_GUI_COMPONENT */
66 diff -urN aaa/vim62/src/gtkhtml_editor_skels.c vim62/src/gtkhtml_editor_skels.c
67 --- aaa/vim62/src/gtkhtml_editor_skels.c 2003-08-08 00:48:17.000000000 +0200
68 +++ vim62/src/gtkhtml_editor_skels.c 2003-08-08 11:38:59.000000000 +0200
70 * This file was generated by orbit-idl-2 - DO NOT EDIT!
73 +#include "auto/config.h"
75 +#ifdef FEAT_GUI_COMPONENT
78 #define ORBIT2_STUBS_API
81 POA_Bonobo_Unknown__fini(servant, env);
82 PortableServer_ServantBase__fini(servant, env);
84 +#endif /* FEAT_GUI_COMPONENT */
85 diff -urN aaa/vim62/src/gtkhtml_editor_stubs.c vim62/src/gtkhtml_editor_stubs.c
86 --- aaa/vim62/src/gtkhtml_editor_stubs.c 2003-08-08 00:48:17.000000000 +0200
87 +++ vim62/src/gtkhtml_editor_stubs.c 2003-08-08 11:39:10.000000000 +0200
89 * This file was generated by orbit-idl-2 - DO NOT EDIT!
92 +#include "auto/config.h"
94 +#ifdef FEAT_GUI_COMPONENT
97 #define ORBIT2_STUBS_API
101 return _ORBIT_retval;
103 +#endif /* FEAT_GUI_COMPONENT */
104 diff -urN aaa/vim62/src/gui_gtk_x11.c vim62/src/gui_gtk_x11.c
105 --- aaa/vim62/src/gui_gtk_x11.c 2003-08-08 00:48:17.000000000 +0200
106 +++ vim62/src/gui_gtk_x11.c 2003-08-08 14:04:56.000000000 +0200
109 #ifdef FEAT_GUI_GNOME
110 /* Gnome redefines _() and N_(). Grrr... */
118 # ifdef bindtextdomain
119 # undef bindtextdomain
122 # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS)
123 # define ENABLE_NLS /* so the texts in the dialog boxes are translated */
125 @@ -2696,7 +2696,7 @@
129 -#if defined(GTK2_MULTIHEAD) && !defined(FEAT_GUI_COMPONENT)
130 +#if defined(HAVE_GTK_MULTIHEAD) && !defined(FEAT_GUI_COMPONENT)
133 mainwin_screen_changed_cb(GtkWidget *widget,
134 @@ -3038,9 +3038,10 @@
136 #ifndef FEAT_GUI_COMPONENT
137 gtk_widget_set_name(gui.mainwin, "vim-main-window");
141 vbox = gtk_vbox_new(FALSE, 0);
145 /* Create the PangoContext used for drawing all text. */
146 diff -urN aaa/vim62/src/vim_bonobo_control.c vim62/src/vim_bonobo_control.c
147 --- aaa/vim62/src/vim_bonobo_control.c 2003-08-08 00:48:18.000000000 +0200
148 +++ vim62/src/vim_bonobo_control.c 2003-08-08 02:15:09.000000000 +0200
150 * Jason Hildebrand <jason@peaceworks.ca>
158 +#ifdef FEAT_GUI_COMPONENT
160 #include "vim_bonobo_control.h"
161 #include "gtkhtml_editor.h"
165 return vim_control_construct (control);
168 +#endif /* FEAT_GUI_COMPONENT */
169 diff -urN aaa/vim62/src/vim_bonobo_factory.c vim62/src/vim_bonobo_factory.c
170 --- aaa/vim62/src/vim_bonobo_factory.c 2003-08-08 00:48:18.000000000 +0200
171 +++ vim62/src/vim_bonobo_factory.c 2003-08-08 02:15:17.000000000 +0200
177 +#ifdef FEAT_GUI_COMPONENT
180 #include <bonobo/bonobo-generic-factory.h>
181 #include "vim_bonobo_control.h"
187 +#endif /* FEAT_GUI_COMPONENT */
188 diff -urN aaa/vim62/src/vim_bonobo_main.c vim62/src/vim_bonobo_main.c
189 --- aaa/vim62/src/vim_bonobo_main.c 2003-08-08 00:48:18.000000000 +0200
190 +++ vim62/src/vim_bonobo_main.c 2003-08-08 11:40:13.000000000 +0200
192 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
194 +#include "auto/config.h"
196 +#ifdef FEAT_GUI_COMPONENT
198 #include <glib/gmain.h>
199 #include <glib-object.h>
203 g_main_context_iteration(NULL, may_block);
205 +#endif /* FEAT_GUI_COMPONENT */
206 diff -urN aaa/vim62/src/Vim_Control.server vim62/src/Vim_Control.server
207 --- aaa/vim62/src/Vim_Control.server 2003-08-08 00:48:17.000000000 +0200
208 +++ vim62/src/Vim_Control.server 2003-08-08 13:16:31.000000000 +0200
212 -<oaf_server iid="OAFIID:Vim_Control_Factory" type="exe" location="/home/jdhildeb/projects/gnome-vim/vim/src/vim">
213 +<oaf_server iid="OAFIID:Vim_Control_Factory" type="exe" location="/usr/bin/gvim.gnome"">
214 <oaf_attribute name="repo_ids" type="stringv">
215 <item value="IDL:Bonobo/GenericFactory:1.0"/>