Removed unused Cfg_File struct. Some formatting

SVN revision: 21377
This commit is contained in:
Christopher Michael 2006-03-18 16:46:00 +00:00
parent 03f97999f3
commit 575ac23a71
2 changed files with 14 additions and 48 deletions

View File

@ -3,8 +3,6 @@
#include "e_mod_config.h"
#include "config.h"
typedef struct _Cfg_File_Data Cfg_File_Data;
struct _E_Config_Dialog_Data
{
int quality;
@ -14,12 +12,6 @@ struct _E_Config_Dialog_Data
double shadow_darkness;
};
struct _Cfg_File_Data
{
E_Config_Dialog *cfd;
char *file;
};
/* Protos */
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
@ -50,47 +42,27 @@ _fill_data(Dropshadow *ds, E_Config_Dialog_Data *cfdata)
cfdata->blur_size = ds->conf->blur_size;
cfdata->shadow_x = ds->conf->shadow_x;
if (cfdata->shadow_x >= 32)
{
cfdata->shadow_x = 32;
}
cfdata->shadow_x = 32;
else if ((cfdata->shadow_x < 32) && (cfdata->shadow_x >= 16))
{
cfdata->shadow_x = 16;
}
cfdata->shadow_x = 16;
else if ((cfdata->shadow_x < 16) && (cfdata->shadow_x >= 8))
{
cfdata->shadow_x = 8;
}
cfdata->shadow_x = 8;
else if ((cfdata->shadow_x < 8) && (cfdata->shadow_x >= 4))
{
cfdata->shadow_x = 4;
}
cfdata->shadow_x = 4;
else if ((cfdata->shadow_x < 4) && (cfdata->shadow_x >= 2))
{
cfdata->shadow_x = 2;
}
cfdata->shadow_x = 2;
else if ((cfdata->shadow_x < 2) && (cfdata->shadow_x >= 0))
{
cfdata->shadow_x = 0;
}
cfdata->shadow_x = 0;
cfdata->shadow_darkness = ds->conf->shadow_darkness;
if (cfdata->shadow_darkness == 1.0)
{
cfdata->darkness = 0;
}
cfdata->darkness = 0;
else if (cfdata->shadow_darkness == 0.75)
{
cfdata->darkness = 1;
}
cfdata->darkness = 1;
else if (cfdata->shadow_darkness == 0.5)
{
cfdata->darkness = 2;
}
cfdata->darkness = 2;
else if (cfdata->shadow_darkness == 0.25)
{
cfdata->darkness = 3;
}
cfdata->darkness = 3;
}
static void *

View File

@ -3,8 +3,6 @@
#include "e_mod_config.h"
#include "config.h"
typedef struct _Cfg_File_Data Cfg_File_Data;
struct _E_Config_Dialog_Data
{
int show_name;
@ -13,12 +11,6 @@ struct _E_Config_Dialog_Data
double popup_speed;
};
struct _Cfg_File_Data
{
E_Config_Dialog *cfd;
char *file;
};
/* Protos */
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
@ -128,7 +120,8 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
p->conf->popup = cfdata->show_popup;
p->conf->deskname_pos = cfdata->name_pos;
if (!cfdata->show_name) p->conf->deskname_pos = PAGER_DESKNAME_NONE;
if (!cfdata->show_name)
p->conf->deskname_pos = PAGER_DESKNAME_NONE;
e_config_save_queue();
@ -185,7 +178,8 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
p->conf->popup = cfdata->show_popup;
p->conf->deskname_pos = cfdata->name_pos;
if (!cfdata->show_name) p->conf->deskname_pos = PAGER_DESKNAME_NONE;
if (!cfdata->show_name)
p->conf->deskname_pos = PAGER_DESKNAME_NONE;
p->conf->popup_speed = cfdata->popup_speed;
e_border_button_bindings_grab_all();