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

Various patch bits from Brett Nash. Still going through the rest of them. 

SVN revision: 31701
This commit is contained in:
Christopher Michael 2007-09-13 21:09:12 +00:00
parent 22bc1825f1
commit 37051c3531
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/e_actions.c
View File

@ -567,7 +567,7 @@ ACT_FN_GO(window_maximized)
else else
max = E_MAXIMIZE_BOTH; max = E_MAXIMIZE_BOTH;
} }
if (ret > 1); if (ret > 1)
{ {
if (v == 1) if (v == 1)
{ {

20
src/bin/e_desklock.c
View File

@ -72,11 +72,11 @@ static int _e_desklock_cb_mouse_move(void *data, int type, void *event);
static int _e_desklock_cb_custom_desklock_exit(void *data, int type, void *event); static int _e_desklock_cb_custom_desklock_exit(void *data, int type, void *event);
static int _e_desklock_cb_idle_timer(void *data); static int _e_desklock_cb_idle_timer(void *data);
static void _e_desklock_passwd_update(); static void _e_desklock_passwd_update(void);
static void _e_desklock_backspace(); static void _e_desklock_backspace(void);
static void _e_desklock_delete(); static void _e_desklock_delete(void);
static int _e_desklock_zone_num_get(); static int _e_desklock_zone_num_get(void);
static int _e_desklock_check_auth(); static int _e_desklock_check_auth(void);
static void _e_desklock_state_set(int state); static void _e_desklock_state_set(int state);
#ifdef HAVE_PAM #ifdef HAVE_PAM
@ -485,7 +485,7 @@ _e_desklock_cb_mouse_move(void *data, int type, void *event)
} }
static void static void
_e_desklock_passwd_update() _e_desklock_passwd_update(void)
{ {
char passwd_hidden[PASSWD_LEN] = "", *p, *pp; char passwd_hidden[PASSWD_LEN] = "", *p, *pp;
E_Desklock_Popup_Data *edp; E_Desklock_Popup_Data *edp;
@ -506,7 +506,7 @@ _e_desklock_passwd_update()
} }
static void static void
_e_desklock_backspace() _e_desklock_backspace(void)
{ {
int len, val, pos; int len, val, pos;
@ -525,13 +525,13 @@ _e_desklock_backspace()
} }
static void static void
_e_desklock_delete() _e_desklock_delete(void)
{ {
_e_desklock_backspace(); _e_desklock_backspace();
} }
static int static int
_e_desklock_zone_num_get() _e_desklock_zone_num_get(void)
{ {
int num; int num;
Evas_List *l, *l2; Evas_List *l, *l2;
@ -553,7 +553,7 @@ _e_desklock_zone_num_get()
} }
static int static int
_e_desklock_check_auth() _e_desklock_check_auth(void)
{ {
if (!edd) return 0; if (!edd) return 0;
#ifdef HAVE_PAM #ifdef HAVE_PAM

2
src/bin/e_fm_custom.c
View File

@ -180,7 +180,7 @@ e_fm2_custom_file_rename(const char *path, const char *new_path)
char buf[PATH_MAX]; char buf[PATH_MAX];
strcpy(buf, new_path); strcpy(buf, new_path);
strcat(buf, l->data + strlen(path)); strcat(buf, (char *)l->data + strlen(path));
_e_fm2_custom_hash = evas_hash_del(_e_fm2_custom_hash, _e_fm2_custom_hash = evas_hash_del(_e_fm2_custom_hash,
l->data, cf2); l->data, cf2);
cf = evas_hash_find(_e_fm2_custom_hash, buf); cf = evas_hash_find(_e_fm2_custom_hash, buf);

4
src/bin/e_int_border_prop.c
View File

@ -347,18 +347,16 @@ _bd_go(void *data, void *data2)
E_Dialog *dia; E_Dialog *dia;
Evas_Object *c, *o, *ob; Evas_Object *c, *o, *ob;
Evas_Coord w, h; Evas_Coord w, h;
int type;
dia = data; dia = data;
if (!dia) return; if (!dia) return;
type = (int)data2;
if (dia->content_object) if (dia->content_object)
evas_object_del(dia->content_object); evas_object_del(dia->content_object);
c = e_widget_list_add(e_win_evas_get(dia->win), 0, 0); c = e_widget_list_add(e_win_evas_get(dia->win), 0, 0);
if (type == 0) if (!data2)
{ {
o = _bd_icccm_create(dia, NULL); o = _bd_icccm_create(dia, NULL);
e_widget_list_object_append(c, o, 1, 1, 0.0); e_widget_list_object_append(c, o, 1, 1, 0.0);

4
src/bin/e_spectrum.c
View File

@ -150,7 +150,7 @@ _e_spectrum_smart_clip_unset(Evas_Object *o)
} }
static void static void
_e_spectrum_smart_init() _e_spectrum_smart_init(void)
{ {
if (_e_spectrum_smart) return; if (_e_spectrum_smart) return;
{ {
@ -266,7 +266,7 @@ _e_spectrum_redraw(void *d)
int *data; int *data;
int i, j; int i, j;
int r, g, b; int r, g, b;
float vx, vy, vz; float vx, vy, vz = 0;
data = evas_object_image_data_get(sp->o_spectrum, 1); data = evas_object_image_data_get(sp->o_spectrum, 1);
if (!data) if (!data)