summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Michael <cpmichael1@comcast.net>2005-12-29 15:51:16 +0000
committerChristopher Michael <cpmichael1@comcast.net>2005-12-29 15:51:16 +0000
commit0d1f43ca6f919cf3a7c796b3a10f956d57eff34d (patch)
tree8400d05be0a6c31aa89b51d0ef9362d5ca69ddb1
parent10255a0904dc256039f1517acbbcd2972e0eec2e (diff)
Remove unused variables. Fix reuse of a variable and various warnings
SVN revision: 19379
-rw-r--r--src/bin/e_int_config_background.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/bin/e_int_config_background.c b/src/bin/e_int_config_background.c
index f1aaab927..4f0a8ab01 100644
--- a/src/bin/e_int_config_background.c
+++ b/src/bin/e_int_config_background.c
@@ -121,7 +121,7 @@ static Evas_Object *
121_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 121_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
122{ 122{
123 /* generate the core widget layout for a basic dialog */ 123 /* generate the core widget layout for a basic dialog */
124 Evas_Object *o, *ob, *fr, *im = NULL; 124 Evas_Object *o, *fr, *im = NULL;
125 Evas_Object *il; 125 Evas_Object *il;
126 char buf[4096]; 126 char buf[4096];
127 char *homedir; 127 char *homedir;
@@ -148,21 +148,20 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
148 bgs = ecore_file_ls(buf); 148 bgs = ecore_file_ls(buf);
149 if (bgs) 149 if (bgs)
150 { 150 {
151 char *bg; 151 char *bgfile;
152 char fullbg[PATH_MAX]; 152 char fullbg[PATH_MAX];
153 Evas_Object *o; 153 Evas_Object *o;
154 Ecore_Evas *eebuf; 154 Ecore_Evas *eebuf;
155 Evas *evasbuf; 155 Evas *evasbuf;
156 Evas_List *l;
157 int i = 0; 156 int i = 0;
158 157
159 eebuf = ecore_evas_buffer_new(1, 1); 158 eebuf = ecore_evas_buffer_new(1, 1);
160 evasbuf = ecore_evas_get(eebuf); 159 evasbuf = ecore_evas_get(eebuf);
161 o = edje_object_add(evasbuf); 160 o = edje_object_add(evasbuf);
162 161
163 while ((bg = ecore_list_next(bgs))) 162 while ((bgfile = ecore_list_next(bgs)))
164 { 163 {
165 snprintf(fullbg, sizeof(fullbg), "%s/%s", buf, bg); 164 snprintf(fullbg, sizeof(fullbg), "%s/%s", buf, bgfile);
166 if (ecore_file_is_dir(fullbg)) 165 if (ecore_file_is_dir(fullbg))
167 continue; 166 continue;
168 167
@@ -175,19 +174,19 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
175 174
176 o = e_thumb_generate_begin(fullbg, 48, 48, cfd->dia->win->evas, &o, NULL, NULL); 175 o = e_thumb_generate_begin(fullbg, 48, 48, cfd->dia->win->evas, &o, NULL, NULL);
177 176
178 ext = strrchr(bg ,'.'); 177 ext = strrchr(bgfile ,'.');
179 178
180 if (!ext) 179 if (!ext)
181 { 180 {
182 noext = strdup(bg); 181 noext = strdup(bgfile);
183 } 182 }
184 else 183 else
185 { 184 {
186 noext = malloc((ext - bg + 1)); 185 noext = malloc((ext - bgfile + 1));
187 if (bg) 186 if (bgfile)
188 { 187 {
189 memcpy(noext, bg, ext - bg); 188 memcpy(noext, bgfile, ext - bgfile);
190 noext[ext - bg] = 0; 189 noext[ext - bgfile] = 0;
191 } 190 }
192 } 191 }
193 cb_data = E_NEW(E_Cfg_Bg_Data, 1); 192 cb_data = E_NEW(E_Cfg_Bg_Data, 1);
@@ -235,7 +234,7 @@ static Evas_Object *
235_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 234_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
236{ 235{
237 /* generate the core widget layout for an advanced dialog */ 236 /* generate the core widget layout for an advanced dialog */
238 Evas_Object *o, *ob, *of; 237 Evas_Object *o;
239 238
240 _fill_data(cfdata); 239 _fill_data(cfdata);
241 240