From 37051c35310a2352120215063a2e36db41294634 Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
Date: Thu, 13 Sep 2007 21:09:12 +0000
Subject: [PATCH] Various patch bits from Brett Nash. Still going through the
 rest of them.

SVN revision: 31701
---
 src/bin/e_actions.c         |  2 +-
 src/bin/e_desklock.c        | 20 ++++++++++----------
 src/bin/e_fm_custom.c       |  2 +-
 src/bin/e_int_border_prop.c |  4 +---
 src/bin/e_spectrum.c        |  4 ++--
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index c6aa7fcfd..70c521fc0 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -567,7 +567,7 @@ ACT_FN_GO(window_maximized)
 		  else
 		    max = E_MAXIMIZE_BOTH;
 	       }
-	     if (ret > 1);
+	     if (ret > 1)
 	       {
 		  if (v == 1)
 		    {
diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c
index ebab995d9..37493180a 100644
--- a/src/bin/e_desklock.c
+++ b/src/bin/e_desklock.c
@@ -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_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 @@ _e_desklock_cb_mouse_move(void *data, int type, void *event)
 }
 
 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 @@ _e_desklock_passwd_update()
 }
 
 static void
-_e_desklock_backspace()
+_e_desklock_backspace(void)
 {
    int len, val, pos;
    
@@ -525,13 +525,13 @@ _e_desklock_backspace()
 }
 
 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 @@ _e_desklock_zone_num_get()
 }
 
 static int
-_e_desklock_check_auth()
+_e_desklock_check_auth(void)
 {
    if (!edd) return 0;
 #ifdef HAVE_PAM
diff --git a/src/bin/e_fm_custom.c b/src/bin/e_fm_custom.c
index 2785958cc..19f988f1b 100644
--- a/src/bin/e_fm_custom.c
+++ b/src/bin/e_fm_custom.c
@@ -180,7 +180,7 @@ e_fm2_custom_file_rename(const char *path, const char *new_path)
 		  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);
diff --git a/src/bin/e_int_border_prop.c b/src/bin/e_int_border_prop.c
index 62fd9e3e2..d66c68fd6 100644
--- a/src/bin/e_int_border_prop.c
+++ b/src/bin/e_int_border_prop.c
@@ -347,18 +347,16 @@ _bd_go(void *data, void *data2)
    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);
diff --git a/src/bin/e_spectrum.c b/src/bin/e_spectrum.c
index b95935895..6c98bc673 100644
--- a/src/bin/e_spectrum.c
+++ b/src/bin/e_spectrum.c
@@ -150,7 +150,7 @@ _e_spectrum_smart_clip_unset(Evas_Object *o)
 }
 
 static void
-_e_spectrum_smart_init()
+_e_spectrum_smart_init(void)
 {
    if (_e_spectrum_smart) return;
      {
@@ -266,7 +266,7 @@ _e_spectrum_redraw(void *d)
   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)