vim-bonobo.patch

   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
   4 @@ -1,3 +1,6 @@
   5 +#include "auto/config.h"
   6 +
   7 +#ifdef FEAT_GUI_COMPONENT
   8
   9  #include <bonobo.h>
  10  #include <glib.h>
  11 @@ -264,3 +267,4 @@
  12
  13      return 0;
  14  }
  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.
  22       */
  23 +#ifdef FEAT_GUI_COMPONENT
  24      while (write_pstream && (fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append
  25 +#else
  26 +    while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append
  27 +#endif
  28                         ? (forceit ? (O_APPEND | O_CREAT) : O_APPEND)
  29                         : (O_CREAT | O_TRUNC))
  30                         , 0666)) < 0)
  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
  34 @@ -1,3 +1,7 @@
  35 +#include "auto/config.h"
  36 +
  37 +#ifdef FEAT_GUI_COMPONENT
  38 +
  39  #include <bonobo.h>
  40
  41  #include "gtkhtml_editor.h"
  42 @@ -187,3 +191,4 @@
  43
  44         return ee;
  45  }
  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
  50 @@ -2,6 +2,10 @@
  51   * This file was generated by orbit-idl-2 - DO NOT EDIT!
  52   */
  53
  54 +#include "auto/config.h"
  55 +
  56 +#ifdef FEAT_GUI_COMPONENT
  57 +
  58  #include <string.h>
  59  #define ORBIT2_STUBS_API
  60  #define ORBIT_IDL_C_COMMON
  61 @@ -304,3 +308,4 @@
  62                                     FALSE},
  63     {2, 2, GNOME_GtkHTML_Editor_Engine__base_itypes, FALSE}
  64  };
  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
  69 @@ -2,6 +2,10 @@
  70   * This file was generated by orbit-idl-2 - DO NOT EDIT!
  71   */
  72
  73 +#include "auto/config.h"
  74 +
  75 +#ifdef FEAT_GUI_COMPONENT
  76 +
  77  #include <string.h>
  78  #define ORBIT2_STUBS_API
  79  #include "gtkhtml.h"
  80 @@ -656,3 +660,4 @@
  81     POA_Bonobo_Unknown__fini(servant, env);
  82     PortableServer_ServantBase__fini(servant, env);
  83  }
  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
  88 @@ -2,6 +2,10 @@
  89   * This file was generated by orbit-idl-2 - DO NOT EDIT!
  90   */
  91
  92 +#include "auto/config.h"
  93 +
  94 +#ifdef FEAT_GUI_COMPONENT
  95 +
  96  #include <string.h>
  97  #define ORBIT2_STUBS_API
  98  #include "gtkhtml.h"
  99 @@ -494,3 +498,4 @@
 100     }
 101     return _ORBIT_retval;
 102  }
 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
 107 @@ -24,7 +24,7 @@
 108  #include "vim.h"
 109  #ifdef FEAT_GUI_GNOME
 110  /* Gnome redefines _() and N_().  Grrr... */
 111 -# ifdef _
 112 +/*# ifdef _
 113  #  undef _
 114  # endif
 115  # ifdef N_
 116 @@ -35,7 +35,7 @@
 117  # endif
 118  # ifdef bindtextdomain
 119  #  undef bindtextdomain
 120 -# endif
 121 +# endif */
 122  # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS)
 123  #  define ENABLE_NLS   /* so the texts in the dialog boxes are translated */
 124  # endif
 125 @@ -2696,7 +2696,7 @@
 126      return cursor;
 127  }
 128
 129 -#if defined(GTK2_MULTIHEAD) && !defined(FEAT_GUI_COMPONENT)
 130 +#if defined(HAVE_GTK_MULTIHEAD) && !defined(FEAT_GUI_COMPONENT)
 131  /*ARGSUSED1*/
 132      static void
 133  mainwin_screen_changed_cb(GtkWidget  *widget,
 134 @@ -3038,9 +3038,10 @@
 135
 136  #ifndef FEAT_GUI_COMPONENT
 137      gtk_widget_set_name(gui.mainwin, "vim-main-window");
 138 +#else
 139 +    gui.vbox = vbox;
 140  #endif
 141      vbox = gtk_vbox_new(FALSE, 0);
 142 -    gui.vbox = vbox;
 143
 144  #ifdef HAVE_GTK2
 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
 149 @@ -5,9 +5,13 @@
 150   *   Jason Hildebrand <jason@peaceworks.ca>
 151   *
 152   */
 153 +
 154  #include <stdio.h>
 155
 156  #include "vim.h"
 157 +
 158 +#ifdef FEAT_GUI_COMPONENT
 159 +
 160  #include "vim_bonobo_control.h"
 161  #include "gtkhtml_editor.h"
 162
 163 @@ -408,4 +412,4 @@
 164
 165         return vim_control_construct (control);
 166  }
 167 -
 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
 172 @@ -7,6 +7,9 @@
 173   */
 174
 175  #include "vim.h"
 176 +
 177 +#ifdef FEAT_GUI_COMPONENT
 178 +
 179  #include "version.h"
 180  #include <bonobo/bonobo-generic-factory.h>
 181  #include "vim_bonobo_control.h"
 182 @@ -70,4 +73,4 @@
 183      }
 184      return 1;
 185  }
 186 -
 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
 191 @@ -1,5 +1,9 @@
 192  /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 193
 194 +#include "auto/config.h"
 195 +
 196 +#ifdef FEAT_GUI_COMPONENT
 197 +
 198  #include <glib/gmain.h>
 199  #include <glib-object.h>
 200
 201 @@ -58,3 +62,4 @@
 202  {
 203      g_main_context_iteration(NULL, may_block);
 204  }
 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
 209 @@ -1,6 +1,6 @@
 210  <oaf_info>
 211
 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"/>
 216    </oaf_attribute>