nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed some segfault and memleak

Browse source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@195 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
lorthiois@bbsoft.fr 2009-09-25 19:11:50 +00:00
parent f81e1b2e90
commit 7b570efb8f
4 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/battery/battery.c
View file

@ -47,7 +47,7 @@ char *path_energy_now, *path_energy_full, *path_current_now, *path_status;
void init_battery()
{
// check battery
GDir *directory;
GDir *directory = 0;
GError *error = NULL;
const char *entryname;
char *battery_dir = 0;
@ -69,7 +69,9 @@ void init_battery()
g_free(path1);
}
}
if (battery_dir != 0) {
if (directory)
g_dir_close(directory);
if (battery_dir) {
char *path1 = g_build_filename(battery_dir, "energy_now", NULL);
if (g_file_test (path1, G_FILE_TEST_EXISTS)) {
path_energy_now = g_build_filename(battery_dir, "energy_now", NULL);
@ -161,6 +163,9 @@ void init_battery()
battery->bat1_posy -= ((bat_time_height_ink + 2) / 2);
battery->bat2_posy = battery->bat1_posy + bat_percentage_height + 2 - (bat_percentage_height - bat_percentage_height_ink)/2 - (bat_time_height - bat_time_height_ink)/2;
}
if (battery_dir)
g_free(battery_dir);
}

4
src/systray/systraybar.c
View file

@ -180,7 +180,7 @@ int init_net()
int actual_format;
unsigned long nitems;
unsigned long bytes_after;
unsigned char *prop;
unsigned char *prop = 0;
int pid;
_NET_WM_PID = XInternAtom(server.dsp, "_NET_WM_PID", True);
@ -189,7 +189,7 @@ int init_net()
int ret = XGetWindowProperty(server.dsp, win, _NET_WM_PID, 0, 1024, False, AnyPropertyType, &actual_type, &actual_format, &nitems, &bytes_after, &prop);
fprintf(stderr, "tint2 : another systray is running");
if (ret == 0) {
if (ret == Success && prop) {
pid = prop[1] * 256;
pid += prop[0];
fprintf(stderr, " pid=%d", pid);

22
src/taskbar/task.c
View file

@ -180,6 +180,10 @@ void get_icon (Task *tsk)
{
Panel *panel = tsk->area.panel;
if (!panel->g_task.icon) return;
int i;
Imlib_Image img = NULL;
XWMHints *hints = 0;
long *data = 0;
if (tsk->icon) {
imlib_context_set_image(tsk->icon);
@ -190,9 +194,7 @@ void get_icon (Task *tsk)
}
tsk->area.redraw = 1;
int i;
Imlib_Image img = NULL;
long *data = server_get_property (tsk->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i);
data = server_get_property (tsk->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i);
if (data) {
// get ARGB icon
int w, h;
@ -210,11 +212,10 @@ void get_icon (Task *tsk)
#else
img = imlib_create_image_using_data (w, h, (DATA32*)tmp_data);
#endif
XFree (data);
}
else {
// get Pixmap icon
XWMHints *hints = XGetWMHints(server.dsp, tsk->win);
hints = XGetWMHints(server.dsp, tsk->win);
if (hints) {
if (hints->flags & IconPixmapHint && hints->icon_pixmap != 0) {
// get width, height and depth for the pixmap
@ -229,7 +230,6 @@ void get_icon (Task *tsk)
img = imlib_create_image_from_drawable(hints->icon_mask, 0, 0, w, h, 0);
}
}
XFree(hints);
}
if (img == NULL) {
imlib_context_set_image(default_icon);
@ -239,7 +239,10 @@ void get_icon (Task *tsk)
// transform icons
imlib_context_set_image(img);
imlib_image_set_has_alpha(1);
tsk->icon = imlib_create_cropped_scaled_image(0, 0, imlib_image_get_width(), imlib_image_get_height(), panel->g_task.icon_size1, panel->g_task.icon_size1);
int w, h;
w = imlib_image_get_width();
h = imlib_image_get_height();
tsk->icon = imlib_create_cropped_scaled_image(0, 0, w, h, panel->g_task.icon_size1, panel->g_task.icon_size1);
imlib_free_image();
imlib_context_set_image(tsk->icon);
@ -260,6 +263,11 @@ void get_icon (Task *tsk)
adjust_asb(data32, tsk->icon_width, tsk->icon_height, panel->g_task.alpha_active, (float)panel->g_task.saturation_active/100, (float)panel->g_task.brightness_active/100);
imlib_image_put_back_data(data32);
}
if (hints)
XFree(hints);
if (data)
XFree (data);
}

2
src/tint.c
View file

@ -810,6 +810,8 @@ load_config:
break;
case ConfigureNotify:
//XMoveWindow(dpy, fen, pos_x, pos_y);
//XResizeWindow(dpy, fen, largeur, hauteur);
if (e.xconfigure.window == server.root_win)
goto load_config;
else