DeforaOS/Panel
DeforaOS/Panel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now freeing resources when destroyed

Browse Source
This commit is contained in:
Pierre Pronchery 2010-05-06 23:50:01 +00:00
parent 76f421791a
commit 3e9acbff2d
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/applets/keyboard.c
View File

@ -35,12 +35,14 @@
typedef struct _Keyboard typedef struct _Keyboard
{ {
PanelAppletHelper * helper; PanelAppletHelper * helper;
GPid pid;
GtkWidget * window; GtkWidget * window;
} Keyboard; } Keyboard;
/* prototypes */ /* prototypes */
static GtkWidget * _keyboard_init(PanelApplet * applet); static GtkWidget * _keyboard_init(PanelApplet * applet);
static void _keyboard_destroy(PanelApplet * applet);
/* callbacks */ /* callbacks */
static void _on_keyboard_toggled(GtkWidget * widget, gpointer data); static void _on_keyboard_toggled(GtkWidget * widget, gpointer data);
@ -52,7 +54,7 @@ PanelApplet applet =
{ {
NULL, NULL,
_keyboard_init, _keyboard_init,
NULL, _keyboard_destroy,
PANEL_APPLET_POSITION_START, PANEL_APPLET_POSITION_START,
FALSE, FALSE,
TRUE, TRUE,
@ -74,6 +76,7 @@ static GtkWidget * _keyboard_init(PanelApplet * applet)
if((keyboard = malloc(sizeof(*keyboard))) == NULL) if((keyboard = malloc(sizeof(*keyboard))) == NULL)
return NULL; return NULL;
keyboard->helper = applet->helper; keyboard->helper = applet->helper;
keyboard->pid = -1;
keyboard->window = NULL; keyboard->window = NULL;
ret = gtk_toggle_button_new(); ret = gtk_toggle_button_new();
gtk_button_set_relief(GTK_BUTTON(ret), GTK_RELIEF_NONE); gtk_button_set_relief(GTK_BUTTON(ret), GTK_RELIEF_NONE);
@ -100,8 +103,9 @@ static gboolean _init_idle(gpointer data)
if(keyboard->window != NULL) if(keyboard->window != NULL)
return FALSE; return FALSE;
if(g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, if(g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL,
NULL, NULL, NULL, NULL, &out, NULL, &error) != TRUE) NULL, &keyboard->pid, NULL, &out, NULL, &error)
!= TRUE)
return keyboard->helper->error(keyboard->helper->priv, return keyboard->helper->error(keyboard->helper->priv,
argv[0], FALSE); argv[0], FALSE);
if((size = read(out, buf, sizeof(buf) - 1)) <= 0) /* XXX may block */ if((size = read(out, buf, sizeof(buf) - 1)) <= 0) /* XXX may block */
@ -120,6 +124,17 @@ static gboolean _init_idle(gpointer data)
} }
/* keyboard_destroy */
static void _keyboard_destroy(PanelApplet * applet)
{
Keyboard * keyboard = applet->priv;
if(keyboard->pid > 0)
g_spawn_close_pid(keyboard->pid); /* XXX may be dead already */
free(keyboard);
}
/* callbacks */ /* callbacks */
/* on_keyboard_toggled */ /* on_keyboard_toggled */
static void _on_keyboard_toggled(GtkWidget * widget, gpointer data) static void _on_keyboard_toggled(GtkWidget * widget, gpointer data)