Commit 086bea9a authored by Arturo Espinosa's avatar Arturo Espinosa

Attempts to get the Panel compiling after the argp changes -mig

parent 8a97b7e4
......@@ -21,7 +21,7 @@ static GtkWidget *applet_menu_prop_item;
#define APPLET_ID_KEY "applet_id_key"
#define APPLET_WIDGET_KEY "applet_widget_key"
static CORBA::ORB_ptr orb_ptr;
CORBA::ORB_ptr orb_ptr;
static CORBA::BOA_ptr boa_ptr;
/*every applet must implement these*/
......@@ -74,7 +74,7 @@ gnome_panel_applet_init_corba (int *argc, char ***argv)
if (!iior)
return 0;
panel_initialize_corba (&orb_ptr, &boa_ptr)
panel_initialize_corba (&orb_ptr, &boa_ptr);
orb_ptr->dispatcher (new GtkDispatcher ());
......
......@@ -578,7 +578,7 @@ create_panel_menu (GtkWidget *window, char *menudir, int main_menu,
}
else
/*FIXME: these guys need arrows as well*/
pixmap_name = gnome_unconditional_pixmap_file ("panel-folder.xpm");
pixmap_name = gnome_unconditional_pixmap_file ("gnome-folder.png");
menu->orient = orient;
......@@ -730,7 +730,7 @@ set_menu_applet_orient(Menu *menu, MenuOrient orient)
}
else
/*FIXME: these guys need arrows as well*/
pixmap_name = gnome_unconditional_pixmap_file ("panel-folder.xpm");
pixmap_name = gnome_unconditional_pixmap_file ("gnome-folder.png");
pixmap=GTK_BUTTON(menu->button)->child;
gtk_container_remove(GTK_CONTAINER(menu->button),pixmap);
......
......@@ -7,4 +7,9 @@ void send_applet_session_save (const char *ior, int id, int panel, int pos);
void send_applet_shutdown_applet (const char *ior, int id);
void send_applet_change_orient (const char *ior, int id, int orient);
void send_applet_do_callback (const char *ior, int id, char *callback_name);
#ifdef __cplusplus
void panel_initialize_corba (CORBA::ORB_ptr *orb, CORBA::BOA_ptr *boa);
#endif
END_GNOME_DECLS
......@@ -95,9 +95,13 @@ panel_corba_register_arguments (void)
gnome_parse_register_arguments (&our_mico_parser);
}
extern CORBA::ORB_ptr orb_ptr;
void
panel_initialize_corba (CORBA::ORB_ptr *orb, CORBA::BOA_ptr *boa)
{
int i;
our_mico_argv[our_mico_argc] = NULL;
*orb = CORBA::ORB_init (our_mico_argc, our_mico_argv,
"mico-local-orb");
......
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