Commit 6fc77ba5 authored by Mark McLoughlin's avatar Mark McLoughlin Committed by Mark McLoughlin

remove.

2001-10-09  Mark McLoughlin <mark@skynet.ie>

        * panel-include.h: remove.

        * *.c, *.h: don't include panel-include.h. Include the
        actual required headers. Give automatic dependancy
        generation a chance.

        * aligned-widget.c (aligned_pos_class_init): use proper
        enum def instead of GTK_TYPE_ENUM.
          basep-widget.c (basep_widget_class_init): ditto.
          border-widget.c (border_pos_class_init): ditto.
          panel-widget.c (panel_widget_class_init): ditto.
          sliding-widget.c (sliding_pos_class_init): ditto.

        * Makefile.am: only generate the enums we actually
        want. Also don't include panel-include.h from
        panel-typebuiltins.c - include the required headers.
parent e2b7be2b
2001-10-09 Mark McLoughlin <mark@skynet.ie>
* panel-include.h: remove.
* *.c, *.h: don't include panel-include.h. Include the
actual required headers. Give automatic dependancy
generation a chance.
* aligned-widget.c (aligned_pos_class_init): use proper
enum def instead of GTK_TYPE_ENUM.
basep-widget.c (basep_widget_class_init): ditto.
border-widget.c (border_pos_class_init): ditto.
panel-widget.c (panel_widget_class_init): ditto.
sliding-widget.c (sliding_pos_class_init): ditto.
* Makefile.am: only generate the enums we actually
want. Also don't include panel-include.h from
panel-typebuiltins.c - include the required headers.
2001-10-08 Mark McLoughlin <mark@skynet.ie>
* extern.c: privatised the Extern struct. Implemented
......
......@@ -143,7 +143,6 @@ panel_sources = \
panel_headers = \
panel-types.h \
panel-include.h \
main.h \
panel-widget.h \
basep-widget.h \
......@@ -234,12 +233,20 @@ desk_DATA = gnome-panel-properties.desktop
$(srcdir)/panel-util.c: $(CORBA_SRCLIST)
$(srcdir)/panel-typebuiltins.c: @REBUILD@ Makefile.am $(panel_headers)
panel_enum_headers = \
panel-types.h \
panel-widget.h \
basep-widget.h \
aligned-widget.h \
sliding-widget.h
$(srcdir)/panel-typebuiltins.c: @REBUILD@ Makefile.am $(panel_enum_headers)
cd $(srcdir) \
&& glib-mkenums \
--fhead "#include <gobject/genums.h>\n" \
--fhead "#include \"panel-typebuiltins.h\"\n\n" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--fprod "\n#include \"@filename@\"\n" \
--vhead "static const G@Type@Value _@enum_name@_values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n};\n\n" \
......@@ -248,23 +255,22 @@ $(srcdir)/panel-typebuiltins.c: @REBUILD@ Makefile.am $(panel_headers)
--vtail " if (!type)\n" \
--vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
--vtail " return type;\n}\n\n" \
$(panel_headers) > xgen-gtbec \
$(panel_enum_headers) > xgen-gtbec \
&& cp xgen-gtbec $(@F) \
&& rm -f xgen-gtbec
$(srcdir)/panel-typebuiltins.h: @REBUILD@ Makefile.am $(panel_headers)
$(srcdir)/panel-typebuiltins.h: @REBUILD@ Makefile.am $(panel_enum_headers)
cd $(srcdir) \
&& glib-mkenums \
--fhead "#ifndef __PANEL_TYPEBUILTINS_H__\n" \
--fhead "#define __PANEL_TYPEBUILTINS_H__ 1\n\n" \
--fhead "#include <panel-include.h>\n\n" \
--fhead "G_BEGIN_DECLS\n\n" \
--ftail "G_END_DECLS\n\n" \
--ftail "#endif /* __PANEL_TYPEBUILTINS_H__ */\n" \
--fprod "\n/* --- @filename@ --- */" \
--eprod "#define PANEL_TYPE_@ENUMNAME@ @enum_name@_get_type()\n" \
--eprod "GType @enum_name@_get_type (void);\n" \
$(panel_headers) > xgen-gth \
$(panel_enum_headers) > xgen-gth \
&& cp xgen-gth $(@F) \
&& rm -f xgen-gth
......
......@@ -10,6 +10,7 @@
#include "panel_config_global.h"
#include "foobar-widget.h"
#include "multiscreen-stuff.h"
#include "panel-typebuiltins.h"
static void aligned_pos_class_init (AlignedPosClass *klass);
static void aligned_pos_init (AlignedPos *pos);
......@@ -72,7 +73,7 @@ aligned_pos_class_init (AlignedPosClass *klass)
align_change),
gtk_marshal_VOID__ENUM,
GTK_TYPE_NONE,
1, GTK_TYPE_ENUM);
1, PANEL_TYPE_ALIGNED_ALIGNMENT);
pos_class->set_pos = aligned_pos_set_pos;
pos_class->get_pos = aligned_pos_get_pos;
......
......@@ -9,12 +9,22 @@
#include <config.h>
#include <string.h>
#include <signal.h>
#include <libgnome/gnome-i18n.h>
#include <libgnome/libgnome.h>
#include <libbonobo.h>
#include <gdk/gdkx.h>
#include "panel-include.h"
#include "gnome-panel.h"
#include "basep-widget.h"
#include "button-widget.h"
#include "drawer.h"
#include "extern.h"
#include "launcher.h"
#include "menu-properties.h"
#include "menu-util.h"
#include "panel_config.h"
#include "panel_config_global.h"
#include "session.h"
#include "status.h"
#include "swallow.h"
#define SMALL_ICON_SIZE 20
......
......@@ -346,7 +346,7 @@ basep_widget_class_init (BasePWidgetClass *klass)
type_change),
gtk_marshal_NONE__ENUM,
GTK_TYPE_NONE,
1, GTK_TYPE_ENUM);*/
1, PANEL_TYPE_PANEL_TYPE);*/
basep_widget_signals[MODE_CHANGE_SIGNAL] =
gtk_signal_new("mode_change",
......
......@@ -10,6 +10,7 @@
#include "border-widget.h"
#include "panel_config_global.h"
#include "multiscreen-stuff.h"
#include "panel-typebuiltins.h"
extern GlobalConfig global_config;
extern int pw_minimized_size;
......@@ -82,7 +83,7 @@ border_pos_class_init (BorderPosClass *klass)
edge_change),
gtk_marshal_VOID__ENUM, /* FIXME:2 should we be using NONE__ENUM? */
GTK_TYPE_NONE, 1,
GTK_TYPE_ENUM);
PANEL_TYPE_BORDER_EDGE);
/* fill out the virtual funcs */
pos_class->set_hidebuttons = border_pos_set_hidebuttons;
......
......@@ -10,8 +10,7 @@
#include <sys/types.h>
#include <sys/wait.h>
#include "panel-include.h"
#include <libgnome/gnome-config.h>
#include <libgnome/libgnome.h>
#include "conditional.h"
......
......@@ -7,7 +7,10 @@
#include <config.h>
#include "panel-include.h"
#include <libgnome/libgnome.h>
#include "distribution.h"
#include "menu-rh.h"
/* Note for distribution vendors:
*
......
......@@ -51,7 +51,7 @@ scan:
--ignore-headers="aligned-widget.h menu-rh.h \
menu-util.h sliding-widget.h \
applet.h menu.h \
basep-widget.h panel-include.h \
basep-widget.h xstuff.h \
border-widget.h panel-types.h \
button-widget.h panel-util.h \
drawer-widget.h panel-widget.h \
......@@ -64,7 +64,7 @@ scan:
launcher.h status.h \
logout.h swallow.h \
main.h tearoffitem.h \
menu-fentry.h xstuff.h" )
menu-fentry.h" )
templates: scan
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
......
......@@ -15,11 +15,18 @@
#include <dirent.h>
#include <string.h>
#include "panel-include.h"
#include <libgnomeui/libgnomeui.h>
#include <libgnome/libgnome.h>
#include "xstuff.h"
#include "drawer.h"
#include <libgnomeui/gnome-uidefs.h>
#include "applet.h"
#include "button-widget.h"
#include "drawer-widget.h"
#include "panel_config_global.h"
#include "panel-util.h"
#include "session.h"
#include "xstuff.h"
extern GSList *applets_last;
extern GlobalConfig global_config;
......
......@@ -13,14 +13,20 @@
#include <string.h>
#include <signal.h>
#include "panel-include.h"
#include "gnome-panel.h"
#include "gnome-run.h"
#include <libgnome/libgnome.h>
#include <libbonobo.h>
#include <bonobo-activation/bonobo-activation.h>
#include <bonobo/bonobo-exception.h>
#include <libgnome/gnome-config.h>
#include "extern.h"
#include <bonobo-activation/bonobo-activation.h>
#include "gnome-run.h"
#include "launcher.h"
#include "menu-fentry.h"
#include "menu.h"
#include "panel-util.h"
#include "panel_config_global.h"
#include "session.h"
#include "status.h"
struct Extern_struct {
POA_GNOME_PanelSpot servant;
......
......@@ -3,14 +3,16 @@
#include <X11/keysym.h>
#include <gdk/gdkx.h>
#include <gdk/gdk.h>
#include <libgnome/libgnome.h>
#include "global-keys.h"
#include "applet.h"
#include "panel-include.h"
#include "gnome-run.h"
#include "panel.h"
#include "panel_config_global.h"
#include <libgnome/gnome-util.h>
extern GlobalConfig global_config;
extern GSList *panels;
......
......@@ -22,20 +22,29 @@
*/
#include <config.h>
#include <libgnome/libgnome.h>
#include <libgnomeui/libgnomeui.h>
#include <errno.h>
#include <sys/types.h>
#include <dirent.h>
#include "panel-include.h"
#include <libgnome/libgnome.h>
#include <libgnomeui/libgnomeui.h>
#include "gnome-run.h"
#include "foobar-widget.h"
#include "menu-fentry.h"
#include "menu.h"
#include "main.h"
#include "multiscreen-stuff.h"
#include "gnome-run.h"
#include "applet.h"
#include "button-widget.h"
#include "foobar-widget.h"
#include "main.h"
#include "menu-fentry.h"
#include "menu.h"
#include "multiscreen-stuff.h"
#include "panel-util.h"
#define ADVANCED_DIALOG_KEY "advanced_run_dialog"
......
......@@ -24,6 +24,8 @@
#ifndef GNOME_RUN_H
#define GNOME_RUN_H
#include "panel-widget.h"
void show_run_dialog (void);
void show_run_dialog_with_text (const char *text);
......
......@@ -16,17 +16,25 @@
#include <unistd.h>
#include <dirent.h>
#include <string.h>
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-dialog.h>
#include <libgnomeui/gnome-uidefs.h>
#include <libgnome/libgnome.h>
#include <libgnomeui/libgnomeui.h>
#include <libgnomevfs/gnome-vfs.h>
#include "launcher.h"
#include "basep-widget.h"
#include "button-widget.h"
#include "drawer-widget.h"
#include "menu-fentry.h"
#include "menu.h"
#include "panel-util.h"
#include "panel_config_global.h"
#include "session.h"
#include "gnome-desktop-item.h"
#include "gnome-ditem-edit.h"
#include "panel-include.h"
static void properties_apply (Launcher *launcher);
extern GtkTooltips *panel_tooltips;
......
......@@ -11,7 +11,9 @@
#ifndef LAUNCHER_H
#define LAUNCHER_H
#include <panel-widget.h>
#include "applet.h"
#include "panel-widget.h"
#include "gnome-desktop-item.h"
G_BEGIN_DECLS
......
......@@ -4,7 +4,16 @@
#include <config.h>
#include "panel-include.h"
#include <libgnome/libgnome.h>
#include "logout.h"
#include "applet.h"
#include "drawer-widget.h"
#include "menu.h"
#include "panel_config_global.h"
#include "panel.h"
#include "extern.h"
extern GSList *applets_last;
......
......@@ -11,18 +11,24 @@
#include <string.h>
#include <signal.h>
#include <sys/wait.h>
#include <libgnome/libgnome.h>
#include <libgnomeui/libgnomeui.h>
#include <bonobo-activation/bonobo-activation.h>
#include <bonobo/bonobo-ui-main.h>
#include "panel-include.h"
#include "gwmh.h"
#include <libbonoboui.h>
#include <bonobo-activation/bonobo-activation.h>
#include "xstuff.h"
#include "multiscreen-stuff.h"
#include "conditional.h"
#include "drawer-widget.h"
#include "extern.h"
#include "menu-fentry.h"
#include "menu.h"
#include "multiscreen-stuff.h"
#include "panel-util.h"
#include "panel_config_global.h"
#include "session.h"
#include "status.h"
#include "xstuff.h"
extern int config_sync_timeout;
......
......@@ -19,9 +19,13 @@
#include <limits.h>
#include <errno.h>
#include <libgnome/gnome-util.h>
#include <libgnome/libgnome.h>
#include "panel-include.h"
#include "menu-fentry.h"
#include "panel-util.h"
#include "panel_config_global.h"
#include "session.h"
/*#define PANEL_DEBUG 1*/
......
......@@ -19,8 +19,13 @@
#include <errno.h>
#include <libgnomeui/libgnomeui.h>
#include <libgnome/libgnome.h>
#include "panel-include.h"
#include "gnome-desktop-item.h"
#include "menu-properties.h"
#include "panel-util.h"
/*#define PANEL_DEBUG 1*/
......
#ifndef MENU_PROPERTIES_H
#define MENU_PROPERTIES_H
#include "menu.h"
G_BEGIN_DECLS
void menu_properties (Menu *menu);
......
......@@ -17,9 +17,9 @@
#include <limits.h>
#include <errno.h>
#include <libgnome/gnome-util.h>
#include <libgnome/libgnome.h>
#include "panel-include.h"
#include "menu-rh.h"
/*#define PANEL_DEBUG 1*/
......
#ifndef MENU_RH_H
#define MENU_RH_H
#include <glib.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
void create_rh_menu(int dofork);
......
......@@ -8,8 +8,14 @@
#include <config.h>
#include "panel-include.h"
#include "menu-util.h"
#include "basep-widget.h"
#include "foobar-widget.h"
#include "multiscreen-stuff.h"
#include "distribution.h"
#include "panel_config_global.h"
#include "menu.h"
/*#define PANEL_DEBUG 1*/
......
#ifndef MENU_UTIL_H
#define MENU_UTIL_H
#include <gtk/gtk.h>
G_BEGIN_DECLS
void applet_menu_position (GtkMenu *menu,
......
......@@ -21,20 +21,39 @@
#include <limits.h>
#include <errno.h>
#include <math.h>
#include <gdk/gdkkeysyms.h>
#include <libgnome/libgnome.h>
#include <libgnomeui/libgnomeui.h>
#include <gnome-desktop-item.h>
#include <gnome-ditem-edit.h>
#include "panel-include.h"
#include "panel-widget.h"
#include "tearoffitem.h"
#include "aligned-widget.h"
#include "button-widget.h"
#include "conditional.h"
#include "distribution.h"
#include "drawer-widget.h"
#include "edge-widget.h"
#include "floating-widget.h"
#include "foobar-widget.h"
#include "gnome-run.h"
#include "title-item.h"
#include "launcher.h"
#include "logout.h"
#include "main.h"
#include "menu-fentry.h"
#include "menu-properties.h"
#include "menu-util.h"
#include "multiscreen-stuff.h"
#include "conditional.h"
#include "panel-util.h"
#include "panel.h"
#include "panel_config_global.h"
#include "session.h"
#include "sliding-widget.h"
#include "status.h"
#include "swallow.h"
#include "tasklist_icon.h"
#include "tearoffitem.h"
#include "title-item.h"
/*#define PANEL_DEBUG 1*/
......
......@@ -22,9 +22,6 @@
#include <config.h>
#include "panel-include.h"
#include "foobar-widget.h"
#include <X11/X.h>
#include <X11/Xlib.h>
#include <gdk/gdkx.h>
......@@ -34,6 +31,9 @@
#include "multiscreen-stuff.h"
#include "foobar-widget.h"
#include "basep-widget.h"
/* some globals */
static int screens = 1;
static GdkRectangle * rectangles = NULL;
......
......@@ -23,6 +23,8 @@
#ifndef MULTISCREEN_STUFF_H
#define MULTISCREEN_STUFF_H
#include <gtk/gtk.h>
void multiscreen_init (void);
int multiscreen_screens (void) G_GNUC_CONST;
......
......@@ -11,19 +11,32 @@
#include <config.h>
#include "panel-include.h"
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libart_lgpl/art_misc.h>
#include <libart_lgpl/art_affine.h>
#include <libart_lgpl/art_filterlevel.h>
#include "rgb-stuff.h"
#include "multiscreen-stuff.h"
#include "nothing.cP"
#include <libgnome/libgnome.h>
#include <libgnomeui/libgnomeui.h>
#include "panel_config.h"
#include "aligned-widget.h"
#include "basep-widget.h"
#include "border-widget.h"
#include "drawer-widget.h"
#include "edge-widget.h"
#include "floating-widget.h"
#include "sliding-widget.h"
#include "panel.h"
#include "rgb-stuff.h"
#include "multiscreen-stuff.h"
/*
* FIXME
*/
#include "nothing.cP"
static void config_apply (PerPanelConfig *ppc);
static GList *ppconfigs = NULL;
......
......@@ -5,7 +5,6 @@
#include "border-widget.h"
#include "aligned-widget.h"
#include "sliding-widget.h"
#include "drawer-widget.h"
#include "panel-util.h"
......
/*overall include file*/
#ifndef PANEL_INCLUDE_H
#define PANEL_INCLUDE_H
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include "panel-types.h"
#include "panel-widget.h"
#include "basep-widget.h"
#include "edge-widget.h"
#include "aligned-widget.h"
#include "sliding-widget.h"
#include "floating-widget.h"
#include "drawer-widget.h"
#include "foobar-widget.h"
#include "button-widget.h"
#include "panel.h"
#include "applet.h"
#include "session.h"
#include "main.h"
#include "panel_config.h"
#include "panel_config_global.h"
#include "distribution.h"
#include "menu.h"
#include "menu-fentry.h"
#include "menu-rh.h"
#include "menu-properties.h"
#include "menu-util.h"
#include "drawer.h"
#include "swallow.h"
#include "launcher.h"
#include "logout.h"
#include "extern.h"
#include "status.h"
#include "panel-util.h"
#endif
......@@ -17,8 +17,12 @@
#include <dirent.h>
#include <libgnomeui/libgnomeui.h>
#include <libgnome/libgnome.h>
#include "panel-include.h"
#include "panel-util.h"
#include "applet.h"
#include "panel_config_global.h"
extern GlobalConfig global_config;
......
#ifndef PANEL_UTIL_H
#define PANEL_UTIL_H
#include <gtk/gtk.h>
#include "panel-widget.h"
G_BEGIN_DECLS
typedef void (*UpdateFunction) (gpointer);
gboolean string_is_in_list (const GSList *list,
......
......@@ -4,19 +4,23 @@
*
* Authors: George Lebl
*/
#include <config.h>
#include <limits.h>
#include <math.h>
#include <config.h>
#include <gtk/gtk.h>
#include "panel-widget.h"
#include "button-widget.h"
#include "panel-util.h"
#include "panel-marshal.h"
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libart_lgpl/art_misc.h>
#include <libart_lgpl/art_affine.h>
#include <libart_lgpl/art_filterlevel.h>
#include "panel-widget.h"
#include "button-widget.h"
#include "panel-util.h"
#include "panel-marshal.h"
#include "rgb-stuff.h"
#include "panel-typebuiltins.h"
GSList *panels = NULL; /*other panels we might want to move the applet to*/
......@@ -159,7 +163,7 @@ panel_widget_class_init (PanelWidgetClass *class)
gtk_marshal_VOID__ENUM, /* FIXME:2 should this be gtk_marshal_NONE__ENUM ? */
GTK_TYPE_NONE,
1,
GTK_TYPE_ENUM);
PANEL_TYPE_PANEL_ORIENTATION);
panel_widget_signals[SIZE_CHANGE_SIGNAL] =
gtk_signal_new("size_change",
GTK_RUN_LAST,
......
......@@ -14,13 +14,31 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include <libgnome/libgnome.h>
#include <libbonobo.h>
#include "panel-include.h"
#include "panel.h"
#include "applet.h"
#include "button-widget.h"
#include "distribution.h"
#include "drawer-widget.h"
#include "edge-widget.h"
#include "extern.h"
#include "floating-widget.h"
#include "foobar-widget.h"
#include "gnome-run.h"
#include "gnome-panel.h"
#include "launcher.h"
#include "logout.h"
#include "menu-fentry.h"
#include "menu-util.h"
#include "menu.h"
#include "panel-util.h"
#include "panel_config.h"
#include "session.h"
#include "status.h"
#include "swallow.h"