Re: gide.h cleanup patch

[Dave Fallon <davef tetsubo com>]

On Thu, Jul 19, 2001 at 01:36:28AM -0400, JP Rosevear wrote:
> On 19 Jul 2001 00:48:39 -0400, Duncan Mak wrote:
> > On Wed, Jul 18, 2001 at 01:39:05PM -0700, Dave Fallon wrote:
> > > Below is the gide.h cleanup/removal patch. Note that gide.h should also be cvs removed.

--------------------
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gIDE/ChangeLog,v
retrieving revision 1.121
diff -u -r1.121 ChangeLog
--- ChangeLog	2001/07/18 04:22:03	1.121
+++ ChangeLog	2001/07/19 06:25:50
@@ -1,3 +1,24 @@
+2001-07-18  Dave Fallon <davef tetsubo com>
+
+	* gide.h cleanup and removal
+
+	* plugins/evo-mail/mail-tool.c
+	  plugins/mail/mail-tool.c
+	  plugins/help/help.c
+	  src/Makefile.am
+	  src/gI_window.c
+	  src/gI_window.h
+	  src/gide-windows.c
+	  src/gide-windows.h
+	  src/gide.c
+	  src/dialog-prefs.c
+	removal of the gide.h include
+
+	* src/gI_window.h: Moved the GideWindow declaration here from gide.h
+	Moved the main_window extern declaration here from gide.h
+
+	* src/gide.c: Removed the *_path declarations
+
 2001-07-18  Dave Camp  <dave ximian com>
 
 	* libgide/gide-doc.c (gide_find_word_begin): New function.
Index: TODO
===================================================================
RCS file: /cvs/gnome/gIDE/TODO,v
retrieving revision 1.17
diff -u -r1.17 TODO
--- TODO	2001/07/18 06:28:00	1.17
+++ TODO	2001/07/19 06:25:50
@@ -71,7 +71,6 @@
   -> needs to be implemented by all controls
   * campd is doing this for scintilla
 - gI_run is out of date
-- check whether global vars in gide.c are used/needed
 - do we keep a history of open files/project when quitting?
   -> yes, but configurable (implement workspaces?)
 - add multiple projects per workspace?
@@ -112,7 +111,6 @@
   -> remove
 - compile sets? is that in gnome-build?
   -> remove
-- gide.h can probably be removed
 - remove #include <gnome.h> and use more restrictive includes (to speed up
   compiling)
 - fix warnings (compile and gtk)
@@ -121,4 +119,4 @@
 - determine plugin load order for menu merging (or other fix)
 - port to gtk+ 2.0 / gnome 2.0? when?
 - gnome-build.idl: use correct (studly?) caps
-  * jpr
\ No newline at end of file
+  * jpr
Index: plugins/evo-mail/mail-tool.c
===================================================================
RCS file: /cvs/gnome/gIDE/plugins/evo-mail/mail-tool.c,v
retrieving revision 1.3
diff -u -r1.3 mail-tool.c
--- plugins/evo-mail/mail-tool.c	2001/07/11 06:09:33	1.3
+++ plugins/evo-mail/mail-tool.c	2001/07/19 06:25:51
@@ -15,9 +15,6 @@
 #include <libgnomevfs/gnome-vfs-mime-info.h>
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
 
-
-#include "../../src/gide.h"
-
 #define MAIL_COMPONENT_IID "OAFIID:GNOME_Development_Plugin:mail"
 #define PLUGIN_NAME			"gide-mail-plugin"
 #define PLUGIN_XML			"gide-mail-plugin.xml"
Index: plugins/help/help.c
===================================================================
RCS file: /cvs/gnome/gIDE/plugins/help/help.c,v
retrieving revision 1.2
diff -u -r1.2 help.c
--- plugins/help/help.c	2001/06/29 08:02:50	1.2
+++ plugins/help/help.c	2001/07/19 06:25:51
@@ -11,7 +11,6 @@
 #include <stdlib.h>
 #include <glade/glade.h>
 #include <libgide/libgide.h>
-#include "../../src/gide.h"
 #include "help.h"
 
 #define GLADE_FILE			"man_plugin.glade"
Index: plugins/mail/mail-tool.c
===================================================================
RCS file: /cvs/gnome/gIDE/plugins/mail/mail-tool.c,v
retrieving revision 1.4
diff -u -r1.4 mail-tool.c
--- plugins/mail/mail-tool.c	2001/07/11 06:09:35	1.4
+++ plugins/mail/mail-tool.c	2001/07/19 06:25:52
@@ -16,7 +16,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include "../../src/gide.h"
 
 #define MAIL_COMPONENT_IID "OAFIID:GNOME_Development_Plugin:mail"
 #define PLUGIN_NAME			"gide-mail-plugin"
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/gIDE/src/Makefile.am,v
retrieving revision 1.45
diff -u -r1.45 Makefile.am
--- src/Makefile.am	2001/07/17 04:27:24	1.45
+++ src/Makefile.am	2001/07/19 06:25:52
@@ -24,7 +24,6 @@
 	gI_window.c 			\
 	gI_window.h 			\
 	gide.c 				\
-	gide.h 				\
 	gide-windows.h 			\
 	gide-windows.c  		\
 	e-splash.c 			\
Index: src/gI_window.c
===================================================================
RCS file: /cvs/gnome/gIDE/src/gI_window.c,v
retrieving revision 1.36
diff -u -r1.36 gI_window.c
--- src/gI_window.c	2001/07/04 23:52:24	1.36
+++ src/gI_window.c	2001/07/19 06:25:53
@@ -25,7 +25,6 @@
 #include <gal/e-paned/e-vpaned.h>
 #include <gal/e-paned/e-hpaned.h>
 #include "gI_window.h"
-#include "gide.h"
 
 #include <libgide/libgide.h>
 
Index: src/gI_window.h
===================================================================
RCS file: /cvs/gnome/gIDE/src/gI_window.h,v
retrieving revision 1.16
diff -u -r1.16 gI_window.h
--- src/gI_window.h	2001/07/04 22:54:59	1.16
+++ src/gI_window.h	2001/07/19 06:25:53
@@ -22,7 +22,6 @@
 #include <bonobo.h>
 #include <libgide/libgide.h>
 
-#include "gide.h"
 #define GIDE_WINDOW(o)          (GTK_CHECK_CAST ((o), gI_window_get_type(), GideWindow))
 #define GIDE_WINDOW_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), gI_window_get_type(), GideWindowClass))
 #define IS_GIDE_WINDOW(o)       (GTK_CHECK_TYPE ((o), gI_window_get_type()))
@@ -33,6 +32,8 @@
 	BonoboWindowClass   parent_class;
 };
 
+typedef struct _GideWindow		GideWindow;
+
 struct _GideWindow {
 	BonoboWindow app;
 	BonoboUIComponent *uic;
@@ -67,6 +68,9 @@
 
 	gint debug_id;
 };
+
+/* Pointer to the main window. Obsolete, shouldn't be used */
+extern GideWindow			*main_window;
 
 /*
  * Prototypes for 'gI_window.c'
Index: src/gide-windows.c
===================================================================
RCS file: /cvs/gnome/gIDE/src/gide-windows.c,v
retrieving revision 1.5
diff -u -r1.5 gide-windows.c
--- src/gide-windows.c	2001/07/01 21:58:48	1.5
+++ src/gide-windows.c	2001/07/19 06:25:53
@@ -17,7 +17,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "gide.h"
 #include "gide-windows.h"
 #include "gI_window.h"
 #include "tools.h"
Index: src/gide-windows.h
===================================================================
RCS file: /cvs/gnome/gIDE/src/gide-windows.h,v
retrieving revision 1.4
diff -u -r1.4 gide-windows.h
--- src/gide-windows.h	2001/03/03 05:44:26	1.4
+++ src/gide-windows.h	2001/07/19 06:25:53
@@ -20,7 +20,6 @@
 #ifndef GIDE_WINDOWS_H
 #define GIDE_WINDOWS_H
 
-#include "gide.h"
 #include "gI_window.h"
 #include "e-splash.h"
 
Index: src/gide.c
===================================================================
RCS file: /cvs/gnome/gIDE/src/gide.c,v
retrieving revision 1.32
diff -u -r1.32 gide.c
--- src/gide.c	2001/07/04 22:54:59	1.32
+++ src/gide.c	2001/07/19 06:25:54
@@ -33,11 +33,6 @@
 /* Main window */
 GideWindow *main_window;
 
-/* Paths */
-gchar gide_path[MAXLEN];
-gchar tools_path[MAXLEN];
-gchar prj_path[MAXLEN];
-
 static const struct poptOption gide_popt_options [] = {
 	{ NULL, '\0', 0, NULL, 0 }
 };
Index: src/dialogs/dialog-prefs.c
===================================================================
RCS file: /cvs/gnome/gIDE/src/dialogs/dialog-prefs.c,v
retrieving revision 1.3
diff -u -r1.3 dialog-prefs.c
--- src/dialogs/dialog-prefs.c	2001/03/03 05:44:31	1.3
+++ src/dialogs/dialog-prefs.c	2001/07/19 06:25:54
@@ -5,7 +5,6 @@
  *   JP Rosevear (jpr arcavia com)
  */
 #include <config.h>
-#include "gide.h"
 #include <glade/glade.h>
 #include "dialogs.h"
 #include <libgide/libgide.h>