Commit 54360a14 authored by Jiri (George) Lebl's avatar Jiri (George) Lebl Committed by George Lebl

fixed a cpl of warnings

Wed Mar 11 22:42:39 1998  George Lebl  <jirka@5z.com>

        * menu.c: fixed a cpl of warnings

        * panel.c: for some reason not unreffing internal applets makes
          shutdown not segfault.

        * panel.c: fixed a bug with multple applets

        * clock.c: shutdown now kills the applet (this causes
          an exception)

        * mico-glue.cc: catch exceptions on shutdown

        * ChangeLog: :%s/\<teh\>/the/g
parent c9ffe80d
Wed Mar 11 22:42:39 1998 George Lebl <jirka@5z.com>
* menu.c: fixed a cpl of warnings
* panel.c: for some reason not unreffing internal applets makes
shutdown not segfault.
* panel.c: fixed a bug with multple applets
* clock.c: shutdown now kills the applet (this causes
an exception)
* mico-glue.cc: catch exceptions on shutdown
* ChangeLog: :%s/\<teh\>/the/g
Wed Mar 11 18:15:41 1998 George Lebl <jirka@5z.com>
* gnome-panel.idl, mico-glue.(cc,h), panel.c: session save is
......@@ -15,7 +31,7 @@ Wed Mar 11 12:33:56 1998 Tom Tromey <tromey@cygnus.com>
Wed Mar 11 00:00:49 1998 George Lebl <jirka@5z.com>
* gnome-panel.idl, and just about every file: external applets
now get restarted nicely. teh session saving stuff slightly
now get restarted nicely. the session saving stuff slightly
revamped ... just as the starting stuff ... makes more sense
now. it still segfaults but oh well ...
......@@ -76,7 +92,7 @@ Thu Mar 05 22:22:53 1998 George Lebl <jirka@5z.com>
"applet_move" and got rid of restore_state signal. this
makes it possible for the drawers to move themselves
appropriately. initialization cleaned up and should work
fine for orientation otehr then bottom
fine for orientation other then bottom
Wed Mar 04 23:28:44 1998 George Lebl <jirka@5z.com>
......@@ -222,7 +238,7 @@ Sat Feb 21 01:21:40 1998 George Lebl <jirka@5z.com>
Sat Feb 21 00:24:30 1998 George Lebl <jirka@5z.com>
* applet-widget.[ch]: simple applet widget with a window
and an event box so that events get trapped by teh applet
and an event box so that events get trapped by the applet
and not partly by the panel.
* gnome-panel.idl: added a callback for button presses, and
......@@ -492,7 +508,7 @@ Sun Jan 25 18:58:07 1998 George Lebl <jirka@5z.com>
* menu/main.c: fixed orientation changes affecting only one menu
* panel.c: added "add main menu" to panel menu, switched "remove
applet" with "move applet" to avoid removing teh applet by
applet" with "move applet" to avoid removing the applet by
mistake
* applet_cmds.h: orientation is passed though params for greater
......@@ -611,7 +627,7 @@ Sun Jan 18 11:17:27 1998 Tom Tromey <tromey@cygnus.com>
Sun Jan 18 18:46:28 1998 George Lebl <jirka@5z.com>
* mailcheck/mailcheck.c: now actually captures teh expose event
* mailcheck/mailcheck.c: now actually captures the expose event
and redraws itself
* panel_cmds.h,panel.c: added a change size notify command, the
......@@ -648,7 +664,7 @@ Sat Jan 17 03:11:40 1998 George Lebl <jirka@5z.com>
Sat Jan 17 02:15:08 1998 George Lebl <jirka@5z.com>
* launcher/launcher.c: a bit of restructuring, now properties can
be changed, stuff will be updated in real time and teh dialog
be changed, stuff will be updated in real time and the dialog
isn't modal
Fri Jan 16 22:07:24 1998 George Lebl <jirka@5z.com>
......@@ -699,7 +715,7 @@ Fri Jan 16 03:17:15 1998 George Lebl <jirka@5z.com>
Fri Jan 16 01:45:30 1998 George Lebl <jirka@5z.com>
* panel.[ch]: tehre will allways be one menu,
* panel.[ch]: there will allways be one menu,
(last one can't get deleted) and moving from the menu now works
Thu Jan 15 21:54:31 1998 George Lebl <jirka@5z.com>
......
Wed Mar 11 22:42:39 1998 George Lebl <jirka@5z.com>
* menu.c: fixed a cpl of warnings
* panel.c: for some reason not unreffing internal applets makes
shutdown not segfault.
* panel.c: fixed a bug with multple applets
* clock.c: shutdown now kills the applet (this causes
an exception)
* mico-glue.cc: catch exceptions on shutdown
* ChangeLog: :%s/\<teh\>/the/g
Wed Mar 11 18:15:41 1998 George Lebl <jirka@5z.com>
* gnome-panel.idl, mico-glue.(cc,h), panel.c: session save is
......@@ -15,7 +31,7 @@ Wed Mar 11 12:33:56 1998 Tom Tromey <tromey@cygnus.com>
Wed Mar 11 00:00:49 1998 George Lebl <jirka@5z.com>
* gnome-panel.idl, and just about every file: external applets
now get restarted nicely. teh session saving stuff slightly
now get restarted nicely. the session saving stuff slightly
revamped ... just as the starting stuff ... makes more sense
now. it still segfaults but oh well ...
......@@ -76,7 +92,7 @@ Thu Mar 05 22:22:53 1998 George Lebl <jirka@5z.com>
"applet_move" and got rid of restore_state signal. this
makes it possible for the drawers to move themselves
appropriately. initialization cleaned up and should work
fine for orientation otehr then bottom
fine for orientation other then bottom
Wed Mar 04 23:28:44 1998 George Lebl <jirka@5z.com>
......@@ -222,7 +238,7 @@ Sat Feb 21 01:21:40 1998 George Lebl <jirka@5z.com>
Sat Feb 21 00:24:30 1998 George Lebl <jirka@5z.com>
* applet-widget.[ch]: simple applet widget with a window
and an event box so that events get trapped by teh applet
and an event box so that events get trapped by the applet
and not partly by the panel.
* gnome-panel.idl: added a callback for button presses, and
......@@ -492,7 +508,7 @@ Sun Jan 25 18:58:07 1998 George Lebl <jirka@5z.com>
* menu/main.c: fixed orientation changes affecting only one menu
* panel.c: added "add main menu" to panel menu, switched "remove
applet" with "move applet" to avoid removing teh applet by
applet" with "move applet" to avoid removing the applet by
mistake
* applet_cmds.h: orientation is passed though params for greater
......@@ -611,7 +627,7 @@ Sun Jan 18 11:17:27 1998 Tom Tromey <tromey@cygnus.com>
Sun Jan 18 18:46:28 1998 George Lebl <jirka@5z.com>
* mailcheck/mailcheck.c: now actually captures teh expose event
* mailcheck/mailcheck.c: now actually captures the expose event
and redraws itself
* panel_cmds.h,panel.c: added a change size notify command, the
......@@ -648,7 +664,7 @@ Sat Jan 17 03:11:40 1998 George Lebl <jirka@5z.com>
Sat Jan 17 02:15:08 1998 George Lebl <jirka@5z.com>
* launcher/launcher.c: a bit of restructuring, now properties can
be changed, stuff will be updated in real time and teh dialog
be changed, stuff will be updated in real time and the dialog
isn't modal
Fri Jan 16 22:07:24 1998 George Lebl <jirka@5z.com>
......@@ -699,7 +715,7 @@ Fri Jan 16 03:17:15 1998 George Lebl <jirka@5z.com>
Fri Jan 16 01:45:30 1998 George Lebl <jirka@5z.com>
* panel.[ch]: tehre will allways be one menu,
* panel.[ch]: there will allways be one menu,
(last one can't get deleted) and moving from the menu now works
Thu Jan 15 21:54:31 1998 George Lebl <jirka@5z.com>
......
......@@ -196,7 +196,8 @@ shutdown_applet(int id)
puts("SHUTDOWN_APPLET");
/*kill our window*/
gtk_widget_unref(aw);
gtk_timeout_add(100,applet_die,NULL);
exit(0);
//gtk_timeout_add(100,applet_die,NULL);
}
......@@ -232,6 +233,10 @@ main(int argc, char **argv)
/*use cfg path for loading up data!*/
/*puts("CONFIG PATH");
puts(cfgpath);
puts("-----------");*/
g_free(cfgpath);
clock = create_clock_widget (GTK_WIDGET(aw));
......
......@@ -50,6 +50,9 @@ load_applet(char *id, char *params, int pos, int panel, char *cfgpath)
reserve_applet_spot (cfgpath, params, panel, pos);
puts("-------------------------------------------");
puts(" LOADING EXTERN APPLET");
puts("-------------------------------------------");
command = g_copy_strings ("(true;", params, ") &", NULL);
system (command);
......
......@@ -733,9 +733,10 @@ set_menu_applet_orient(Menu *menu, MenuOrient orient)
/*FIXME: these guys need arrows as well*/
pixmap_name = gnome_unconditional_pixmap_file ("gnome-folder.png");
pixmap=GTK_BUTTON(menu->button)->child;
pixmap=GTK_BIN(menu->button)->child;
gtk_container_remove(GTK_CONTAINER(menu->button),pixmap);
gtk_widget_destroy(pixmap);
/*this is done by remove right?*/
/*gtk_widget_unref(pixmap);*/
/*make the pixmap*/
pixmap = gnome_pixmap_new_from_file_at_size (pixmap_name,
......
......@@ -119,7 +119,12 @@ send_applet_shutdown_applet (const char *ior, int id)
GNOME::Applet_var applet = GNOME::Applet::_narrow (obj);
/* Now, use corba to invoke the routine in the panel */
applet->shutdown_applet(id);
try {
applet->shutdown_applet(id);
} catch ( ... ) {
/*FIXME: only incomplete exception handeled here*/
puts("EXCEPTION");
}
}
void
......@@ -136,10 +141,10 @@ send_applet_change_orient (const char *ior, int id, int orient)
void
send_applet_do_callback (const char *ior, int id, char *callback_name)
{
/* Use the ior that was sent to us to get an Applet CORBA object */
CORBA::Object_var obj = orb_ptr->string_to_object (ior);
GNOME::Applet_var applet = GNOME::Applet::_narrow (obj);
/* Now, use corba to invoke the routine in the panel */
applet->do_callback(id, callback_name);
/* Use the ior that was sent to us to get an Applet CORBA object */
CORBA::Object_var obj = orb_ptr->string_to_object (ior);
GNOME::Applet_var applet = GNOME::Applet::_narrow (obj);
/* Now, use corba to invoke the routine in the panel */
applet->do_callback(id, callback_name);
}
......@@ -299,12 +299,12 @@ panel_session_save (GnomeClient *client,
for(i=0,list=applets;list!=NULL;list = g_list_next(list),i++) {
info = list->data;
if(info->type == APPLET_EXTERN) {
puts("EXTERN");
printf("SHUTTING DOWN EXTERN (%d)\n",i);
send_applet_shutdown_applet(info->id,i);
puts("DONE");
} else {
puts("INTERNAL");
gtk_widget_unref(info->widget);
} else if(info->type != APPLET_EXTERN_PENDING) {
puts("SHUTTING DOWN INTERNAL");
//gtk_widget_unref(info->widget);
puts("DONE");
}
}
......@@ -544,7 +544,7 @@ applet_drag_stop(int id)
void
applet_add_callback(short id, char *callback_name, char *menuitem_text)
{
g_warning("Unimplemented\n");
g_warning("Unimplemented\n");
}
int
......@@ -562,23 +562,14 @@ applet_request_id (const char * ior, const char *path, char **cfgpath)
strcmp(info->params,path)==0) {
*cfgpath = info->id;
info->id = g_strdup(ior);
/*we started this and already reserved a spot
for it, including the eventbox widget*/
return i;
}
}
reserve_applet_spot (ior, path, 0, 0);
info = g_new(AppletInfo,1);
info->type = APPLET_EXTERN_PENDING;
info->widget = NULL;
info->assoc = NULL;
info->data = NULL;
info->id = g_strdup(ior);
info->params = g_strdup(path);
info->flags = 0;
*cfgpath = g_strdup("");
applets = g_list_append(applets,info);
return i;
}
......
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