Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved initial values in function default_xxx

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@423 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77
2010-04-18 12:07:36 +00:00
parent a94d75d393
commit c298a39d00
21 changed files with 243 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/battery/battery.c
View File

@@ -33,23 +33,23 @@
#include "clock.h"
#include "timer.h"
PangoFontDescription *bat1_font_desc=0;
PangoFontDescription *bat2_font_desc=0;
PangoFontDescription *bat1_font_desc;
PangoFontDescription *bat2_font_desc;
struct batstate battery_state;
int battery_enabled;
int percentage_hide;
static timeout* battery_timeout=0;
static timeout* battery_timeout;
static char buf_bat_percentage[10];
static char buf_bat_time[20];
int8_t battery_low_status;
unsigned char battery_low_cmd_send;
char *battery_low_cmd=0;
char *path_energy_now=0;
char *path_energy_full=0;
char *path_current_now=0;
char *path_status=0;
char *battery_low_cmd;
char *path_energy_now;
char *path_energy_full;
char *path_current_now;
char *path_status;
void update_batterys(void* arg)
{
@@ -77,6 +77,32 @@ void update_batterys(void* arg)
}
}
void default_battery()
{
battery_enabled = 0;
percentage_hide = 101;
battery_low_cmd_send = 0;
battery_timeout = 0;
bat1_font_desc = 0;
bat2_font_desc = 0;
battery_low_cmd = 0;
path_energy_now = 0;
path_energy_full = 0;
path_current_now = 0;
path_status = 0;
}
void cleanup_battery()
{
if (bat1_font_desc) pango_font_description_free(bat1_font_desc);
if (bat2_font_desc) pango_font_description_free(bat2_font_desc);
if (path_energy_now) g_free(path_energy_now);
if (path_energy_full) g_free(path_energy_full);
if (path_current_now) g_free(path_current_now);
if (path_status) g_free(path_status);
if (battery_low_cmd) g_free(battery_low_cmd);
}
void init_battery()
{
@@ -156,43 +182,6 @@ void init_battery()
}
void cleanup_battery()
{
battery_enabled = 0;
percentage_hide = 101;
battery_low_cmd_send = 0;
if (bat1_font_desc) {
pango_font_description_free(bat1_font_desc);
bat1_font_desc = 0;
}
if (bat2_font_desc) {
pango_font_description_free(bat2_font_desc);
bat2_font_desc = 0;
}
if (path_energy_now) {
g_free(path_energy_now);
path_energy_now = 0;
}
if (path_energy_full) {
g_free(path_energy_full);
path_energy_full = 0;
}
if (path_current_now) {
g_free(path_current_now);
path_current_now = 0;
}
if (path_status) {
g_free(path_status);
path_status = 0;
}
if (battery_low_cmd) {
g_free(battery_low_cmd);
battery_low_cmd = 0;
}
}
void init_battery_panel(void *p)
{
Panel *panel = (Panel*)p;

7
src/battery/battery.h
View File

@@ -57,6 +57,10 @@ extern int8_t battery_low_status;
extern char *battery_low_cmd;
extern char *path_energy_now, *path_energy_full, *path_current_now, *path_status;
// default values
void default_battery();
// freed memory
void cleanup_battery();
// initialize clock : y position, ...
void update_battery();
@@ -64,9 +68,6 @@ void update_battery();
void init_battery();
void init_battery_panel(void *panel);
// freed memory and set default values
void cleanup_battery();
void draw_battery(void *obj, cairo_t *c);
void resize_battery(void *obj);