Commit 53ae7e9a authored by Tom Tromey's avatar Tom Tromey

Include GNOME_INCLUDEDIR.

	* Makefile.am (INCLUDES): Include GNOME_INCLUDEDIR.

	* Makefile.am (libpanel_applet_la_SOURCES): Added mico-parse.cc.
	(panel_SOURCES): Likewise.
	* cdplayer/cdplayer.c (main): Use new gnome_init.
	* logout.c (main): Use new gnome_init.
	* clock.c (main): Use new gnome_init.
	* applet-lib.cc (gnome_panel_applet_init_corba): Use
	panel_initialize_corba.
	* mico-parse.cc: New file.
	* mico-glue.cc (panel_corba_gtk_main): Use
	panel_initialize_corba.
	* main.c (init_session_management): Removed.
	(main): Use new session and argument parsing code.
	* mico-glue.h (corba_gtk_main): Removed.
	(panel_corba_register_arguments): Declare.
parent effb8cc4
Sun Mar 8 18:55:09 1998 Tom Tromey <tromey@cygnus.com>
* Makefile.am (INCLUDES): Include GNOME_INCLUDEDIR.
Sat Mar 7 13:39:41 1998 Tom Tromey <tromey@cygnus.com>
* Makefile.am (libpanel_applet_la_SOURCES): Added mico-parse.cc.
(panel_SOURCES): Likewise.
* cdplayer/cdplayer.c (main): Use new gnome_init.
* logout.c (main): Use new gnome_init.
* clock.c (main): Use new gnome_init.
* applet-lib.cc (gnome_panel_applet_init_corba): Use
panel_initialize_corba.
* mico-parse.cc: New file.
* mico-glue.cc (panel_corba_gtk_main): Use
panel_initialize_corba.
* main.c (init_session_management): Removed.
(main): Use new session and argument parsing code.
* mico-glue.h (corba_gtk_main): Removed.
(panel_corba_register_arguments): Declare.
Fri Mar 06 20:57:04 1998 George Lebl <jirka@5z.com>
* main.c,panel.c: external applets are now started
......
Sun Mar 8 18:55:09 1998 Tom Tromey <tromey@cygnus.com>
* Makefile.am (INCLUDES): Include GNOME_INCLUDEDIR.
Sat Mar 7 13:39:41 1998 Tom Tromey <tromey@cygnus.com>
* Makefile.am (libpanel_applet_la_SOURCES): Added mico-parse.cc.
(panel_SOURCES): Likewise.
* cdplayer/cdplayer.c (main): Use new gnome_init.
* logout.c (main): Use new gnome_init.
* clock.c (main): Use new gnome_init.
* applet-lib.cc (gnome_panel_applet_init_corba): Use
panel_initialize_corba.
* mico-parse.cc: New file.
* mico-glue.cc (panel_corba_gtk_main): Use
panel_initialize_corba.
* main.c (init_session_management): Removed.
(main): Use new session and argument parsing code.
* mico-glue.h (corba_gtk_main): Removed.
(panel_corba_register_arguments): Declare.
Fri Mar 06 20:57:04 1998 George Lebl <jirka@5z.com>
* main.c,panel.c: external applets are now started
......
......@@ -10,7 +10,7 @@ test:
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-I$(includedir)
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = panel clock_applet launcher_applet logout_applet
......@@ -26,6 +26,7 @@ lib_LTLIBRARIES = libpanel_applet.la
libpanel_applet_la_SOURCES = \
applet-lib.cc \
applet-widget.c \
mico-parse.cc \
$(CORBA_SOURCES)
#libpanel_appletinclude_HEADERS = applet-lib.h \
......@@ -52,6 +53,7 @@ panel_SOURCES = \
menu.h \
mico-glue.cc \
mico-glue.h \
mico-parse.cc \
panel.c \
panel.h \
panel_config.c \
......
......@@ -73,10 +73,9 @@ gnome_panel_applet_init_corba (int *argc, char ***argv)
if (!iior)
return 0;
orb_ptr = CORBA::ORB_init (*argc, *argv, "mico-local-orb");
boa_ptr = orb_ptr->BOA_init (*argc, *argv, "mico-local-boa");
panel_initialize_corba (&orb_ptr, &boa_ptr)
orb_ptr->dispatcher (new GtkDispatcher ());
CORBA::Object_var obj = orb_ptr->string_to_object (iior);
......
......@@ -211,8 +211,9 @@ main(int argc, char **argv)
{
GtkWidget *clock;
char *result;
gnome_init("clock_applet", &argc, &argv);
panel_corba_register_arguments ();
gnome_init("clock_applet", NULL, argc, argv, 0, NULL);
if (!gnome_panel_applet_init_corba (&argc, &argv)){
fprintf (stderr, "Could not comunicate with the panel\n");
......
......@@ -48,7 +48,8 @@ main(int argc, char *argv[])
GtkWidget *logout;
char *result;
gnome_init("logout_applet", &argc, &argv);
panel_corba_register_arguments ();
gnome_init("logout_applet", NULL, argc, argv, 0, NULL);
if(!gnome_panel_applet_init_corba(&argc, &argv))
{
......
......@@ -445,29 +445,22 @@ init_user_panels(void)
}
/* FIXME: session management not complete. In particular, we should:
1. Actually save state in a useful way. */
static void
init_session_management (int argc, char *argv[])
{
client = gnome_client_new (argc, argv);
gtk_signal_connect (GTK_OBJECT (client), "save_yourself",
GTK_SIGNAL_FUNC (panel_session_save), NULL);
}
int
main(int argc, char **argv)
{
GtkWidget *base_panel;
char buf[256];
gnome_init("panel", &argc, &argv);
bindtextdomain(PACKAGE, GNOMELOCALEDIR);
textdomain(PACKAGE);
init_session_management (argc, argv);
client = gnome_client_new_default ();
gtk_signal_connect (GTK_OBJECT (client), "save_yourself",
GTK_SIGNAL_FUNC (panel_session_save), NULL);
panel_corba_register_arguments ();
gnome_init("panel", NULL, argc, argv, 0, NULL);
create_applet_menu();
......@@ -499,6 +492,6 @@ main(int argc, char **argv)
printf ("starting corba looop\n");
/* I use the glue code to avoid making this a C++ file */
panel_corba_gtk_main (&argc, &argv, "IDL:GNOME/Panel:1.0");
return 0;
}
......@@ -6,6 +6,7 @@
#include "gnome-panel.h"
#include "panel.h"
/* This implements the server-side of the gnome-panel.idl
* specification Currently there is no way to create new CORBA
* "instances" of the panel, as there is only one panel running on the
......@@ -73,8 +74,7 @@ panel_corba_gtk_main (int *argc, char ***argv, char *service_name)
char hostname [4096];
char *name;
orb_ptr = CORBA::ORB_init (*argc, *argv, "mico-local-orb");
boa_ptr = orb_ptr->BOA_init (*argc, *argv, "mico-local-boa");
panel_initialize_corba (&orb_ptr, &boa_ptr);
gethostname (hostname, sizeof (hostname));
if (hostname [0] == 0)
......
BEGIN_GNOME_DECLS
void corba_gtk_main (int *argc, char ***argv, char *service_name, void *corba_object);
void panel_corba_register_arguments (void);
void panel_corba_gtk_main (int *argc, char ***argv, char *service_name);
void send_applet_session_save (const char *ior, int id, int panel, int pos);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment