Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_actions.c e_desklock.c e_fm_custom.c e_int_border_prop.c
e_spectrum.c
Log Message:
Various patch bits from Brett Nash. Still going through the rest of them.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -3 -r1.109 -r1.110
--- e_actions.c 4 Sep 2007 16:48:11 -0000 1.109
+++ e_actions.c 13 Sep 2007 21:09:11 -0000 1.110
@@ -567,7 +567,7 @@
else
max = E_MAXIMIZE_BOTH;
}
- if (ret > 1);
+ if (ret > 1)
{
if (v == 1)
{
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_desklock.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- e_desklock.c 4 Jul 2007 11:11:02 -0000 1.43
+++ e_desklock.c 13 Sep 2007 21:09:11 -0000 1.44
@@ -72,11 +72,11 @@
static int _e_desklock_cb_custom_desklock_exit(void *data, int type, void
*event);
static int _e_desklock_cb_idle_timer(void *data);
-static void _e_desklock_passwd_update();
-static void _e_desklock_backspace();
-static void _e_desklock_delete();
-static int _e_desklock_zone_num_get();
-static int _e_desklock_check_auth();
+static void _e_desklock_passwd_update(void);
+static void _e_desklock_backspace(void);
+static void _e_desklock_delete(void);
+static int _e_desklock_zone_num_get(void);
+static int _e_desklock_check_auth(void);
static void _e_desklock_state_set(int state);
#ifdef HAVE_PAM
@@ -485,7 +485,7 @@
}
static void
-_e_desklock_passwd_update()
+_e_desklock_passwd_update(void)
{
char passwd_hidden[PASSWD_LEN] = "", *p, *pp;
E_Desklock_Popup_Data *edp;
@@ -506,7 +506,7 @@
}
static void
-_e_desklock_backspace()
+_e_desklock_backspace(void)
{
int len, val, pos;
@@ -525,13 +525,13 @@
}
static void
-_e_desklock_delete()
+_e_desklock_delete(void)
{
_e_desklock_backspace();
}
static int
-_e_desklock_zone_num_get()
+_e_desklock_zone_num_get(void)
{
int num;
Evas_List *l, *l2;
@@ -553,7 +553,7 @@
}
static int
-_e_desklock_check_auth()
+_e_desklock_check_auth(void)
{
if (!edd) return 0;
#ifdef HAVE_PAM
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_custom.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_fm_custom.c 23 Aug 2007 09:45:30 -0000 1.7
+++ e_fm_custom.c 13 Sep 2007 21:09:12 -0000 1.8
@@ -180,7 +180,7 @@
char buf[PATH_MAX];
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,
l->data, cf2);
cf = evas_hash_find(_e_fm2_custom_hash, buf);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_prop.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_int_border_prop.c 14 Dec 2006 15:40:19 -0000 1.12
+++ e_int_border_prop.c 13 Sep 2007 21:09:12 -0000 1.13
@@ -347,18 +347,16 @@
E_Dialog *dia;
Evas_Object *c, *o, *ob;
Evas_Coord w, h;
- int type;
dia = data;
if (!dia) return;
- type = (int)data2;
if (dia->content_object)
evas_object_del(dia->content_object);
c = e_widget_list_add(e_win_evas_get(dia->win), 0, 0);
- if (type == 0)
+ if (!data2)
{
o = _bd_icccm_create(dia, NULL);
e_widget_list_object_append(c, o, 1, 1, 0.0);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_spectrum.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_spectrum.c 4 Aug 2007 13:12:41 -0000 1.14
+++ e_spectrum.c 13 Sep 2007 21:09:12 -0000 1.15
@@ -150,7 +150,7 @@
}
static void
-_e_spectrum_smart_init()
+_e_spectrum_smart_init(void)
{
if (_e_spectrum_smart) return;
{
@@ -266,7 +266,7 @@
int *data;
int i, j;
int r, g, b;
- float vx, vy, vz;
+ float vx, vy, vz = 0;
data = evas_object_image_data_get(sp->o_spectrum, 1);
if (!data)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
