summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bin/e_config_dialog.c3
-rw-r--r--src/bin/e_eap_editor.c138
-rw-r--r--src/bin/e_int_config_background.c2
-rw-r--r--src/bin/e_int_config_desklock.c13
-rw-r--r--src/bin/e_int_config_display.c3
-rw-r--r--src/bin/e_int_config_keybindings.c14
-rw-r--r--src/bin/e_int_config_shelf.c1
-rw-r--r--src/bin/e_int_config_theme.c2
-rw-r--r--src/bin/e_int_gadcon_config.c5
-rw-r--r--src/bin/e_shelf.c2
10 files changed, 80 insertions, 103 deletions
diff --git a/src/bin/e_config_dialog.c b/src/bin/e_config_dialog.c
index 099d8d2e0..0ce8f66c1 100644
--- a/src/bin/e_config_dialog.c
+++ b/src/bin/e_config_dialog.c
@@ -293,8 +293,7 @@ static void
293_e_config_dialog_cb_changed(void *data, Evas_Object *obj) 293_e_config_dialog_cb_changed(void *data, Evas_Object *obj)
294{ 294{
295 E_Config_Dialog *cfd; 295 E_Config_Dialog *cfd;
296 int ok = 0; 296
297
298 cfd = data; 297 cfd = data;
299 if (!cfd->hide_buttons) 298 if (!cfd->hide_buttons)
300 { 299 {
diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c
index af8a2b79c..ffd49975a 100644
--- a/src/bin/e_eap_editor.c
+++ b/src/bin/e_eap_editor.c
@@ -1,7 +1,6 @@
1#include "e.h" 1#include "e.h"
2 2
3typedef struct _E_App_Edit E_App_Edit; 3typedef struct _E_App_Edit E_App_Edit;
4typedef struct _E_App_Edit_CFData E_App_Edit_CFData;
5 4
6struct _E_App_Edit 5struct _E_App_Edit
7{ 6{
@@ -11,10 +10,10 @@ struct _E_App_Edit
11 Evas_Object *img_widget; 10 Evas_Object *img_widget;
12 int img_set; 11 int img_set;
13 12
14 E_App_Edit_CFData *cfdata; 13 E_Config_Dialog_Data *cfdata;
15}; 14};
16 15
17struct _E_App_Edit_CFData 16struct _E_Config_Dialog_Data
18{ 17{
19 /*- BASIC -*/ 18 /*- BASIC -*/
20 char *name; 19 char *name;
@@ -36,13 +35,13 @@ struct _E_App_Edit_CFData
36 35
37/* local subsystem functions */ 36/* local subsystem functions */
38 37
39static void _e_eap_edit_fill_data(E_App_Edit_CFData *cdfata); 38static void _e_eap_edit_fill_data(E_Config_Dialog_Data *cdfata);
40static void *_e_eap_edit_create_data(E_Config_Dialog *cfd); 39static void *_e_eap_edit_create_data(E_Config_Dialog *cfd);
41static void _e_eap_edit_free_data(E_Config_Dialog *cfd, void *data); 40static void _e_eap_edit_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data);
42static int _e_eap_edit_basic_apply_data(E_Config_Dialog *cfd, void *data); 41static int _e_eap_edit_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data);
43static int _e_eap_edit_advanced_apply_data(E_Config_Dialog *cfd, void *data); 42static int _e_eap_edit_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data);
44static Evas_Object *_e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data); 43static Evas_Object *_e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *data);
45static Evas_Object *_e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data); 44static Evas_Object *_e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *data);
46static void _e_eap_edit_select_cb(Evas_Object *obj, char *file, void *data); 45static void _e_eap_edit_select_cb(Evas_Object *obj, char *file, void *data);
47static void _e_eap_edit_hilite_cb(Evas_Object *obj, char *file, void *data); 46static void _e_eap_edit_hilite_cb(Evas_Object *obj, char *file, void *data);
48 47
@@ -89,7 +88,7 @@ e_eap_edit_show(E_Container *con, E_App *a)
89/* local subsystem functions */ 88/* local subsystem functions */
90 89
91static void 90static void
92_e_eap_edit_fill_data(E_App_Edit_CFData *cfdata) 91_e_eap_edit_fill_data(E_Config_Dialog_Data *cfdata)
93{ 92{
94 /*- BASIC -*/ 93 /*- BASIC -*/
95 IFDUP(cfdata->editor->eap->name, cfdata->name); 94 IFDUP(cfdata->editor->eap->name, cfdata->name);
@@ -109,9 +108,9 @@ _e_eap_edit_fill_data(E_App_Edit_CFData *cfdata)
109static void * 108static void *
110_e_eap_edit_create_data(E_Config_Dialog *cfd) 109_e_eap_edit_create_data(E_Config_Dialog *cfd)
111{ 110{
112 E_App_Edit_CFData *cfdata; 111 E_Config_Dialog_Data *cfdata;
113 112
114 cfdata = E_NEW(E_App_Edit_CFData, 1); 113 cfdata = E_NEW(E_Config_Dialog_Data, 1);
115 if (!cfdata) return NULL; 114 if (!cfdata) return NULL;
116 cfdata->editor = cfd->data; 115 cfdata->editor = cfd->data;
117 cfdata->image = NULL; 116 cfdata->image = NULL;
@@ -120,47 +119,42 @@ _e_eap_edit_create_data(E_Config_Dialog *cfd)
120} 119}
121 120
122static void 121static void
123_e_eap_edit_free_data(E_Config_Dialog *cfd, void *data) 122_e_eap_edit_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data)
124{ 123{
125 E_App_Edit_CFData *cfdata; 124 E_FREE(data->name);
126 125 E_FREE(data->exe);
127 cfdata = data; 126 E_FREE(data->generic);
128 E_FREE(cfdata->name); 127 E_FREE(data->comment);
129 E_FREE(cfdata->exe); 128 E_FREE(data->wname);
130 E_FREE(cfdata->generic); 129 E_FREE(data->wclass);
131 E_FREE(cfdata->comment); 130 E_FREE(data->wtitle);
132 E_FREE(cfdata->wname); 131 E_FREE(data->wrole);
133 E_FREE(cfdata->wclass); 132 E_FREE(data->iclass);
134 E_FREE(cfdata->wtitle); 133 E_FREE(data->image);
135 E_FREE(cfdata->wrole); 134 e_object_unref(E_OBJECT(data->editor->eap));
136 E_FREE(cfdata->iclass); 135 E_FREE(data->editor);
137 E_FREE(cfdata->image);
138 e_object_unref(E_OBJECT(cfdata->editor->eap));
139 E_FREE(cfdata->editor);
140 free(data); 136 free(data);
141} 137}
142 138
143static int 139static int
144_e_eap_edit_basic_apply_data(E_Config_Dialog *cfd, void *data) 140_e_eap_edit_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data)
145{ 141{
146 E_App_Edit *editor; 142 E_App_Edit *editor;
147 E_App *eap; 143 E_App *eap;
148 E_App_Edit_CFData *cfdata;
149 144
150 cfdata = data; 145 editor = data->editor;
151 editor = cfdata->editor;
152 eap = editor->eap; 146 eap = editor->eap;
153 147
154 if (eap->name) evas_stringshare_del(eap->name); 148 if (eap->name) evas_stringshare_del(eap->name);
155 if (eap->exe) evas_stringshare_del(eap->exe); 149 if (eap->exe) evas_stringshare_del(eap->exe);
156 if (eap->image) evas_stringshare_del(eap->image); 150 if (eap->image) evas_stringshare_del(eap->image);
157 151
158 if (cfdata->name) eap->name = evas_stringshare_add(cfdata->name); 152 if (data->name) eap->name = evas_stringshare_add(data->name);
159 if (cfdata->exe) eap->exe = evas_stringshare_add(cfdata->exe); 153 if (data->exe) eap->exe = evas_stringshare_add(data->exe);
160 if (cfdata->image) eap->image = evas_stringshare_add(cfdata->image); 154 if (data->image) eap->image = evas_stringshare_add(data->image);
161 155
162 eap->startup_notify = cfdata->startup_notify; 156 eap->startup_notify = data->startup_notify;
163 eap->wait_exit = cfdata->wait_exit; 157 eap->wait_exit = data->wait_exit;
164 158
165 /* FIXME: hardcoded until the eap editor provides fields to change it */ 159 /* FIXME: hardcoded until the eap editor provides fields to change it */
166 eap->width = 128; 160 eap->width = 128;
@@ -173,14 +167,12 @@ _e_eap_edit_basic_apply_data(E_Config_Dialog *cfd, void *data)
173} 167}
174 168
175static int 169static int
176_e_eap_edit_advanced_apply_data(E_Config_Dialog *cfd, void *data) 170_e_eap_edit_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data)
177{ 171{
178 E_App_Edit *editor; 172 E_App_Edit *editor;
179 E_App *eap; 173 E_App *eap;
180 E_App_Edit_CFData *cfdata;
181 174
182 cfdata = data; 175 editor = data->editor;
183 editor = cfdata->editor;
184 eap = editor->eap; 176 eap = editor->eap;
185 177
186 if (eap->name) evas_stringshare_del(eap->name); 178 if (eap->name) evas_stringshare_del(eap->name);
@@ -195,22 +187,22 @@ _e_eap_edit_advanced_apply_data(E_Config_Dialog *cfd, void *data)
195 if (eap->win_role) evas_stringshare_del(eap->win_role); 187 if (eap->win_role) evas_stringshare_del(eap->win_role);
196 if (eap->icon_class) evas_stringshare_del(eap->icon_class); 188 if (eap->icon_class) evas_stringshare_del(eap->icon_class);
197 189
198 if (cfdata->startup_notify) eap->startup_notify = 1; 190 if (data->startup_notify) eap->startup_notify = 1;
199 else eap->startup_notify = 0; 191 else eap->startup_notify = 0;
200 if (cfdata->wait_exit) eap->wait_exit = 1; 192 if (data->wait_exit) eap->wait_exit = 1;
201 else eap->wait_exit = 0; 193 else eap->wait_exit = 0;
202 194
203 if (cfdata->name) eap->name = evas_stringshare_add(cfdata->name); 195 if (data->name) eap->name = evas_stringshare_add(data->name);
204 if (cfdata->exe) eap->exe = evas_stringshare_add(cfdata->exe); 196 if (data->exe) eap->exe = evas_stringshare_add(data->exe);
205 if (cfdata->image) eap->image = evas_stringshare_add(cfdata->image); 197 if (data->image) eap->image = evas_stringshare_add(data->image);
206 198
207 if (cfdata->generic) eap->generic = evas_stringshare_add(cfdata->generic); 199 if (data->generic) eap->generic = evas_stringshare_add(data->generic);
208 if (cfdata->comment) eap->comment = evas_stringshare_add(cfdata->comment); 200 if (data->comment) eap->comment = evas_stringshare_add(data->comment);
209 if (cfdata->wname) eap->win_name = evas_stringshare_add(cfdata->wname); 201 if (data->wname) eap->win_name = evas_stringshare_add(data->wname);
210 if (cfdata->wclass) eap->win_class = evas_stringshare_add(cfdata->wclass); 202 if (data->wclass) eap->win_class = evas_stringshare_add(data->wclass);
211 if (cfdata->wtitle) eap->win_title = evas_stringshare_add(cfdata->wtitle); 203 if (data->wtitle) eap->win_title = evas_stringshare_add(data->wtitle);
212 if (cfdata->wrole) eap->win_role = evas_stringshare_add(cfdata->wrole); 204 if (data->wrole) eap->win_role = evas_stringshare_add(data->wrole);
213 if (cfdata->iclass) eap->icon_class = evas_stringshare_add(cfdata->iclass); 205 if (data->iclass) eap->icon_class = evas_stringshare_add(data->iclass);
214 206
215 /* FIXME: hardcoded until the eap editor provides fields to change it */ 207 /* FIXME: hardcoded until the eap editor provides fields to change it */
216 eap->width = 128; 208 eap->width = 128;
@@ -223,16 +215,14 @@ _e_eap_edit_advanced_apply_data(E_Config_Dialog *cfd, void *data)
223 215
224 216
225static Evas_Object * 217static Evas_Object *
226_e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data) 218_e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *data)
227{ 219{
228 E_App_Edit_CFData *cfdata;
229 E_App_Edit *editor; 220 E_App_Edit *editor;
230 E_App *eap; 221 E_App *eap;
231 Evas_Object *ol, *o; 222 Evas_Object *ol, *o;
232 Evas_Object *entry; 223 Evas_Object *entry;
233 224
234 cfdata = data; 225 editor = data->editor;
235 editor = cfdata->editor;
236 eap = editor->eap; 226 eap = editor->eap;
237 227
238 ol = e_widget_table_add(evas, 0); 228 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)
251 else if (editor->img_set) 241 else if (editor->img_set)
252 { 242 {
253 editor->img = e_icon_add(evas); 243 editor->img = e_icon_add(evas);
254 e_icon_file_set(editor->img, cfdata->image); 244 e_icon_file_set(editor->img, data->image);
255 e_icon_fill_inside_set(editor->img, 1); 245 e_icon_fill_inside_set(editor->img, 1);
256 } 246 }
257 247
258 editor->img_widget = e_widget_iconsel_add(evas, editor->img, 48, 48, 248 editor->img_widget = e_widget_iconsel_add(evas, editor->img, 48, 48,
259 &(cfdata->image)); 249 &(data->image));
260 e_widget_iconsel_select_callback_add(editor->img_widget, _e_eap_edit_select_cb, editor); 250 e_widget_iconsel_select_callback_add(editor->img_widget, _e_eap_edit_select_cb, editor);
261 e_widget_iconsel_hilite_callback_add(editor->img_widget, _e_eap_edit_hilite_cb, editor); 251 e_widget_iconsel_hilite_callback_add(editor->img_widget, _e_eap_edit_hilite_cb, editor);
262 e_widget_frametable_object_append(o, editor->img_widget, 252 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)
270 0, 0, 1, 1, 260 0, 0, 1, 1,
271 1, 1, 1, 1); 261 1, 1, 1, 1);
272 262
273 entry = e_widget_entry_add(evas, &(cfdata->name)); 263 entry = e_widget_entry_add(evas, &(data->name));
274 e_widget_min_size_set(entry, 100, 1); 264 e_widget_min_size_set(entry, 100, 1);
275 e_widget_frametable_object_append(o, entry, 265 e_widget_frametable_object_append(o, entry,
276 1, 0, 1, 1, 266 1, 0, 1, 1,
@@ -278,7 +268,7 @@ _e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
278 e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Executable")), 268 e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Executable")),
279 0, 1, 1, 1, 269 0, 1, 1, 1,
280 1, 1, 1, 1); 270 1, 1, 1, 1);
281 e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(cfdata->exe)), 271 e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(data->exe)),
282 1, 1, 1, 1, 272 1, 1, 1, 1,
283 1, 1, 1, 1); 273 1, 1, 1, 1);
284 e_widget_table_object_append(ol, o, 1, 0, 1, 1, 1 ,1, 1, 1); 274 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)
287} 277}
288 278
289static Evas_Object * 279static Evas_Object *
290_e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data) 280_e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *data)
291{ 281{
292 E_App_Edit_CFData *cfdata;
293 E_App_Edit *editor; 282 E_App_Edit *editor;
294 E_App *eap; 283 E_App *eap;
295 Evas_Object *ol, *o; 284 Evas_Object *ol, *o;
296 Evas_Object *entry; 285 Evas_Object *entry;
297 286
298 cfdata = data; 287 editor = data->editor;
299 editor = cfdata->editor;
300 eap = editor->eap; 288 eap = editor->eap;
301 289
302 ol = _e_eap_edit_basic_create_widgets(cfd, evas, data); 290 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
308 0, 0, 1, 1, 296 0, 0, 1, 1,
309 1, 1, 1, 1); 297 1, 1, 1, 1);
310 298
311 entry = e_widget_entry_add(evas, &(cfdata->generic)); 299 entry = e_widget_entry_add(evas, &(data->generic));
312 e_widget_min_size_set(entry, 100, 1); 300 e_widget_min_size_set(entry, 100, 1);
313 e_widget_frametable_object_append(o, entry, 301 e_widget_frametable_object_append(o, entry,
314 1, 0, 1, 1, 302 1, 0, 1, 1,
@@ -316,7 +304,7 @@ _e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data
316 e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Comment")), 304 e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Comment")),
317 0, 1, 1, 1, 305 0, 1, 1, 1,
318 1, 1, 1, 1); 306 1, 1, 1, 1);
319 e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(cfdata->comment)), 307 e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(data->comment)),
320 1, 1, 1, 1, 308 1, 1, 1, 1,
321 1, 1, 1, 1); 309 1, 1, 1, 1);
322 e_widget_table_object_append(ol, o, 0, 1, 1, 1, 1 ,1, 1, 1); 310 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
329 0, 0, 1, 1, 317 0, 0, 1, 1,
330 1, 1, 1, 1); 318 1, 1, 1, 1);
331 319
332 entry = e_widget_entry_add(evas, &(cfdata->wname)); 320 entry = e_widget_entry_add(evas, &(data->wname));
333 e_widget_min_size_set(entry, 100, 1); 321 e_widget_min_size_set(entry, 100, 1);
334 e_widget_frametable_object_append(o, entry, 322 e_widget_frametable_object_append(o, entry,
335 1, 0, 1, 1, 323 1, 0, 1, 1,
@@ -337,19 +325,19 @@ _e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data
337 e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Window Class")), 325 e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Window Class")),
338 0, 1, 1, 1, 326 0, 1, 1, 1,
339 1, 1, 1, 1); 327 1, 1, 1, 1);
340 e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(cfdata->wclass)), 328 e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(data->wclass)),
341 1, 1, 1, 1, 329 1, 1, 1, 1,
342 1, 1, 1, 1); 330 1, 1, 1, 1);
343 e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Window Title")), 331 e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Window Title")),
344 0, 2, 1, 1, 332 0, 2, 1, 1,
345 1, 1, 1, 1); 333 1, 1, 1, 1);
346 e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(cfdata->wtitle)), 334 e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(data->wtitle)),
347 1, 2, 1, 1, 335 1, 2, 1, 1,
348 1, 1, 1, 1); 336 1, 1, 1, 1);
349 e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Window Role")), 337 e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Window Role")),
350 0, 3, 1, 1, 338 0, 3, 1, 1,
351 1, 1, 1, 1); 339 1, 1, 1, 1);
352 e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(cfdata->wrole)), 340 e_widget_frametable_object_append(o, e_widget_entry_add(evas, &(data->wrole)),
353 1, 3, 1, 1, 341 1, 3, 1, 1,
354 1, 1, 1, 1); 342 1, 1, 1, 1);
355 e_widget_table_object_append(ol, o, 0, 2, 1, 1, 1 ,1, 1, 1); 343 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
361 0, 0, 1, 1, 349 0, 0, 1, 1,
362 1, 1, 1, 1); 350 1, 1, 1, 1);
363 351
364 entry = e_widget_entry_add(evas, &(cfdata->iclass)); 352 entry = e_widget_entry_add(evas, &(data->iclass));
365 e_widget_min_size_set(entry, 100, 1); 353 e_widget_min_size_set(entry, 100, 1);
366 e_widget_frametable_object_append(o, entry, 354 e_widget_frametable_object_append(o, entry,
367 1, 0, 1, 1, 355 1, 0, 1, 1,
@@ -372,10 +360,10 @@ _e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data
372 360
373 /*- misc info -*/ 361 /*- misc info -*/
374 o = e_widget_frametable_add(evas, _("Misc"), 0); 362 o = e_widget_frametable_add(evas, _("Misc"), 0);
375 e_widget_frametable_object_append(o, e_widget_check_add(evas, _("Startup Notify"), &(cfdata->startup_notify)), 363 e_widget_frametable_object_append(o, e_widget_check_add(evas, _("Startup Notify"), &(data->startup_notify)),
376 0, 0, 1, 1, 364 0, 0, 1, 1,
377 1, 1, 1, 1); 365 1, 1, 1, 1);
378 e_widget_frametable_object_append(o, e_widget_check_add(evas, _("Wait Exit"), &(cfdata->wait_exit)), 366 e_widget_frametable_object_append(o, e_widget_check_add(evas, _("Wait Exit"), &(data->wait_exit)),
379 0, 1, 1, 1, 367 0, 1, 1, 1,
380 1, 1, 1, 1); 368 1, 1, 1, 1);
381 e_widget_table_object_append(ol, o, 1, 2, 1, 1, 1 ,1, 1, 1); 369 e_widget_table_object_append(ol, o, 1, 2, 1, 1, 1 ,1, 1, 1);
diff --git a/src/bin/e_int_config_background.c b/src/bin/e_int_config_background.c
index 06a97fcc5..6889626bd 100644
--- a/src/bin/e_int_config_background.c
+++ b/src/bin/e_int_config_background.c
@@ -93,7 +93,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
93static Evas_Object * 93static Evas_Object *
94_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 94_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
95{ 95{
96 Evas_Object *o, *ot, *of, *il, *im; 96 Evas_Object *o, *ot, *il, *im;
97 char path[4096]; 97 char path[4096];
98 98
99 ot = e_widget_table_add(evas, 0); 99 ot = e_widget_table_add(evas, 0);
diff --git a/src/bin/e_int_config_desklock.c b/src/bin/e_int_config_desklock.c
index 62e38338e..26ea489cf 100644
--- a/src/bin/e_int_config_desklock.c
+++ b/src/bin/e_int_config_desklock.c
@@ -252,7 +252,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
252{ 252{
253 Evas_Object *o, *of, *ob; 253 Evas_Object *o, *of, *ob;
254 E_Widget_Check_Data *wd; 254 E_Widget_Check_Data *wd;
255 E_Widget_Radio_Data *rwd;
256 255
257#ifdef HAVE_PAM 256#ifdef HAVE_PAM
258 E_Radio_Group *rg_auth; 257 E_Radio_Group *rg_auth;
@@ -386,21 +385,18 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
386static Evas_Object * 385static Evas_Object *
387_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 386_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
388{ 387{
389 Evas_Object *o, *of, *of1, *ob; 388 Evas_Object *of, *ob;
390 E_Widget_Radio_Data *wd; 389 E_Widget_Radio_Data *wd;
391 390
392 E_Radio_Group *rg, *rg_bkg; 391 E_Radio_Group *rg;
393 Evas_Object *ot, *ol; 392 Evas_Object *ot;
394 393
395 E_Radio_Group *rg_auth;
396 Evas_Object *oc;
397 E_Widget_Check_Data *cwd; 394 E_Widget_Check_Data *cwd;
398 395
399 cfdata->evas = evas; 396 cfdata->evas = evas;
400 397
401 ot = e_widget_table_add(evas, 0); 398 ot = e_widget_table_add(evas, 0);
402 { 399 {
403 Evas_Object *ot1;
404 /* start: bkg list */ 400 /* start: bkg list */
405 cfdata->gui.bg_list = e_widget_ilist_add(evas, BG_LIST_ICON_SIZE_W, 401 cfdata->gui.bg_list = e_widget_ilist_add(evas, BG_LIST_ICON_SIZE_W,
406 BG_LIST_ICON_SIZE_H, &(cfdata->cur_bg)); 402 BG_LIST_ICON_SIZE_H, &(cfdata->cur_bg));
@@ -576,7 +572,7 @@ _e_desklock_passwd_cb_change(void *data, Evas_Object *obj)
576{ 572{
577 E_Widget_Entry_Data *wd; 573 E_Widget_Entry_Data *wd;
578 E_Config_Dialog_Data *cfdata; 574 E_Config_Dialog_Data *cfdata;
579 char *buf, *ptr; 575 char *ptr;
580 int i; 576 int i;
581 577
582 cfdata = data; 578 cfdata = data;
@@ -627,7 +623,6 @@ static void
627_e_desklock_cb_show_passwd(void *data, Evas_Object *obj, const char *emission, const char *source) 623_e_desklock_cb_show_passwd(void *data, Evas_Object *obj, const char *emission, const char *source)
628{ 624{
629 E_Config_Dialog_Data *cfdata; 625 E_Config_Dialog_Data *cfdata;
630 E_Widget_Entry_Data *wd;
631 626
632 cfdata = data; 627 cfdata = data;
633 _e_desklock_passwd_cb_change(cfdata, cfdata->gui.passwd_field); 628 _e_desklock_passwd_cb_change(cfdata, cfdata->gui.passwd_field);
diff --git a/src/bin/e_int_config_display.c b/src/bin/e_int_config_display.c
index 93e972b10..8d3073e64 100644
--- a/src/bin/e_int_config_display.c
+++ b/src/bin/e_int_config_display.c
@@ -173,6 +173,7 @@ _surebox_new(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
173 e_win_sticky_set(sb->dia->win, 1); 173 e_win_sticky_set(sb->dia->win, 1);
174 e_dialog_show(sb->dia); 174 e_dialog_show(sb->dia);
175 e_object_ref(E_OBJECT(cfd)); 175 e_object_ref(E_OBJECT(cfd));
176 return sb;
176} 177}
177 178
178 179
@@ -302,7 +303,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
302 Ecore_X_Randr_Rotation rot; 303 Ecore_X_Randr_Rotation rot;
303 304
304 rot = ecore_x_randr_screen_rotation_get(man->root); 305 rot = ecore_x_randr_screen_rotation_get(man->root);
305 if (rot != cfdata->rotation | cfdata->flip) 306 if (rot != (cfdata->rotation | cfdata->flip))
306 ecore_x_randr_screen_rotation_set(man->root, 307 ecore_x_randr_screen_rotation_set(man->root,
307 cfdata->rotation | cfdata->flip); 308 cfdata->rotation | cfdata->flip);
308 e_config->display_res_rotation = cfdata->rotation | cfdata->flip; 309 e_config->display_res_rotation = cfdata->rotation | cfdata->flip;
diff --git a/src/bin/e_int_config_keybindings.c b/src/bin/e_int_config_keybindings.c
index d8f14662d..f6e7a957d 100644
--- a/src/bin/e_int_config_keybindings.c
+++ b/src/bin/e_int_config_keybindings.c
@@ -197,7 +197,7 @@ int e_int_config_keybindings_unregister_action_predef_name(const char *action_gr
197{ 197{
198 ACTION_GROUP *actg; 198 ACTION_GROUP *actg;
199 ACTION2 *act; 199 ACTION2 *act;
200 Evas_List *l, *l2, *l3; 200 Evas_List *l, *l2;
201 201
202 for (l = action_group_list; l; l = l->next) 202 for (l = action_group_list; l; l = l->next)
203 { 203 {
@@ -249,7 +249,6 @@ void e_int_config_keybindings_unregister_all_action_predef_names()
249{ 249{
250 ACTION_GROUP *actg; 250 ACTION_GROUP *actg;
251 ACTION2 *act; 251 ACTION2 *act;
252 Evas_List *l, *l2, *l3;
253 252
254 while (action_group_list) 253 while (action_group_list)
255 { 254 {
@@ -324,7 +323,6 @@ _fill_data(E_Config_Dialog_Data *cfdata)
324 Evas_List *l, *l2, *l3; 323 Evas_List *l, *l2, *l3;
325 ACTION_GROUP *actg; 324 ACTION_GROUP *actg;
326 ACTION2 *act; 325 ACTION2 *act;
327 int done;
328 326
329 e_int_config_keybindings_register_action_predef_name(AG_UNSORTED, AG_AN_UNKNOWN, 327 e_int_config_keybindings_register_action_predef_name(AG_UNSORTED, AG_AN_UNKNOWN,
330 NULL, NULL, 328 NULL, NULL,
@@ -345,8 +343,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
345 { 343 {
346 act = l3->data; 344 act = l3->data;
347 345
348 if ((!act->action_cmd || !act->action_cmd[0]) && (t->action && t->action[0]) || 346 if (((!act->action_cmd || !act->action_cmd[0]) && (t->action && t->action[0])) ||
349 (!t->action || !t->action[0]) && (act->action_cmd && act->action_cmd[0])) 347 ((!t->action || !t->action[0]) && (act->action_cmd && act->action_cmd[0])))
350 continue; 348 continue;
351 349
352 if (t->params && t->params[0]) // here we have that action has params 350 if (t->params && t->params[0]) // here we have that action has params
@@ -403,8 +401,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
403 break; 401 break;
404 } 402 }
405 403
406 if ((!act->action_cmd || !act->action_cmd[0]) && (t->action && t->action[0]) || 404 if (((!act->action_cmd || !act->action_cmd[0]) && (t->action && t->action[0])) ||
407 (!t->action || !t->action[0]) && (act->action_cmd && act->action_cmd[0])) 405 ((!t->action || !t->action[0]) && (act->action_cmd && act->action_cmd[0])))
408 continue; 406 continue;
409 407
410 if (strcmp(!act->action_cmd ? "" : act->action_cmd, 408 if (strcmp(!act->action_cmd ? "" : act->action_cmd,
@@ -548,11 +546,9 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
548static Evas_Object * 546static Evas_Object *
549_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 547_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
550{ 548{
551 int i;
552 Evas_Object *ot; 549 Evas_Object *ot;
553 Evas_Object *ob, *of; 550 Evas_Object *ob, *of;
554 E_Radio_Group *rg; 551 E_Radio_Group *rg;
555 int mw, mh;
556 552
557 cfdata->evas = evas; 553 cfdata->evas = evas;
558 554
diff --git a/src/bin/e_int_config_shelf.c b/src/bin/e_int_config_shelf.c
index 0bb15c5c3..1b9b3c854 100644
--- a/src/bin/e_int_config_shelf.c
+++ b/src/bin/e_int_config_shelf.c
@@ -122,7 +122,6 @@ _cb_add(void *data, void *data2)
122 //// 122 ////
123 { 123 {
124 E_Config_Shelf *cfg; 124 E_Config_Shelf *cfg;
125 E_Shelf *es;
126 125
127 cfg = E_NEW(E_Config_Shelf, 1); 126 cfg = E_NEW(E_Config_Shelf, 1);
128 cfg->name = evas_stringshare_add("shelf"); 127 cfg->name = evas_stringshare_add("shelf");
diff --git a/src/bin/e_int_config_theme.c b/src/bin/e_int_config_theme.c
index afd5be0ee..16f7067d8 100644
--- a/src/bin/e_int_config_theme.c
+++ b/src/bin/e_int_config_theme.c
@@ -123,7 +123,7 @@ static Evas_Object *
123_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 123_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
124{ 124{
125 /* generate the core widget layout for a basic dialog */ 125 /* generate the core widget layout for a basic dialog */
126 Evas_Object *o, *o2, *fr, *im = NULL; 126 Evas_Object *o, *o2, *im = NULL;
127 Evas_Object *il; 127 Evas_Object *il;
128 char *homedir; 128 char *homedir;
129 Evas_Object *theme; 129 Evas_Object *theme;
diff --git a/src/bin/e_int_gadcon_config.c b/src/bin/e_int_gadcon_config.c
index 155abea01..6ce1832b9 100644
--- a/src/bin/e_int_gadcon_config.c
+++ b/src/bin/e_int_gadcon_config.c
@@ -110,7 +110,6 @@ _create_data(E_Config_Dialog *cfd)
110static void 110static void
111_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 111_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
112{ 112{
113 Evas_List *l;
114 /* Free the cfdata */ 113 /* Free the cfdata */
115 cfdata->gc->config_dialog = NULL; 114 cfdata->gc->config_dialog = NULL;
116 115
@@ -219,7 +218,7 @@ _cb_select_client_instance(void *data)
219static void 218static void
220_cb_add_instance(void *data, void *data2) 219_cb_add_instance(void *data, void *data2)
221{ 220{
222 char buf[256], buf2[256]; 221 char buf[256];
223 int i, ok; 222 int i, ok;
224 E_Config_Dialog_Data *cfdata; 223 E_Config_Dialog_Data *cfdata;
225 E_Config_Gadcon *cf_gc; 224 E_Config_Gadcon *cf_gc;
@@ -353,7 +352,7 @@ static Evas_Object *
353_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 352_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
354{ 353{
355 /* generate the core widget layout for a basic dialog */ 354 /* generate the core widget layout for a basic dialog */
356 Evas_Object *o, *o2, *of, *ob, *oi; 355 Evas_Object *o, *of, *ob, *oi;
357 Evas_Coord wmw, wmh; 356 Evas_Coord wmw, wmh;
358 Evas_List *l, *l2; 357 Evas_List *l, *l2;
359 E_Config_Gadcon_Client *cf_gcc; 358 E_Config_Gadcon_Client *cf_gcc;
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 38f00b0b6..7c9bb34ac 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -32,7 +32,7 @@ e_shelf_shutdown(void)
32EAPI void 32EAPI void
33e_shelf_config_init(void) 33e_shelf_config_init(void)
34{ 34{
35 Evas_List *l, *l2; 35 Evas_List *l;
36 36
37 for (l = e_config->shelves; l; l = l->next) 37 for (l = e_config->shelves; l; l = l->next)
38 { 38 {