resi
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warnings 

SVN revision: 23032
This commit is contained in:
sebastid 2006-05-31 18:58:26 +00:00 committed by sebastid
parent c2d2b54e25
commit 715a64d5fe
10 changed files with 79 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/e_config_dialog.c
View File

@ -293,8 +293,7 @@ static void
_e_config_dialog_cb_changed(void *data, Evas_Object *obj) _e_config_dialog_cb_changed(void *data, Evas_Object *obj)
{ {
E_Config_Dialog *cfd; E_Config_Dialog *cfd;
int ok = 0;
cfd = data; cfd = data;
if (!cfd->hide_buttons) if (!cfd->hide_buttons)
{ {

136
src/bin/e_eap_editor.c
View File

@ -1,7 +1,6 @@
#include "e.h" #include "e.h"
typedef struct _E_App_Edit E_App_Edit; typedef struct _E_App_Edit E_App_Edit;
typedef struct _E_App_Edit_CFData E_App_Edit_CFData;
struct _E_App_Edit struct _E_App_Edit
{ {
@ -11,10 +10,10 @@ struct _E_App_Edit
Evas_Object *img_widget; Evas_Object *img_widget;
int img_set; int img_set;
E_App_Edit_CFData *cfdata; E_Config_Dialog_Data *cfdata;
}; };
struct _E_App_Edit_CFData struct _E_Config_Dialog_Data
{ {
/*- BASIC -*/ /*- BASIC -*/
char *name; char *name;
@ -36,13 +35,13 @@ struct _E_App_Edit_CFData
/* local subsystem functions */ /* local subsystem functions */
static void _e_eap_edit_fill_data(E_App_Edit_CFData *cdfata); static void _e_eap_edit_fill_data(E_Config_Dialog_Data *cdfata);
static void *_e_eap_edit_create_data(E_Config_Dialog *cfd); static void *_e_eap_edit_create_data(E_Config_Dialog *cfd);
static void _e_eap_edit_free_data(E_Config_Dialog *cfd, void *data); static void _e_eap_edit_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data);
static int _e_eap_edit_basic_apply_data(E_Config_Dialog *cfd, void *data); static int _e_eap_edit_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data);
static int _e_eap_edit_advanced_apply_data(E_Config_Dialog *cfd, void *data); static int _e_eap_edit_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data);
static Evas_Object *_e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data); static Evas_Object *_e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *data);
static Evas_Object *_e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data); static Evas_Object *_e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *data);
static void _e_eap_edit_select_cb(Evas_Object *obj, char *file, void *data); static void _e_eap_edit_select_cb(Evas_Object *obj, char *file, void *data);
static void _e_eap_edit_hilite_cb(Evas_Object *obj, char *file, void *data); static void _e_eap_edit_hilite_cb(Evas_Object *obj, char *file, void *data);
@ -89,7 +88,7 @@ e_eap_edit_show(E_Container *con, E_App *a)
/* local subsystem functions */ /* local subsystem functions */
static void static void
_e_eap_edit_fill_data(E_App_Edit_CFData *cfdata) _e_eap_edit_fill_data(E_Config_Dialog_Data *cfdata)
{ {
/*- BASIC -*/ /*- BASIC -*/
IFDUP(cfdata->editor->eap->name, cfdata->name); IFDUP(cfdata->editor->eap->name, cfdata->name);
@ -109,9 +108,9 @@ _e_eap_edit_fill_data(E_App_Edit_CFData *cfdata)
static void * static void *
_e_eap_edit_create_data(E_Config_Dialog *cfd) _e_eap_edit_create_data(E_Config_Dialog *cfd)
{ {
E_App_Edit_CFData *cfdata; E_Config_Dialog_Data *cfdata;
cfdata = E_NEW(E_App_Edit_CFData, 1); cfdata = E_NEW(E_Config_Dialog_Data, 1);
if (!cfdata) return NULL; if (!cfdata) return NULL;
cfdata->editor = cfd->data; cfdata->editor = cfd->data;
cfdata->image = NULL; cfdata->image = NULL;
@ -120,47 +119,42 @@ _e_eap_edit_create_data(E_Config_Dialog *cfd)
} }
static void static void
_e_eap_edit_free_data(E_Config_Dialog *cfd, void *data) _e_eap_edit_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data)
{ {
E_App_Edit_CFData *cfdata; E_FREE(data->name);
E_FREE(data->exe);
cfdata = data; E_FREE(data->generic);
E_FREE(cfdata->name); E_FREE(data->comment);
E_FREE(cfdata->exe); E_FREE(data->wname);
E_FREE(cfdata->generic); E_FREE(data->wclass);
E_FREE(cfdata->comment); E_FREE(data->wtitle);
E_FREE(cfdata->wname); E_FREE(data->wrole);
E_FREE(cfdata->wclass); E_FREE(data->iclass);
E_FREE(cfdata->wtitle); E_FREE(data->image);
E_FREE(cfdata->wrole); e_object_unref(E_OBJECT(data->editor->eap));
E_FREE(cfdata->iclass); E_FREE(data->editor);
E_FREE(cfdata->image);
e_object_unref(E_OBJECT(cfdata->editor->eap));
E_FREE(cfdata->editor);
free(data); free(data);
} }
static int static int
_e_eap_edit_basic_apply_data(E_Config_Dialog *cfd, void *data) _e_eap_edit_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data)
{ {
E_App_Edit *editor; E_App_Edit *editor;
E_App *eap; E_App *eap;
E_App_Edit_CFData *cfdata;
cfdata = data; editor = data->editor;
editor = cfdata->editor;
eap = editor->eap; eap = editor->eap;
if (eap->name) evas_stringshare_del(eap->name); if (eap->name) evas_stringshare_del(eap->name);
if (eap->exe) evas_stringshare_del(eap->exe); if (eap->exe) evas_stringshare_del(eap->exe);
if (eap->image) evas_stringshare_del(eap->image); if (eap->image) evas_stringshare_del(eap->image);
if (cfdata->name) eap->name = evas_stringshare_add(cfdata->name); if (data->name) eap->name = evas_stringshare_add(data->name);
if (cfdata->exe) eap->exe = evas_stringshare_add(cfdata->exe); if (data->exe) eap->exe = evas_stringshare_add(data->exe);
if (cfdata->image) eap->image = evas_stringshare_add(cfdata->image); if (data->image) eap->image = evas_stringshare_add(data->image);
eap->startup_notify = cfdata->startup_notify; eap->startup_notify = data->startup_notify;
eap->wait_exit = cfdata->wait_exit; eap->wait_exit = data->wait_exit;
/* FIXME: hardcoded until the eap editor provides fields to change it */ /* FIXME: hardcoded until the eap editor provides fields to change it */
eap->width = 128; eap->width = 128;
@ -173,14 +167,12 @@ _e_eap_edit_basic_apply_data(E_Config_Dialog *cfd, void *data)
} }
static int static int
_e_eap_edit_advanced_apply_data(E_Config_Dialog *cfd, void *data) _e_eap_edit_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data)
{ {
E_App_Edit *editor; E_App_Edit *editor;
E_App *eap; E_App *eap;
E_App_Edit_CFData *cfdata;
cfdata = data; editor = data->editor;
editor = cfdata->editor;
eap = editor->eap; eap = editor->eap;
if (eap->name) evas_stringshare_del(eap->name); if (eap->name) evas_stringshare_del(eap->name);
@ -195,22 +187,22 @@ _e_eap_edit_advanced_apply_data(E_Config_Dialog *cfd, void *data)
if (eap->win_role) evas_stringshare_del(eap->win_role); if (eap->win_role) evas_stringshare_del(eap->win_role);
if (eap->icon_class) evas_stringshare_del(eap->icon_class); if (eap->icon_class) evas_stringshare_del(eap->icon_class);
if (cfdata->startup_notify) eap->startup_notify = 1; if (data->startup_notify) eap->startup_notify = 1;
else eap->startup_notify = 0; else eap->startup_notify = 0;
if (cfdata->wait_exit) eap->wait_exit = 1; if (data->wait_exit) eap->wait_exit = 1;
else eap->wait_exit = 0; else eap->wait_exit = 0;
if (cfdata->name) eap->name = evas_stringshare_add(cfdata->name); if (data->name) eap->name = evas_stringshare_add(data->name);
if (cfdata->exe) eap->exe = evas_stringshare_add(cfdata->exe); if (data->exe) eap->exe = evas_stringshare_add(data->exe);
if (cfdata->image) eap->image = evas_stringshare_add(cfdata->image); if (data->image) eap->image = evas_stringshare_add(data->image);
if (cfdata->generic) eap->generic = evas_stringshare_add(cfdata->generic); if (data->generic) eap->generic = evas_stringshare_add(data->generic);
if (cfdata->comment) eap->comment = evas_stringshare_add(cfdata->comment); if (data->comment) eap->comment = evas_stringshare_add(data->comment);
if (cfdata->wname) eap->win_name = evas_stringshare_add(cfdata->wname); if (data->wname) eap->win_name = evas_stringshare_add(data->wname);
if (cfdata->wclass) eap->win_class = evas_stringshare_add(cfdata->wclass); if (data->wclass) eap->win_class = evas_stringshare_add(data->wclass);
if (cfdata->wtitle) eap->win_title = evas_stringshare_add(cfdata->wtitle); if (data->wtitle) eap->win_title = evas_stringshare_add(data->wtitle);
if (cfdata->wrole) eap->win_role = evas_stringshare_add(cfdata->wrole); if (data->wrole) eap->win_role = evas_stringshare_add(data->wrole);
if (cfdata->iclass) eap->icon_class = evas_stringshare_add(cfdata->iclass); if (data->iclass) eap->icon_class = evas_stringshare_add(data->iclass);
/* FIXME: hardcoded until the eap editor provides fields to change it */ /* FIXME: hardcoded until the eap editor provides fields to change it */
eap->width = 128; eap->width = 128;
@ -223,16 +215,14 @@ _e_eap_edit_advanced_apply_data(E_Config_Dialog *cfd, void *data)
static Evas_Object * static Evas_Object *
_e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data) _e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *data)
{ {
E_App_Edit_CFData *cfdata;
E_App_Edit *editor; E_App_Edit *editor;
E_App *eap; E_App *eap;
Evas_Object *ol, *o; Evas_Object *ol, *o;
Evas_Object *entry; Evas_Object *entry;
cfdata = data; editor = data->editor;
editor = cfdata->editor;
eap = editor->eap; eap = editor->eap;
ol = e_widget_table_add(evas, 0); ol = e_widget_table_add(evas, 0);
@ -251,12 +241,12 @@ _e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
else if (editor->img_set) else if (editor->img_set)
{ {
editor->img = e_icon_add(evas); editor->img = e_icon_add(evas);
e_icon_file_set(editor->img, cfdata->image); e_icon_file_set(editor->img, data->image);
e_icon_fill_inside_set(editor->img, 1); e_icon_fill_inside_set(editor->img, 1);
} }
editor->img_widget = e_widget_iconsel_add(evas, editor->img, 48, 48, editor->img_widget = e_widget_iconsel_add(evas, editor->img, 48, 48,
&(cfdata->image)); &(data->image));
e_widget_iconsel_select_callback_add(editor->img_widget, _e_eap_edit_select_cb, editor); e_widget_iconsel_select_callback_add(editor->img_widget, _e_eap_edit_select_cb, editor);
e_widget_iconsel_hilite_callback_add(editor->img_widget, _e_eap_edit_hilite_cb, editor); e_widget_iconsel_hilite_callback_add(editor->img_widget, _e_eap_edit_hilite_cb, editor);
e_widget_frametable_object_append(o, editor->img_widget, e_widget_frametable_object_append(o, editor->img_widget,
@ -270,7 +260,7 @@ _e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
0, 0, 1, 1, 0, 0, 1, 1,
1, 1, 1, 1); 1, 1, 1, 1);
entry = e_widget_entry_add(evas, &(cfdata->name)); entry = e_widget_entry_add(evas, &(data->name));
e_widget_min_size_set(entry, 100, 1); e_widget_min_size_set(entry, 100, 1);
e_widget_frametable_object_append(o, entry, e_widget_frametable_object_append(o, entry,
1, 0, 1, 1, 1, 0, 1, 1,
@ -278,7 +268,7 @@ _e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Executable")), e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Executable")),
0, 1, 1, 1, 0, 1, 1, 1,
1, 1, 1, 1); 1, 1, 1, 1);
e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(cfdata->exe)), e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(data->exe)),
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1); 1, 1, 1, 1);
e_widget_table_object_append(ol, o, 1, 0, 1, 1, 1 ,1, 1, 1); e_widget_table_object_append(ol, o, 1, 0, 1, 1, 1 ,1, 1, 1);
@ -287,16 +277,14 @@ _e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
} }
static Evas_Object * static Evas_Object *
_e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data) _e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *data)
{ {
E_App_Edit_CFData *cfdata;
E_App_Edit *editor; E_App_Edit *editor;
E_App *eap; E_App *eap;
Evas_Object *ol, *o; Evas_Object *ol, *o;
Evas_Object *entry; Evas_Object *entry;
cfdata = data; editor = data->editor;
editor = cfdata->editor;
eap = editor->eap; eap = editor->eap;
ol = _e_eap_edit_basic_create_widgets(cfd, evas, data); ol = _e_eap_edit_basic_create_widgets(cfd, evas, data);
@ -308,7 +296,7 @@ _e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data
0, 0, 1, 1, 0, 0, 1, 1,
1, 1, 1, 1); 1, 1, 1, 1);
entry = e_widget_entry_add(evas, &(cfdata->generic)); entry = e_widget_entry_add(evas, &(data->generic));
e_widget_min_size_set(entry, 100, 1); e_widget_min_size_set(entry, 100, 1);
e_widget_frametable_object_append(o, entry, e_widget_frametable_object_append(o, entry,
1, 0, 1, 1, 1, 0, 1, 1,
@ -316,7 +304,7 @@ _e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data
e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Comment")), e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Comment")),
0, 1, 1, 1, 0, 1, 1, 1,
1, 1, 1, 1); 1, 1, 1, 1);
e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(cfdata->comment)), e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(data->comment)),
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1); 1, 1, 1, 1);
e_widget_table_object_append(ol, o, 0, 1, 1, 1, 1 ,1, 1, 1); e_widget_table_object_append(ol, o, 0, 1, 1, 1, 1 ,1, 1, 1);
@ -329,7 +317,7 @@ _e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data
0, 0, 1, 1, 0, 0, 1, 1,
1, 1, 1, 1); 1, 1, 1, 1);
entry = e_widget_entry_add(evas, &(cfdata->wname)); entry = e_widget_entry_add(evas, &(data->wname));
e_widget_min_size_set(entry, 100, 1); e_widget_min_size_set(entry, 100, 1);
e_widget_frametable_object_append(o, entry, e_widget_frametable_object_append(o, entry,
1, 0, 1, 1, 1, 0, 1, 1,
@ -337,19 +325,19 @@ _e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data
e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Window Class")), e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Window Class")),
0, 1, 1, 1, 0, 1, 1, 1,
1, 1, 1, 1); 1, 1, 1, 1);
e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(cfdata->wclass)), e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(data->wclass)),
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1); 1, 1, 1, 1);
e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Window Title")), e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Window Title")),
0, 2, 1, 1, 0, 2, 1, 1,
1, 1, 1, 1); 1, 1, 1, 1);
e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(cfdata->wtitle)), e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(data->wtitle)),
1, 2, 1, 1, 1, 2, 1, 1,
1, 1, 1, 1); 1, 1, 1, 1);
e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Window Role")), e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Window Role")),
0, 3, 1, 1, 0, 3, 1, 1,
1, 1, 1, 1); 1, 1, 1, 1);
e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(cfdata->wrole)), e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(data->wrole)),
1, 3, 1, 1, 1, 3, 1, 1,
1, 1, 1, 1); 1, 1, 1, 1);
e_widget_table_object_append(ol, o, 0, 2, 1, 1, 1 ,1, 1, 1); e_widget_table_object_append(ol, o, 0, 2, 1, 1, 1 ,1, 1, 1);
@ -361,7 +349,7 @@ _e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data
0, 0, 1, 1, 0, 0, 1, 1,
1, 1, 1, 1); 1, 1, 1, 1);
entry = e_widget_entry_add(evas, &(cfdata->iclass)); entry = e_widget_entry_add(evas, &(data->iclass));
e_widget_min_size_set(entry, 100, 1); e_widget_min_size_set(entry, 100, 1);
e_widget_frametable_object_append(o, entry, e_widget_frametable_object_append(o, entry,
1, 0, 1, 1, 1, 0, 1, 1,
@ -372,10 +360,10 @@ _e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data
/*- misc info -*/ /*- misc info -*/
o = e_widget_frametable_add(evas, _("Misc"), 0); o = e_widget_frametable_add(evas, _("Misc"), 0);
e_widget_frametable_object_append(o, e_widget_check_add(evas, _("Startup Notify"), &(cfdata->startup_notify)), e_widget_frametable_object_append(o, e_widget_check_add(evas, _("Startup Notify"), &(data->startup_notify)),
0, 0, 1, 1, 0, 0, 1, 1,
1, 1, 1, 1); 1, 1, 1, 1);
e_widget_frametable_object_append(o, e_widget_check_add(evas, _("Wait Exit"), &(cfdata->wait_exit)), e_widget_frametable_object_append(o, e_widget_check_add(evas, _("Wait Exit"), &(data->wait_exit)),
0, 1, 1, 1, 0, 1, 1, 1,
1, 1, 1, 1); 1, 1, 1, 1);
e_widget_table_object_append(ol, o, 1, 2, 1, 1, 1 ,1, 1, 1); e_widget_table_object_append(ol, o, 1, 2, 1, 1, 1 ,1, 1, 1);

2
src/bin/e_int_config_background.c
View File

@ -93,7 +93,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
static Evas_Object * static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *ot, *of, *il, *im; Evas_Object *o, *ot, *il, *im;
char path[4096]; char path[4096];
ot = e_widget_table_add(evas, 0); ot = e_widget_table_add(evas, 0);

13
src/bin/e_int_config_desklock.c
View File

@ -252,7 +252,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
{ {
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
E_Widget_Check_Data *wd; E_Widget_Check_Data *wd;
E_Widget_Radio_Data *rwd;
#ifdef HAVE_PAM #ifdef HAVE_PAM
E_Radio_Group *rg_auth; E_Radio_Group *rg_auth;
@ -386,21 +385,18 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
static Evas_Object * static Evas_Object *
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *of, *of1, *ob; Evas_Object *of, *ob;
E_Widget_Radio_Data *wd; E_Widget_Radio_Data *wd;
E_Radio_Group *rg, *rg_bkg; E_Radio_Group *rg;
Evas_Object *ot, *ol; Evas_Object *ot;
E_Radio_Group *rg_auth;
Evas_Object *oc;
E_Widget_Check_Data *cwd; E_Widget_Check_Data *cwd;
cfdata->evas = evas; cfdata->evas = evas;
ot = e_widget_table_add(evas, 0); ot = e_widget_table_add(evas, 0);
{ {
Evas_Object *ot1;
/* start: bkg list */ /* start: bkg list */
cfdata->gui.bg_list = e_widget_ilist_add(evas, BG_LIST_ICON_SIZE_W, cfdata->gui.bg_list = e_widget_ilist_add(evas, BG_LIST_ICON_SIZE_W,
BG_LIST_ICON_SIZE_H, &(cfdata->cur_bg)); BG_LIST_ICON_SIZE_H, &(cfdata->cur_bg));
@ -576,7 +572,7 @@ _e_desklock_passwd_cb_change(void *data, Evas_Object *obj)
{ {
E_Widget_Entry_Data *wd; E_Widget_Entry_Data *wd;
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
char *buf, *ptr; char *ptr;
int i; int i;
cfdata = data; cfdata = data;
@ -627,7 +623,6 @@ static void
_e_desklock_cb_show_passwd(void *data, Evas_Object *obj, const char *emission, const char *source) _e_desklock_cb_show_passwd(void *data, Evas_Object *obj, const char *emission, const char *source)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
E_Widget_Entry_Data *wd;
cfdata = data; cfdata = data;
_e_desklock_passwd_cb_change(cfdata, cfdata->gui.passwd_field); _e_desklock_passwd_cb_change(cfdata, cfdata->gui.passwd_field);

3
src/bin/e_int_config_display.c
View File

@ -173,6 +173,7 @@ _surebox_new(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
e_win_sticky_set(sb->dia->win, 1); e_win_sticky_set(sb->dia->win, 1);
e_dialog_show(sb->dia); e_dialog_show(sb->dia);
e_object_ref(E_OBJECT(cfd)); e_object_ref(E_OBJECT(cfd));
return sb;
} }
@ -302,7 +303,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
Ecore_X_Randr_Rotation rot; Ecore_X_Randr_Rotation rot;
rot = ecore_x_randr_screen_rotation_get(man->root); rot = ecore_x_randr_screen_rotation_get(man->root);
if (rot != cfdata->rotation | cfdata->flip) if (rot != (cfdata->rotation | cfdata->flip))
ecore_x_randr_screen_rotation_set(man->root, ecore_x_randr_screen_rotation_set(man->root,
cfdata->rotation | cfdata->flip); cfdata->rotation | cfdata->flip);
e_config->display_res_rotation = cfdata->rotation | cfdata->flip; e_config->display_res_rotation = cfdata->rotation | cfdata->flip;

14
src/bin/e_int_config_keybindings.c
View File

@ -197,7 +197,7 @@ int e_int_config_keybindings_unregister_action_predef_name(const char *action_gr
{ {
ACTION_GROUP *actg; ACTION_GROUP *actg;
ACTION2 *act; ACTION2 *act;
Evas_List *l, *l2, *l3; Evas_List *l, *l2;
for (l = action_group_list; l; l = l->next) for (l = action_group_list; l; l = l->next)
{ {
@ -249,7 +249,6 @@ void e_int_config_keybindings_unregister_all_action_predef_names()
{ {
ACTION_GROUP *actg; ACTION_GROUP *actg;
ACTION2 *act; ACTION2 *act;
Evas_List *l, *l2, *l3;
while (action_group_list) while (action_group_list)
{ {
@ -324,7 +323,6 @@ _fill_data(E_Config_Dialog_Data *cfdata)
Evas_List *l, *l2, *l3; Evas_List *l, *l2, *l3;
ACTION_GROUP *actg; ACTION_GROUP *actg;
ACTION2 *act; ACTION2 *act;
int done;
e_int_config_keybindings_register_action_predef_name(AG_UNSORTED, AG_AN_UNKNOWN, e_int_config_keybindings_register_action_predef_name(AG_UNSORTED, AG_AN_UNKNOWN,
NULL, NULL, NULL, NULL,
@ -345,8 +343,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
{ {
act = l3->data; act = l3->data;
if ((!act->action_cmd || !act->action_cmd[0]) && (t->action && t->action[0]) || if (((!act->action_cmd || !act->action_cmd[0]) && (t->action && t->action[0])) ||
(!t->action || !t->action[0]) && (act->action_cmd && act->action_cmd[0])) ((!t->action || !t->action[0]) && (act->action_cmd && act->action_cmd[0])))
continue; continue;
if (t->params && t->params[0]) // here we have that action has params if (t->params && t->params[0]) // here we have that action has params
@ -403,8 +401,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
break; break;
} }
if ((!act->action_cmd || !act->action_cmd[0]) && (t->action && t->action[0]) || if (((!act->action_cmd || !act->action_cmd[0]) && (t->action && t->action[0])) ||
(!t->action || !t->action[0]) && (act->action_cmd && act->action_cmd[0])) ((!t->action || !t->action[0]) && (act->action_cmd && act->action_cmd[0])))
continue; continue;
if (strcmp(!act->action_cmd ? "" : act->action_cmd, if (strcmp(!act->action_cmd ? "" : act->action_cmd,
@ -548,11 +546,9 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
static Evas_Object * static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
int i;
Evas_Object *ot; Evas_Object *ot;
Evas_Object *ob, *of; Evas_Object *ob, *of;
E_Radio_Group *rg; E_Radio_Group *rg;
int mw, mh;
cfdata->evas = evas; cfdata->evas = evas;

1
src/bin/e_int_config_shelf.c
View File

@ -122,7 +122,6 @@ _cb_add(void *data, void *data2)
//// ////
{ {
E_Config_Shelf *cfg; E_Config_Shelf *cfg;
E_Shelf *es;
cfg = E_NEW(E_Config_Shelf, 1); cfg = E_NEW(E_Config_Shelf, 1);
cfg->name = evas_stringshare_add("shelf"); cfg->name = evas_stringshare_add("shelf");

2
src/bin/e_int_config_theme.c
View File

@ -123,7 +123,7 @@ static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
/* generate the core widget layout for a basic dialog */ /* generate the core widget layout for a basic dialog */
Evas_Object *o, *o2, *fr, *im = NULL; Evas_Object *o, *o2, *im = NULL;
Evas_Object *il; Evas_Object *il;
char *homedir; char *homedir;
Evas_Object *theme; Evas_Object *theme;

5
src/bin/e_int_gadcon_config.c
View File

@ -110,7 +110,6 @@ _create_data(E_Config_Dialog *cfd)
static void static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
Evas_List *l;
/* Free the cfdata */ /* Free the cfdata */
cfdata->gc->config_dialog = NULL; cfdata->gc->config_dialog = NULL;
@ -219,7 +218,7 @@ _cb_select_client_instance(void *data)
static void static void
_cb_add_instance(void *data, void *data2) _cb_add_instance(void *data, void *data2)
{ {
char buf[256], buf2[256]; char buf[256];
int i, ok; int i, ok;
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
E_Config_Gadcon *cf_gc; E_Config_Gadcon *cf_gc;
@ -353,7 +352,7 @@ static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
/* generate the core widget layout for a basic dialog */ /* generate the core widget layout for a basic dialog */
Evas_Object *o, *o2, *of, *ob, *oi; Evas_Object *o, *of, *ob, *oi;
Evas_Coord wmw, wmh; Evas_Coord wmw, wmh;
Evas_List *l, *l2; Evas_List *l, *l2;
E_Config_Gadcon_Client *cf_gcc; E_Config_Gadcon_Client *cf_gcc;

2
src/bin/e_shelf.c
View File

@ -32,7 +32,7 @@ e_shelf_shutdown(void)
EAPI void EAPI void
e_shelf_config_init(void) e_shelf_config_init(void)
{ {
Evas_List *l, *l2; Evas_List *l;
for (l = e_config->shelves; l; l = l->next) for (l = e_config->shelves; l; l = l->next)
{ {