Menu
▾
▴
enlightenment-cvs
|
From: Enlightenment C. <no...@cv...> - 2006-09-06 08:06:21
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_includes.h e_ipc_handlers.h
e_ipc_handlers_list.h e_main.c
Log Message:
Don't compile old fileman.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -3 -r1.149 -r1.150
--- Makefile.am 4 Sep 2006 02:07:46 -0000 1.149
+++ Makefile.am 6 Sep 2006 08:06:19 -0000 1.150
@@ -87,11 +87,6 @@
e_apps_cache.h \
e_editable.h \
e_entry.h \
-e_fileman.h \
-e_fileman_smart.h \
-e_fileman_file.h \
-e_fileman_icon.h \
-e_fileman_mime.h \
e_widget.h \
e_widget_check.h \
e_widget_radio.h \
@@ -105,19 +100,13 @@
e_widget_image.h \
e_config_dialog.h \
e_int_config_focus.h \
-e_icon_grid.h \
-e_icon_canvas.h \
e_int_config_desks.h \
e_configure.h \
e_int_border_locks.h \
e_thumb.h \
e_int_border_remember.h \
e_eap_editor.h \
-e_widget_iconsel.h \
-e_widget_fileman.h \
e_scrollframe.h \
-e_file_selector.h \
-e_file_dialog.h \
e_int_border_menu.h \
e_ilist.h \
e_tlist.h \
@@ -243,11 +232,6 @@
e_apps_cache.c \
e_editable.c \
e_entry.c \
-e_fileman.c \
-e_fileman_smart.c \
-e_fileman_file.c \
-e_fileman_icon.c \
-e_fileman_mime.c \
e_widget.c \
e_widget_check.c \
e_widget_radio.c \
@@ -261,19 +245,13 @@
e_widget_image.c \
e_config_dialog.c \
e_int_config_focus.c \
-e_icon_grid.c \
-e_icon_canvas.c \
e_int_config_desks.c \
e_configure.c \
e_int_border_locks.c \
e_thumb.c \
e_int_border_remember.c \
e_eap_editor.c \
-e_widget_iconsel.c \
-e_widget_fileman.c \
e_scrollframe.c \
-e_file_selector.c \
-e_file_dialog.c \
e_int_border_menu.c \
e_ilist.c \
e_tlist.c \
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -3 -r1.127 -r1.128
--- e_includes.h 4 Sep 2006 02:07:46 -0000 1.127
+++ e_includes.h 6 Sep 2006 08:06:19 -0000 1.128
@@ -61,11 +61,6 @@
#include "e_about.h"
#include "e_theme_about.h"
#include "e_apps_cache.h"
-#include "e_fileman.h"
-#include "e_fileman_smart.h"
-#include "e_fileman_file.h"
-#include "e_fileman_icon.h"
-#include "e_fileman_mime.h"
#include "e_widget.h"
#include "e_widget_check.h"
#include "e_widget_radio.h"
@@ -77,20 +72,14 @@
#include "e_widget_table.h"
#include "e_widget_entry.h"
#include "e_widget_image.h"
-#include "e_widget_iconsel.h"
#include "e_config_dialog.h"
#include "e_int_config_focus.h"
-#include "e_icon_grid.h"
-#include "e_icon_canvas.h"
#include "e_int_config_desks.h"
#include "e_int_border_locks.h"
#include "e_thumb.h"
#include "e_int_border_remember.h"
#include "e_eap_editor.h"
#include "e_scrollframe.h"
-#include "e_file_selector.h"
-#include "e_file_dialog.h"
-#include "e_widget_fileman.h"
#include "e_int_border_menu.h"
#include "e_ilist.h"
#include "e_livethumb.h"
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_ipc_handlers.h,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -3 -r1.134 -r1.135
--- e_ipc_handlers.h 20 Aug 2006 04:48:27 -0000 1.134
+++ e_ipc_handlers.h 6 Sep 2006 08:06:19 -0000 1.135
@@ -931,22 +931,6 @@
* ...
*/
/****************************************************************************/
-#define HDL E_IPC_EFM_START
-#if (TYPE == E_REMOTE_OPTIONS)
- OP("-start-efm", 1, "Starts the E File Manager in Directory 'OPT1'", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
- REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
- STRING(s, HDL);
- E_Fileman *fileman;
- fileman = e_fileman_new_to_dir(e_container_current_get(e_manager_current_get()), s);
- e_fileman_show (fileman);
- END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
#define HDL E_IPC_EAP_EDIT_START
#if (TYPE == E_REMOTE_OPTIONS)
OP("-start-eap-edit", 1, "Starts the Eap editor on the eap 'OPT1'", 0, HDL)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_ipc_handlers_list.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- e_ipc_handlers_list.h 10 Aug 2006 05:01:07 -0000 1.48
+++ e_ipc_handlers_list.h 6 Sep 2006 08:06:19 -0000 1.49
@@ -339,8 +339,6 @@
#define E_IPC_OP_FULLSCREEN_POLICY_GET 321
#define E_IPC_OP_FULLSCREEN_POLICY_GET_REPLY 322
-#define E_IPC_EFM_START 323
-
#define E_IPC_OP_EDJE_CACHE_SET 324
#define E_IPC_OP_EDJE_CACHE_GET 325
#define E_IPC_OP_EDJE_CACHE_GET_REPLY 326
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -3 -r1.184 -r1.185
--- e_main.c 3 Sep 2006 08:51:32 -0000 1.184
+++ e_main.c 6 Sep 2006 08:06:19 -0000 1.185
@@ -467,14 +467,12 @@
/* init the enlightenment file manager */
- if (!e_fm_icon_init() || !e_fm_init() || !e_fm2_init())
+ if (!e_fm2_init())
{
e_error_message_show(_("Enlightenment cannot initialize the File manager.\n"));
_e_main_shutdown(-1);
}
_e_main_shutdown_push(e_fm2_shutdown);
- _e_main_shutdown_push(e_fm_shutdown);
- _e_main_shutdown_push(e_fm_icon_shutdown);
/*** Finished loading subsystems, Loading WM Specifics ***/
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-06 08:23:02
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c
Log Message:
delete objects with e_object_del
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- e_eap_editor.c 3 Sep 2006 15:11:04 -0000 1.51
+++ e_eap_editor.c 6 Sep 2006 08:22:57 -0000 1.52
@@ -58,11 +58,11 @@
if (!con) return;
editor = E_OBJECT_ALLOC(E_App_Edit, E_EAP_EDIT_TYPE, _e_eap_edit_free);
- if (!editor) return NULL;;
+ if (!editor) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
if (!v)
{
- free(editor);
+ e_object_del(E_OBJECT(editor));
return NULL;
}
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-06 08:44:31
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_int_config_apps.c
Log Message:
parameter type should be void
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.539
retrieving revision 1.540
diff -u -3 -r1.539 -r1.540
--- e_border.c 5 Sep 2006 14:44:27 -0000 1.539
+++ e_border.c 6 Sep 2006 08:44:29 -0000 1.540
@@ -2546,27 +2546,29 @@
{
a = e_app_new(bd->internal_icon, 0);
if (a)
- {
- /* Free the aborted object first. */
- if (o) evas_object_del(o);
- o = e_app_icon_add(evas, a);
- bd->app = a;
- e_object_ref(E_OBJECT(bd->app));
- }
+ {
+ /* Free the aborted object first. */
+ if (o) evas_object_del(o);
+ o = e_app_icon_add(evas, a);
+ bd->app = a;
+ e_object_ref(E_OBJECT(bd->app));
+ }
else
- {
- if ((!strcmp(bd->internal_icon + strlen(bd->internal_icon) - 4, ".eap"))
- || (!strcmp(bd->internal_icon + strlen(bd->internal_icon) - 4, ".edj")))
- {
- if (!edje_object_file_set(o, bd->internal_icon, "icon"))
- e_util_edje_icon_set(o, "enlightenment/e");
- }
- else
- {
- if (!e_util_edje_icon_set(o, bd->internal_icon))
- e_util_edje_icon_set(o, "enlightenment/e");
- }
- }
+ {
+ char *ext;
+
+ ext = strrchr(bd->internal_icon, '.');
+ if ((ext) && ((!strcmp(ext, ".eap")) || (!strcmp(ext, ".edj"))))
+ {
+ if (!edje_object_file_set(o, bd->internal_icon, "icon"))
+ e_util_edje_icon_set(o, "enlightenment/e");
+ }
+ else
+ {
+ if (!e_util_edje_icon_set(o, bd->internal_icon))
+ e_util_edje_icon_set(o, "enlightenment/e");
+ }
+ }
}
return o;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_int_config_apps.c 4 Sep 2006 11:50:23 -0000 1.19
+++ e_int_config_apps.c 6 Sep 2006 08:44:30 -0000 1.20
@@ -198,7 +198,7 @@
}
static void
-_cb_editor_del(E_Object *obj)
+_cb_editor_del(void *obj)
{
E_Config_Dialog_Data *cfdata;
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-17 11:25:09
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_border_menu.c
Log Message:
Don't use getenv("HOME") directly.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- e_int_border_menu.c 6 Sep 2006 12:09:52 -0000 1.43
+++ e_int_border_menu.c 17 Sep 2006 11:25:06 -0000 1.44
@@ -559,8 +559,15 @@
{
if (bname)
{
- snprintf(path, sizeof(path), "%s/.e/e/applications/all/%s.desktop", getenv("HOME"), bname);
- a = e_app_empty_new(path);
+ char *homedir;
+
+ homedir = e_user_homedir_get();
+ if (homedir)
+ {
+ snprintf(path, sizeof(path), "%s/.e/e/applications/all/%s.desktop", homedir, bname);
+ free(homedir);
+ a = e_app_empty_new(path);
+ }
}
else
a = e_app_empty_new(NULL);
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-19 21:24:19
|
Enlightenment CVS committal Author : sebastid Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Removed Files: e_file_dialog.c e_file_dialog.h e_file_selector.c e_file_selector.h e_icon_canvas.c e_icon_canvas.h e_icon_grid.c e_icon_grid.h e_widget_fileman.c e_widget_fileman.h e_widget_iconsel.c e_widget_iconsel.h Log Message: Belongs to old fileman. |
|
From: Enlightenment C. <no...@cv...> - 2006-09-19 21:50:23
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c
Log Message:
Don't check argv twice, one check should be for argc
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -3 -r1.194 -r1.195
--- e_apps.c 19 Sep 2006 04:07:25 -0000 1.194
+++ e_apps.c 19 Sep 2006 21:50:20 -0000 1.195
@@ -950,7 +950,7 @@
((a->win_role) && (bd->client.icccm.window_role) && (e_util_glob_match(bd->client.icccm.window_role, a->win_role))))
ok++;
if (
- (a->exe) && (bd->client.icccm.command.argv) && (bd->client.icccm.command.argv))
+ (a->exe) && (bd->client.icccm.command.argc) && (bd->client.icccm.command.argv))
{
char *ts, *p;
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-21 19:37:11
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_container.c
Log Message:
Return a value.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_container.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- e_container.c 14 Sep 2006 23:16:46 -0000 1.110
+++ e_container.c 21 Sep 2006 19:37:04 -0000 1.111
@@ -646,7 +646,7 @@
Evas_List *l;
int pos = 0, i;
- if (!bd->zone) return;
+ if (!bd->zone) return NULL;
/* Remove from old layer */
for (i = 0; i < 7; i++)
{
@@ -700,7 +700,7 @@
Evas_List *l;
int pos = 0, i;
- if (!bd->zone) return;
+ if (!bd->zone) return NULL;
/* Remove from old layer */
for (i = 0; i < 7; i++)
{
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-21 19:53:42
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config.h e_eap_editor.c e_editable.c e_entry.c e_exebuf.c
e_fm.c e_gadcon.c e_int_config_apps.c
e_int_config_icon_themes.c e_int_config_mousebindings.c
e_int_config_startup.c e_int_config_theme_import.c
e_int_menus.c
Log Message:
Cleanup.
- Remove unused variables.
- Add const where needed.
- Add return values.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -3 -r1.121 -r1.122
--- e_config.h 19 Sep 2006 13:58:04 -0000 1.121
+++ e_config.h 21 Sep 2006 19:53:37 -0000 1.122
@@ -364,8 +364,8 @@
struct _E_Config_Mime_Icon
{
- char *mime;
- char *icon;
+ const char *mime;
+ const char *icon;
};
EAPI int e_config_init(void);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- e_eap_editor.c 18 Sep 2006 20:52:59 -0000 1.57
+++ e_eap_editor.c 21 Sep 2006 19:53:38 -0000 1.58
@@ -60,7 +60,7 @@
E_Config_Dialog_View *v;
E_App_Edit *editor;
- if (!con) return;
+ if (!con) return NULL;
editor = E_OBJECT_ALLOC(E_App_Edit, E_EAP_EDIT_TYPE, _e_eap_edit_free);
if (!editor) return NULL;
@@ -273,7 +273,7 @@
{
E_App_Edit *editor;
E_App *eap;
- Evas_Object *ol, *o, *mt;
+ Evas_Object *ol, *o;
Evas_Object *entry;
editor = data->editor;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_editable.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_editable.c 30 Aug 2006 20:53:29 -0000 1.14
+++ e_editable.c 21 Sep 2006 19:53:38 -0000 1.15
@@ -908,7 +908,7 @@
E_Editable_Smart_Data *sd;
Evas_Object *text_obj;
Evas_Coord tx, ty;
- Evas_Coord cx, cy, cw, ch;
+ Evas_Coord cx, cy, ch;
if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
return;
@@ -939,7 +939,7 @@
E_Editable_Smart_Data *sd;
Evas_Object *text_obj;
Evas_Coord tx, ty;
- Evas_Coord cx, cy, cw, ch;
+ Evas_Coord cx, cy;
Evas_Coord sx, sy, sw, sh;
int start_pos, end_pos;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- e_entry.c 23 Aug 2006 13:39:46 -0000 1.31
+++ e_entry.c 21 Sep 2006 19:53:38 -0000 1.32
@@ -383,7 +383,6 @@
Evas_Object *entry;
E_Entry_Smart_Data *sd;
Ecore_X_Event_Selection_Notify *ev;
- Ecore_X_Selection_Data *selection_data;
Evas_Object *editable;
int cursor_pos, selection_pos;
int start_pos, end_pos;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_exebuf.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_exebuf.c 19 Sep 2006 13:58:04 -0000 1.23
+++ e_exebuf.c 21 Sep 2006 19:53:38 -0000 1.24
@@ -432,7 +432,7 @@
_e_exebuf_exec_term(void)
{
char tmp[EXEBUFLEN];
- char *active_cmd;
+ const char *active_cmd;
if (exe_sel)
{
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- e_fm.c 19 Sep 2006 13:58:04 -0000 1.71
+++ e_fm.c 21 Sep 2006 19:53:38 -0000 1.72
@@ -160,7 +160,7 @@
static void _e_fm2_typebuf_run(Evas_Object *obj);
static void _e_fm2_typebuf_match(Evas_Object *obj);
static void _e_fm2_typebuf_complete(Evas_Object *obj);
-static void _e_fm2_typebuf_char_append(Evas_Object *obj, char *ch);
+static void _e_fm2_typebuf_char_append(Evas_Object *obj, const char *ch);
static void _e_fm2_typebuf_char_backspace(Evas_Object *obj);
static void _e_fm2_cb_dnd_enter(void *data, const char *type, void *event);
@@ -1855,7 +1855,7 @@
static int
_e_fm2_icon_desktop_load(E_Fm2_Icon *ic)
{
- char buf[4096], key[256], val[4096];
+ char buf[4096];
Ecore_Desktop *desktop;
if (ic->info.pseudo_link)
@@ -2289,7 +2289,7 @@
}
static void
-_e_fm2_typebuf_char_append(Evas_Object *obj, char *ch)
+_e_fm2_typebuf_char_append(Evas_Object *obj, const char *ch)
{
E_Fm2_Smart_Data *sd;
char *ts;
@@ -2343,7 +2343,7 @@
/* FIXME: prototype + reposition + implement */
static void
-_e_fm2_dnd_drop_into_hide(Evas_Object *obj)
+_e_fm2_dnd_drop_into_hide(E_Fm2_Icon *ic)
{
}
@@ -2355,7 +2355,7 @@
/* FIXME: prototype + reposition + implement */
static void
-_e_fm2_dnd_drop_between_hide(Evas_Object *obj)
+_e_fm2_dnd_drop_between_hide(E_Fm2_Icon *ic)
{
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- e_gadcon.c 18 Sep 2006 03:49:44 -0000 1.46
+++ e_gadcon.c 21 Sep 2006 19:53:38 -0000 1.47
@@ -57,7 +57,6 @@
static void _e_gadcon_client_current_position_sync(E_Gadcon_Client *gcc);
static void _e_gadcon_layout_smart_sync_clients(E_Gadcon *gc);
static void _e_gadcon_layout_smart_gadcon_position_shrinked_mode(E_Smart_Data *sd);
-static void _e_gadcon_layout_smart_gadcon_clients_save(E_Smart_Data *sd);
static void _e_gadcon_layout_smart_gadcons_asked_position_set(E_Smart_Data *sd);
static Evas_List *_e_gadcon_layout_smart_gadcons_wrap(E_Smart_Data *sd);
static void _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Evas_List **list);
@@ -1005,8 +1004,7 @@
_e_gadcon_client_cb_menu_autoscroll(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Gadcon_Client *gcc;
- E_Gadcon *gc;
-
+
gcc = data;
e_gadcon_layout_freeze(gcc->gadcon->o_container);
if (gcc->autoscroll) gcc->autoscroll = 0;
@@ -2338,8 +2336,8 @@
static void
_e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
{
- Evas_Coord x, y, w, h, xx, yy;
- Evas_List *l, *l2;
+ Evas_Coord xx, yy;
+ Evas_List *l;
int min, mino, cur;
Evas_List *list = NULL;
E_Gadcon_Layout_Item *bi;
@@ -2766,7 +2764,6 @@
_e_gadcon_layout_smart_width_smart_sort_reverse_cb(void *d1, void *d2)
{
E_Gadcon_Layout_Item *bi, *bi2;
- int v1, v2;
bi = evas_object_data_get(d1, "e_gadcon_layout_data");
bi2 = evas_object_data_get(d2, "e_gadcon_layout_data");
@@ -3201,7 +3198,6 @@
{
E_Gadcon_Layout_Item *bi;
Evas_List *l;
- int xx, yy;
for (l = sd->items; l; l = l->next)
{
@@ -3637,7 +3633,7 @@
if (!l2) l2 = *list;
else l2 = l2->next;
- for (l2; l2 != l; l2 = l2->next)
+ for (; l2 != l; l2 = l2->next)
{
lc = l2->data;
lc->pos = new_pos;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_int_config_apps.c 15 Sep 2006 17:44:23 -0000 1.26
+++ e_int_config_apps.c 21 Sep 2006 19:53:38 -0000 1.27
@@ -399,7 +399,6 @@
E_Fm2_Icon_Info *ici;
const char *realpath;
char buf[4096];
- E_App *a, *parent;
cfdata = data1;
if (!cfdata->gui.o_fm_all) return;
@@ -498,10 +497,8 @@
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
struct _E_Config_Once *once = NULL;
- Evas_Object *o, *of, *ob, *ot, *ilist, *mt;
- Evas_List *l;
+ Evas_Object *o, *of, *ob, *ot, *mt;
E_Fm2_Config fmc_all, fmc;
- int i;
if (cfdata->cfd->data)
once = cfdata->cfd->data;
@@ -674,7 +671,6 @@
{
char buf[4096];
Evas_List *list = NULL, *l;
- int ret = 0;
FILE *f;
snprintf(buf, sizeof(buf), "%s/.order", order);
@@ -734,7 +730,6 @@
{
char buf[4096], *last;
Evas_List *list = NULL, *l;
- int ret = 0;
FILE *f;
snprintf(buf, sizeof(buf), "%s/.order", order);
@@ -805,7 +800,6 @@
{
char buf[4096];
Evas_List *list = NULL, *l;
- int ret = 0;
FILE *f;
snprintf(buf, sizeof(buf), "%s/.order", order);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_icon_themes.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_int_config_icon_themes.c 30 Aug 2006 14:45:33 -0000 1.9
+++ e_int_config_icon_themes.c 21 Sep 2006 19:53:38 -0000 1.10
@@ -272,7 +272,6 @@
{
Evas_Object *o, *ilist;
Evas_List *l;
- E_Fm2_Config fmc;
int i;
o = e_widget_list_add(evas, 1, 0);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_mousebindings.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_int_config_mousebindings.c 31 Aug 2006 04:16:43 -0000 1.3
+++ e_int_config_mousebindings.c 21 Sep 2006 19:53:38 -0000 1.4
@@ -445,7 +445,6 @@
{
char *n;
const char *action;
- int i;
E_Config_Binding_Mouse *eb;
E_Config_Binding_Wheel *bw;
@@ -669,7 +668,6 @@
static void
_update_binding_context(E_Config_Dialog_Data *cfdata)
{
- int found = 0;
char *n;
E_Config_Binding_Mouse *eb;
E_Config_Binding_Wheel *bw;
@@ -845,7 +843,6 @@
static void
_binding_change_cb(void *data)
{
- char *n;
E_Config_Dialog_Data *cfdata;
cfdata = data;
@@ -853,7 +850,7 @@
_auto_apply_changes(cfdata);
if (cfdata->locals.cur) free(cfdata->locals.cur);
- cfdata->locals.cur == NULL;
+ cfdata->locals.cur = NULL;
if (cfdata->locals.binding[0])
cfdata->locals.cur = strdup(cfdata->locals.binding);
@@ -1000,7 +997,6 @@
static void
_restore_default_cb(void *data, void *data2)
{
- Evas_List *l;
E_Config_Binding_Mouse *eb;
E_Config_Binding_Wheel *bw;
E_Config_Dialog_Data *cfdata;
@@ -1101,10 +1097,9 @@
static int
_grab_mouse_down_cb(void *data, int type, void *event)
{
- Evas_List *l;
E_Config_Dialog_Data *cfdata;
E_Config_Binding_Mouse *eb;
- int mod = E_BINDING_MODIFIER_NONE, found = 0;
+ int mod = E_BINDING_MODIFIER_NONE;
Ecore_X_Event_Mouse_Button_Down *ev = event;
cfdata = data;
@@ -1152,11 +1147,10 @@
}
static int _grab_mouse_wheel_cb(void *data, int type, void *event)
{
- Evas_List *l;
E_Config_Binding_Wheel *bw;
E_Config_Dialog_Data *cfdata;
Ecore_X_Event_Mouse_Wheel *ev = event;
- int mod = E_BINDING_MODIFIER_NONE, found = 0;
+ int mod = E_BINDING_MODIFIER_NONE;
cfdata = data;
@@ -1223,6 +1217,7 @@
{
_grab_wnd_hide_cb(cfdata);
}
+ return 1;
}
static void
_grab_wnd_hide_cb(E_Config_Dialog_Data *cfdata)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_startup.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_int_config_startup.c 30 Aug 2006 14:45:33 -0000 1.18
+++ e_int_config_startup.c 21 Sep 2006 19:53:38 -0000 1.19
@@ -4,7 +4,6 @@
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static void _load_inits(E_Config_Dialog *cfd, Evas_Object *il);
void _ilist_cb_init_selected(void *data);
struct _E_Config_Dialog_Data
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme_import.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_int_config_theme_import.c 2 Sep 2006 10:39:28 -0000 1.6
+++ e_int_config_theme_import.c 21 Sep 2006 19:53:38 -0000 1.7
@@ -240,8 +240,7 @@
const char *file;
char *homedir;
char buf[4096];
- int is_theme;
-
+
win = data;
import = win->data;
if (!import) return;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -3 -r1.162 -r1.163
--- e_int_menus.c 18 Sep 2006 14:07:16 -0000 1.162
+++ e_int_menus.c 21 Sep 2006 19:53:38 -0000 1.163
@@ -570,7 +570,6 @@
E_Drag *drag;
Evas_Object *o = NULL;
Evas_Coord x, y, w, h;
- const char *file = NULL, *part = NULL;
const char *drag_types[] = { "enlightenment/eapp" };
evas_object_geometry_get(mi->icon_object,
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-21 19:57:36
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c
Log Message:
Someone(tm) needs to decide which param is the right to pass to these
functions.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- e_fm.c 21 Sep 2006 19:53:38 -0000 1.72
+++ e_fm.c 21 Sep 2006 19:57:34 -0000 1.73
@@ -2349,13 +2349,13 @@
/* FIXME: prototype + reposition + implement */
static void
-_e_fm2_dnd_drop_between_show(E_Fm2_Icon *ic, int after)
+_e_fm2_dnd_drop_between_show(Evas_Object *obj, int after)
{
}
/* FIXME: prototype + reposition + implement */
static void
-_e_fm2_dnd_drop_between_hide(E_Fm2_Icon *ic)
+_e_fm2_dnd_drop_between_hide(Evas_Object *obj)
{
}
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-21 20:01:51
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_fsel.c
Log Message:
Remove unused variable for for format.
Remove return value.
Fix format for long value.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- e_widget_fsel.c 18 Sep 2006 03:49:44 -0000 1.39
+++ e_widget_fsel.c 21 Sep 2006 20:01:50 -0000 1.40
@@ -98,8 +98,7 @@
}
fname = alloca(strlen(ecore_file_get_file(buf)) + 1);
strcpy(fname, ecore_file_get_file(buf));
- snprintf(buf, sizeof(buf), "%s/.e/e/fileman/favorites/.order",
- homedir, ecore_file_get_file(current_path));
+ snprintf(buf, sizeof(buf), "%s/.e/e/fileman/favorites/.order", homedir);
if (ecore_file_exists(buf))
{
f = fopen(buf, "a");
@@ -547,7 +546,7 @@
{
E_Widget_Data *wd;
- if (!obj) return NULL;
+ if (!obj) return;
wd = e_widget_data_get(obj);
e_fm2_window_object_set(wd->o_favorites_fm, eobj);
e_fm2_window_object_set(wd->o_files_fm, eobj);
@@ -658,7 +657,6 @@
int group_write = 0;
int other_read = 0;
int other_write = 0;
- int i;
if (getuid() == st_uid)
owner = 1;
@@ -732,17 +730,17 @@
if (diff <= 60)
snprintf(modtime, sizeof(modtime), _("In the last Minute"));
else if (diff >= 31526000)
- snprintf(modtime, sizeof(modtime), _("%i Years ago"), (diff / 31526000));
+ snprintf(modtime, sizeof(modtime), _("%li Years ago"), (diff / 31526000));
else if (diff >= 2592000)
- snprintf(modtime, sizeof(modtime), _("%i Months ago"), (diff / 2592000));
+ snprintf(modtime, sizeof(modtime), _("%li Months ago"), (diff / 2592000));
else if (diff >= 604800)
- snprintf(modtime, sizeof(modtime), _("%i Weeks ago"), (diff / 604800));
+ snprintf(modtime, sizeof(modtime), _("%li Weeks ago"), (diff / 604800));
else if (diff >= 86400)
- snprintf(modtime, sizeof(modtime), _("%i Days ago"), (diff / 86400));
+ snprintf(modtime, sizeof(modtime), _("%li Days ago"), (diff / 86400));
else if (diff >= 3600)
- snprintf(modtime, sizeof(modtime), _("%i Hours ago"), (diff / 3600));
+ snprintf(modtime, sizeof(modtime), _("%li Hours ago"), (diff / 3600));
else if (diff > 60)
- snprintf(modtime, sizeof(modtime), _("%i Minutes ago"), (diff / 60));
+ snprintf(modtime, sizeof(modtime), _("%li Minutes ago"), (diff / 60));
}
if (modtime)
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-21 20:05:46
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_gadcon.c
Log Message:
paranthesis are nice.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- e_gadcon.c 21 Sep 2006 19:53:38 -0000 1.47
+++ e_gadcon.c 21 Sep 2006 20:05:44 -0000 1.48
@@ -132,8 +132,8 @@
__con_state = E_LAYOUT_ITEM_CONTAINER_STATE_SIZE_MAX_END_DEC
#define LC_OVERLAP(__lc, __lc2) \
- ( __lc2->pos >= __lc->pos && (__lc2->pos < (__lc->pos + __lc->size)) || \
- __lc->pos >= __lc2->pos && (__lc->pos < (__lc2->pos + __lc2->size)))
+ ((((__lc2)->pos >= (__lc)->pos) && ((__lc2)->pos < ((__lc)->pos + (__lc)->size))) || \
+ (((__lc)->pos >= (__lc2)->pos) && ((__lc)->pos < ((__lc2)->pos + (__lc2)->size))))
#define E_LAYOUT_ITEM_CONTAINER_SIZE_CHANGE_BY(__lc, __bi, __increase) \
if (__lc->sd->horizontal) \
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-21 20:07:08
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fdo_menu_to_order.c e_int_config_transitions.c
e_obj_dialog.c
Log Message:
Remove unused variables.
Add missing type declaration.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fdo_menu_to_order.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_fdo_menu_to_order.c 19 Sep 2006 02:49:46 -0000 1.12
+++ e_fdo_menu_to_order.c 21 Sep 2006 20:07:02 -0000 1.13
@@ -24,8 +24,8 @@
static char *_e_fdo_menu_to_order_find_category(char *category);
static void _e_fdo_menu_to_order_dump_each_hash_node2(void *value, void *user_data);
-static menu_count;
-static item_count;
+static int menu_count;
+static int item_count;
EAPI void
e_fdo_menu_to_order(void)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_transitions.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_int_config_transitions.c 4 Sep 2006 14:15:34 -0000 1.2
+++ e_int_config_transitions.c 21 Sep 2006 20:07:02 -0000 1.3
@@ -197,8 +197,7 @@
E_Config_Dialog_Data *cfdata;
const char *t;
int sel;
- char buf[4096];
-
+
cfdata = data;
sel = e_widget_ilist_selected_get(cfdata->event_list);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_obj_dialog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_obj_dialog.c 10 Sep 2006 04:51:07 -0000 1.1
+++ e_obj_dialog.c 21 Sep 2006 20:07:02 -0000 1.2
@@ -66,7 +66,7 @@
EAPI void
e_obj_dialog_show(E_Obj_Dialog *od)
{
- Evas_Coord mw, mh, w, h;
+ Evas_Coord mw, mh;
E_OBJECT_CHECK(od);
E_OBJECT_TYPE_CHECK(od, E_OBJ_DIALOG_TYPE);
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-21 20:08:13
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm_mime.c
Log Message:
Remove unused label.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_mime.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_fm_mime.c 16 Sep 2006 11:35:54 -0000 1.5
+++ e_fm_mime.c 21 Sep 2006 20:08:11 -0000 1.6
@@ -142,7 +142,6 @@
snprintf(buf, sizeof(buf), "%s/data/icons/%s.png", e_prefix_data_get(), buf2);
if (ecore_file_exists(buf)) goto ok;
- error:
if (homedir) free(homedir);
return NULL;
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-21 20:10:21
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_wallpaper_import.c
Log Message:
Add cast to e_object
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_import.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_int_config_wallpaper_import.c 18 Sep 2006 03:49:44 -0000 1.23
+++ e_int_config_wallpaper_import.c 21 Sep 2006 20:10:19 -0000 1.24
@@ -140,7 +140,7 @@
_import_cb_sel_selected, import,
_import_cb_sel_change, import, 1
);
- e_widget_fsel_window_object_set(ofm, win);
+ e_widget_fsel_window_object_set(ofm, E_OBJECT(win));
import->fsel_obj = ofm;
e_widget_list_object_append(o, ofm, 1, 1, 0.5);
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-21 20:12:31
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_wallpaper_gradient.c
Log Message:
Remove unused.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_gradient.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_int_config_wallpaper_gradient.c 9 Sep 2006 16:41:00 -0000 1.10
+++ e_int_config_wallpaper_gradient.c 21 Sep 2006 20:12:27 -0000 1.11
@@ -54,10 +54,8 @@
static Ecore_Event_Handler *_import_edje_cc_exit_handler = NULL;
static void _import_opt_disabled_set(Import *import, int disabled);
-static void _import_path_save(Import *import);
static void _import_edj_gen(Import *import);
static int _import_cb_edje_cc_exit(void *data, int type, void *event);
-static void _import_cb_delete(E_Win *win);
static void _import_cb_close(void *data, E_Dialog *dia);
static void _import_cb_ok(void *data, E_Dialog *dia);
static void _import_config_save(Import *import);
@@ -72,7 +70,6 @@
Evas_Object *o, *ol, *of, *ord, *ot;
Evas_Coord mw, mh;
E_Radio_Group *rg;
- Evas_Coord w, h;
E_Config_Dialog_Data *cfdata;
import = E_NEW(Import, 1);
@@ -244,19 +241,12 @@
_import_edj_gen(Import *import)
{
Evas *evas;
- Evas_Object *img;
int fd, num = 1;
- int w = 0, h = 0;
const char *file;
- char buf[4096], cmd[4096], tmpn[4096], ipart[4096], enc[128];
- char *imgdir = NULL, *homedir, *fstrip;
- int cr = 255, cg = 255, cb = 255, ca = 255;
+ char buf[4096], cmd[4096], tmpn[4096];
+ char *homedir, *fstrip;
FILE *f;
- int angle;
- float rel1_rel_x, rel1_rel_y, rel2_rel_x, rel2_rel_y;
- float rel1_off_x, rel1_off_y, rel2_off_x, rel2_off_y;
-
evas = e_win_evas_get(import->dia->win);
file = import->cfdata->name;
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-22 04:18:43
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_wallpaper_gradient.c
e_int_config_wallpaper_import.c
Log Message:
Remove unused variables.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_gradient.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_int_config_wallpaper_gradient.c 21 Sep 2006 20:12:27 -0000 1.11
+++ e_int_config_wallpaper_gradient.c 22 Sep 2006 04:18:41 -0000 1.12
@@ -51,8 +51,6 @@
E_Color *color1, *color2;
};
-static Ecore_Event_Handler *_import_edje_cc_exit_handler = NULL;
-
static void _import_opt_disabled_set(Import *import, int disabled);
static void _import_edj_gen(Import *import);
static int _import_cb_edje_cc_exit(void *data, int type, void *event);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_import.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_int_config_wallpaper_import.c 21 Sep 2006 20:10:19 -0000 1.24
+++ e_int_config_wallpaper_import.c 22 Sep 2006 04:18:41 -0000 1.25
@@ -46,8 +46,6 @@
int quality;
};
-static Ecore_Event_Handler *_import_edje_cc_exit_handler = NULL;
-
static void _import_opt_disabled_set(Import *import, int disabled);
static void _import_cb_sel_selected(void *data, Evas_Object *obj);
static void _import_cb_sel_change(void *data, Evas_Object *obj);
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-22 19:55:19
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_config.c e_mod_main.c
Log Message:
Don't strdup homedir
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_config.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- e_mod_config.c 3 Sep 2006 07:40:44 -0000 1.30
+++ e_mod_config.c 22 Sep 2006 19:55:11 -0000 1.31
@@ -226,7 +226,8 @@
_load_tlist(E_Config_Dialog_Data *cfdata)
{
Ecore_List *dirs;
- char *home, buf[4096], *file;
+ const char *home;
+ char buf[4096], *file;
int selnum = -1;
e_widget_tlist_clear(cfdata->tlist);
@@ -254,7 +255,6 @@
}
ecore_list_destroy(dirs);
}
- free(home);
e_widget_tlist_go(cfdata->tlist);
if (selnum >= 0)
e_widget_tlist_selected_set(cfdata->tlist, selnum);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -3 -r1.146 -r1.147
--- e_mod_main.c 18 Sep 2006 03:49:45 -0000 1.146
+++ e_mod_main.c 22 Sep 2006 19:55:11 -0000 1.147
@@ -145,7 +145,7 @@
evas_object_geometry_get(o, &x, &y, &w, &h);
inst->drop_handler =
- e_drop_handler_add(inst->gcc->gadcon, inst,
+ e_drop_handler_add(E_OBJECT(inst->gcc->gadcon), inst,
_ibar_inst_cb_enter, _ibar_inst_cb_move,
_ibar_inst_cb_leave, _ibar_inst_cb_drop,
drop, 3, x, y, w, h);
@@ -242,14 +242,10 @@
e_box_align_set(b->o_box, 0.5, 0.5);
if (dir[0] != '/')
{
- char *homedir;
+ const char *homedir;
homedir = e_user_homedir_get();
- if (homedir)
- {
- snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/%s", homedir, dir);
- free(homedir);
- }
+ snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/%s", homedir, dir);
}
else
snprintf(buf, sizeof(buf), dir);
@@ -468,14 +464,10 @@
e_object_unref(E_OBJECT(inst->ibar->apps));
if (inst->dir[0] != '/')
{
- char *homedir;
+ const char *homedir;
homedir = e_user_homedir_get();
- if (homedir)
- {
- snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/%s", homedir, inst->dir);
- free(homedir);
- }
+ snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/%s", homedir, inst->dir);
}
else
snprintf(buf, sizeof(buf), inst->dir);
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-22 19:55:45
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_config.c e_fm.c e_fm_mime.c e_int_border_menu.c
e_int_config_apps.c e_int_config_desklock.c
e_int_config_startup.c e_int_config_theme.c
e_int_config_theme_import.c e_int_config_wallpaper.c
e_int_config_wallpaper_gradient.c
e_int_config_wallpaper_import.c e_int_menus.c e_main.c
e_path.c e_prefix.c e_startup.c e_user.c e_user.h
e_widget_fsel.c
Log Message:
Don't strdup homedir
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -3 -r1.197 -r1.198
--- e_apps.c 22 Sep 2006 14:56:41 -0000 1.197
+++ e_apps.c 22 Sep 2006 19:55:11 -0000 1.198
@@ -115,7 +115,7 @@
EAPI int
e_app_init(void)
{
- char *home;
+ const char *home;
char buf[PATH_MAX];
home = e_user_homedir_get();
@@ -123,7 +123,6 @@
_e_apps_path_trash = evas_stringshare_add(buf);
snprintf(buf, sizeof(buf), "%s/.e/e/applications/all", home);
_e_apps_path_all = evas_stringshare_add(buf);
- free(home);
_e_apps_repositories = evas_list_append(_e_apps_repositories, evas_stringshare_add(buf));
_e_apps_exit_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _e_apps_cb_exit, NULL);
_e_apps_border_add_handler = ecore_event_handler_add(E_EVENT_BORDER_ADD, _e_app_cb_event_border_add, NULL);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -3 -r1.204 -r1.205
--- e_config.c 19 Sep 2006 13:58:04 -0000 1.204
+++ e_config.c 22 Sep 2006 19:55:11 -0000 1.205
@@ -51,13 +51,12 @@
{
Eet_File *ef;
char buf[4096];
- char *homedir;
+ const char *homedir;
homedir = e_user_homedir_get();
snprintf(buf, sizeof(buf), "%s/.e/e/config/profile.cfg",
homedir);
ef = eet_open(buf, EET_FILE_MODE_READ);
- E_FREE(homedir);
if (ef)
{
char *data;
@@ -1465,7 +1464,7 @@
{
Ecore_List *files;
char buf[4096];
- char *homedir;
+ const char *homedir;
Evas_List *flist = NULL;
homedir = e_user_homedir_get();
@@ -1485,7 +1484,6 @@
}
ecore_list_destroy(files);
}
- E_FREE(homedir);
return flist;
}
@@ -1493,13 +1491,12 @@
e_config_profile_add(char *prof)
{
char buf[4096];
- char *homedir;
+ const char *homedir;
homedir = e_user_homedir_get();
snprintf(buf, sizeof(buf), "%s/.e/e/config/%s",
homedir, prof);
ecore_file_mkpath(buf);
- E_FREE(homedir);
}
EAPI void
@@ -1507,7 +1504,7 @@
{
Ecore_List *files;
char buf[4096];
- char *homedir;
+ const char *homedir;
homedir = e_user_homedir_get();
snprintf(buf, sizeof(buf), "%s/.e/e/config/%s", homedir, prof);
@@ -1528,7 +1525,6 @@
}
snprintf(buf, sizeof(buf), "%s/.e/e/config/%s", homedir, prof);
ecore_file_rmdir(buf);
- E_FREE(homedir);
}
EAPI Evas_List *
@@ -1562,7 +1558,7 @@
{
Eet_File *ef;
char buf[4096];
- char *homedir;
+ const char *homedir;
void *data = NULL;
homedir = e_user_homedir_get();
@@ -1575,7 +1571,6 @@
homedir, "default", domain);
ef = eet_open(buf, EET_FILE_MODE_READ);
}
- E_FREE(homedir);
if (ef)
{
data = eet_data_read(ef, edd, "config");
@@ -1589,7 +1584,7 @@
{
Eet_File *ef;
char buf[4096], buf2[4096];
- char *homedir;
+ const char *homedir;
int ok = 0;
/* FIXME: check for other sessions fo E running */
@@ -1597,7 +1592,6 @@
snprintf(buf, sizeof(buf), "%s/.e/e/config/profile.cfg",
homedir);
snprintf(buf2, sizeof(buf2), "%s.tmp", buf);
- free(homedir);
ef = eet_open(buf2, EET_FILE_MODE_WRITE);
if (ef)
@@ -1619,7 +1613,7 @@
{
Eet_File *ef;
char buf[4096], buf2[4096];
- char *homedir;
+ const char *homedir;
int ok = 0;
if (_e_config_save_block) return 0;
@@ -1631,7 +1625,6 @@
snprintf(buf, sizeof(buf), "%s/.e/e/config/%s/%s.cfg",
homedir, _e_config_profile, domain);
snprintf(buf2, sizeof(buf2), "%s.tmp", buf);
- E_FREE(homedir);
ef = eet_open(buf2, EET_FILE_MODE_WRITE);
if (ef)
{
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- e_fm.c 21 Sep 2006 22:26:08 -0000 1.74
+++ e_fm.c 22 Sep 2006 19:55:11 -0000 1.75
@@ -223,19 +223,13 @@
EAPI int
e_fm2_init(void)
{
- char *homedir;
+ const char *homedir;
char path[PATH_MAX];
homedir = e_user_homedir_get();
- if (homedir)
- {
- snprintf(path, sizeof(path), "%s/.e/e/fileman/metadata", homedir);
- ecore_file_mkpath(path);
- _meta_path = strdup(path);
- free(homedir);
- }
- else return 0;
-
+ snprintf(path, sizeof(path), "%s/.e/e/fileman/metadata", homedir);
+ ecore_file_mkpath(path);
+ _meta_path = strdup(path);
_e_fm2_smart = evas_smart_new("e_fm",
_e_fm2_smart_add, /* add */
@@ -665,7 +659,6 @@
else if (CMP("~/")) {
s = e_user_homedir_get();
PRT("%s%s", s, path);
- free(s);
}
else if (dev[0] == '/') {
/* dev is a full path - consider it a mountpoint device on its own */
@@ -679,7 +672,6 @@
*/
s = e_user_homedir_get();
PRT("%s/.e/e/fileman/favorites", s);
- free(s);
}
else if (CMP("dvd") || CMP("dvd-*")) {
/* FIXME: find dvd mountpoint optionally for dvd no. X */
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_mime.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_fm_mime.c 22 Sep 2006 03:51:17 -0000 1.8
+++ e_fm_mime.c 22 Sep 2006 19:55:11 -0000 1.9
@@ -65,7 +65,8 @@
EAPI const char *
e_fm_mime_icon_get(const char *mime)
{
- char buf[4096], buf2[4096], *homedir = NULL, *val;
+ char buf[4096], buf2[4096], *val;
+ const char *homedir = NULL;
Evas_List *l;
E_Config_Mime_Icon *mi;
Evas_List *freelist = NULL;
@@ -105,8 +106,7 @@
/* 2. look up in ~/.e/e/icons */
homedir = e_user_homedir_get();
- if (!homedir) return NULL;
-
+
snprintf(buf, sizeof(buf), "%s/.e/e/icons/%s.edj", homedir, mime);
if (ecore_file_exists(buf)) goto ok;
snprintf(buf, sizeof(buf), "%s/.e/e/icons/%s.svg", homedir, mime);
@@ -142,13 +142,11 @@
snprintf(buf, sizeof(buf), "%s/data/icons/%s.png", e_prefix_data_get(), buf2);
if (ecore_file_exists(buf)) goto ok;
- if (homedir) free(homedir);
return NULL;
ok:
val = (char *)evas_stringshare_add(buf);
icon_map = evas_hash_add(icon_map, mime, val);
- if (homedir) free(homedir);
return val;
}
@@ -184,7 +182,7 @@
{
static double last_t = 0.0, t;
char buf[4096];
- char *homedir;
+ const char *homedir;
int reload = 0;
/* load /etc/mime.types
@@ -197,8 +195,7 @@
if ((t - last_t) < 1.0) return;
homedir = e_user_homedir_get();
- if (!homedir) return;
-
+
{
static time_t last_changed = 0;
time_t ch;
@@ -280,7 +277,6 @@
_e_fm_mime_shared_mimeinfo_globs_load(buf);
}
}
- free(homedir);
}
static int
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- e_int_border_menu.c 17 Sep 2006 11:25:06 -0000 1.44
+++ e_int_border_menu.c 22 Sep 2006 19:55:11 -0000 1.45
@@ -559,15 +559,11 @@
{
if (bname)
{
- char *homedir;
+ const char *homedir;
homedir = e_user_homedir_get();
- if (homedir)
- {
- snprintf(path, sizeof(path), "%s/.e/e/applications/all/%s.desktop", homedir, bname);
- free(homedir);
- a = e_app_empty_new(path);
- }
+ snprintf(path, sizeof(path), "%s/.e/e/applications/all/%s.desktop", homedir, bname);
+ a = e_app_empty_new(path);
}
else
a = e_app_empty_new(NULL);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_int_config_apps.c 21 Sep 2006 19:53:38 -0000 1.27
+++ e_int_config_apps.c 22 Sep 2006 19:55:11 -0000 1.28
@@ -96,9 +96,9 @@
static void
_fill_data(E_Config_Dialog_Data *cfdata)
{
- cfdata->homedir = e_user_homedir_get();
+ cfdata->homedir = strdup(e_user_homedir_get());
if (!cfdata->homedir) return;
-
+
snprintf(cfdata->path_everything, sizeof(cfdata->path_everything), "%s/.e/e/applications/all", cfdata->homedir);
snprintf(cfdata->path, sizeof(cfdata->path), "%s/.e/e/applications", cfdata->homedir);
snprintf(cfdata->path_all, sizeof(cfdata->path_all), "%s/.e/e/applications/menu/all", cfdata->homedir);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desklock.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- e_int_config_desklock.c 5 Sep 2006 03:16:14 -0000 1.35
+++ e_int_config_desklock.c 22 Sep 2006 19:55:11 -0000 1.36
@@ -194,8 +194,8 @@
_cb_files_files_changed(void *data, Evas_Object *obj, void *event_info)
{
E_Config_Dialog_Data *cfdata;
- const char *p;
- char *homedir, buf[4096];
+ const char *p, *homedir;
+ char buf[4096];
cfdata = data;
if (!cfdata->bg) return;
@@ -206,9 +206,7 @@
if (strncmp(p, cfdata->bg, strlen(p))) return;
}
homedir = e_user_homedir_get();
- if (!homedir) return;
snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds", homedir);
- free(homedir);
if (!p) return;
if (!strncmp(cfdata->bg, buf, strlen(buf)))
p = cfdata->bg + strlen(buf) + 1;
@@ -228,7 +226,8 @@
_cb_dir(void *data, Evas_Object *obj, void *event_info)
{
E_Config_Dialog_Data *cfdata;
- char path[4096], *homedir;
+ char path[4096];
+ const char *homedir;
cfdata = data;
if (cfdata->fmdir == 1)
@@ -239,7 +238,6 @@
{
homedir = e_user_homedir_get();
snprintf(path, sizeof(path), "%s/.e/e/backgrounds", homedir);
- free(homedir);
}
e_fm2_path_set(cfdata->o_fm, path, "/");
}
@@ -281,7 +279,8 @@
static void
_fill_data(E_Config_Dialog_Data *cfdata)
{
- char path[4096], *homedir;
+ char path[4096];
+ const char *homedir;
// we have to read it from e_config->...
if (e_config->desklock_personal_passwd)
@@ -348,7 +347,6 @@
cfdata->bg = strdup(path);
}
}
- free(homedir);
}
#ifdef HAVE_PAM
@@ -534,7 +532,8 @@
{
Evas_Object *ob, *oc;
Evas_Object *o, *ot, *of, *il, *ol;
- char path[4096], *homedir;
+ char path[4096];
+ const char *homedir;
const char *f;
E_Fm2_Config fmc;
E_Zone *z;
@@ -544,8 +543,7 @@
#endif
homedir = e_user_homedir_get();
- if (!homedir) return NULL;
-
+
z = e_zone_current_get(cfd->con);
cfdata->evas = evas;
@@ -786,7 +784,6 @@
e_widget_table_object_append(ot, of, 1, 2, 1, 1 ,1 ,1 ,1 ,1);
#endif
- free(homedir);
e_dialog_resizable_set(cfd->dia, 0);
return ot;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_startup.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_int_config_startup.c 21 Sep 2006 19:53:38 -0000 1.19
+++ e_int_config_startup.c 22 Sep 2006 19:55:11 -0000 1.20
@@ -116,8 +116,8 @@
_cb_files_files_changed(void *data, Evas_Object *obj, void *event_info)
{
E_Config_Dialog_Data *cfdata;
- const char *p;
- char *homedir, buf[4096];
+ const char *p, *homedir;
+ char buf[4096];
cfdata = data;
if (!cfdata->splash) return;
@@ -128,9 +128,7 @@
if (strncmp(p, cfdata->splash, strlen(p))) return;
}
homedir = e_user_homedir_get();
- if (!homedir) return;
snprintf(buf, sizeof(buf), "%s/.e/e/init", homedir);
- free(homedir);
if (!p) return;
if (!strncmp(cfdata->splash, buf, strlen(buf)))
p = cfdata->splash + strlen(buf) + 1;
@@ -150,7 +148,8 @@
_cb_dir(void *data, Evas_Object *obj, void *event_info)
{
E_Config_Dialog_Data *cfdata;
- char path[4096], *homedir;
+ char path[4096];
+ const char *homedir;
cfdata = data;
if (cfdata->fmdir == 1)
@@ -161,7 +160,6 @@
{
homedir = e_user_homedir_get();
snprintf(path, sizeof(path), "%s/.e/e/init", homedir);
- free(homedir);
}
e_fm2_path_set(cfdata->o_fm, path, "/");
}
@@ -169,8 +167,9 @@
static void
_fill_data(E_Config_Dialog_Data *cfdata)
{
- char path[4096], *homedir;
-
+ char path[4096];
+ const char *homedir;
+
cfdata->show_splash = e_config->show_splash;
cfdata->splash = NULL;
if (e_config->init_default_theme)
@@ -198,7 +197,6 @@
cfdata->splash = strdup(path);
}
}
- free(homedir);
}
snprintf(path, sizeof(path), "%s/data/init", e_prefix_data_get());
@@ -252,14 +250,13 @@
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *ot, *of, *il, *ol;
- char path[4096], *homedir;
- const char *f;
+ char path[4096];
+ const char *f, *homedir;
E_Fm2_Config fmc;
E_Zone *z;
E_Radio_Group *rg;
homedir = e_user_homedir_get();
- if (!homedir) return NULL;
z = e_zone_current_get(cfd->con);
@@ -347,6 +344,5 @@
&(cfdata->show_splash));
e_widget_table_object_append(ot, o, 1, 3, 1, 1, 1, 0, 0, 0);
- free(homedir);
return ot;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- e_int_config_theme.c 3 Sep 2006 01:26:14 -0000 1.37
+++ e_int_config_theme.c 22 Sep 2006 19:55:11 -0000 1.38
@@ -60,17 +60,16 @@
e_int_config_theme_update(E_Config_Dialog *dia, char *file)
{
E_Config_Dialog_Data *cfdata;
- char *homedir, path[4096];
+ const char *homedir;
+ char path[4096];
cfdata = dia->cfdata;
homedir = e_user_homedir_get();
- if (!homedir) return;
cfdata->fmdir = 1;
e_widget_radio_toggle_set(cfdata->o_personal, 1);
snprintf(path, sizeof(path), "%s/.e/e/themes", homedir);
- E_FREE(homedir);
E_FREE(cfdata->theme);
cfdata->theme = strdup(file);
@@ -176,7 +175,8 @@
{
E_Config_Dialog_Data *cfdata;
const char *p;
- char *homedir, buf[4096];
+ const char *homedir;
+ char buf[4096];
cfdata = data;
if (!cfdata->theme) return;
@@ -187,9 +187,7 @@
if (strncmp(p, cfdata->theme, strlen(p))) return;
}
homedir = e_user_homedir_get();
- if (!homedir) return;
snprintf(buf, sizeof(buf), "%s/.e/e/themes", homedir);
- free(homedir);
if (!p) return;
if (!strncmp(cfdata->theme, buf, strlen(buf)))
p = cfdata->theme + strlen(buf) + 1;
@@ -209,8 +207,9 @@
_cb_dir(void *data, Evas_Object *obj, void *event_info)
{
E_Config_Dialog_Data *cfdata;
- char path[4096], *homedir;
-
+ char path[4096];
+ const char *homedir;
+
cfdata = data;
if (cfdata->fmdir == 1)
{
@@ -220,7 +219,6 @@
{
homedir = e_user_homedir_get();
snprintf(path, sizeof(path), "%s/.e/e/themes", homedir);
- free(homedir);
}
e_fm2_path_set(cfdata->o_fm, path, "/");
}
@@ -278,7 +276,8 @@
_fill_data(E_Config_Dialog_Data *cfdata)
{
E_Config_Theme * c;
- char path[4096], *homedir;
+ char path[4096];
+ const char *homedir;
c = e_theme_config_get("theme");
if (c)
@@ -306,7 +305,6 @@
cfdata->theme = strdup(path);
}
}
- free(homedir);
}
snprintf(path, sizeof(path), "%s/data/themes", e_prefix_data_get());
@@ -340,14 +338,13 @@
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *ot, *of, *il, *ol;
- char path[4096], *homedir;
- const char *f;
+ char path[4096];
+ const char *f, *homedir;
E_Fm2_Config fmc;
E_Zone *z;
E_Radio_Group *rg;
homedir = e_user_homedir_get();
- if (!homedir) return NULL;
z = e_zone_current_get(cfd->con);
@@ -440,7 +437,6 @@
e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
- free(homedir);
e_dialog_resizable_set(cfd->dia, 1);
return ot;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme_import.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_int_config_theme_import.c 21 Sep 2006 19:53:38 -0000 1.7
+++ e_int_config_theme_import.c 22 Sep 2006 19:55:11 -0000 1.8
@@ -238,7 +238,7 @@
E_Win *win;
const char *path;
const char *file;
- char *homedir;
+ const char *homedir;
char buf[4096];
win = data;
@@ -246,8 +246,7 @@
if (!import) return;
homedir = e_user_homedir_get();
- if (!homedir) return;
-
+
path = e_widget_fsel_selection_path_get(import->fsel_obj);
E_FREE(import->cfdata->file);
if (path)
@@ -257,7 +256,6 @@
{
file = ecore_file_get_file(import->cfdata->file);
snprintf(buf, sizeof(buf), "%s/.e/e/themes/%s", homedir, file);
- E_FREE(homedir);
if (!ecore_file_strip_ext(file))
return;
@@ -284,9 +282,7 @@
e_int_config_theme_update(import->parent, buf);
}
}
- else
- E_FREE(homedir);
-
+
e_int_config_theme_del(import->win);
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_int_config_wallpaper.c 3 Sep 2006 01:51:43 -0000 1.15
+++ e_int_config_wallpaper.c 22 Sep 2006 19:55:11 -0000 1.16
@@ -59,15 +59,14 @@
e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file)
{
E_Config_Dialog_Data *cfdata;
- char path[4096], *homedir;
+ char path[4096];
+ const char *homedir;
cfdata = dia->cfdata;
homedir = e_user_homedir_get();
- if (!homedir) return;
cfdata->fmdir = 1;
e_widget_radio_toggle_set(cfdata->o_personal, 1);
snprintf(path, sizeof(path), "%s/.e/e/backgrounds", homedir);
- E_FREE(homedir);
E_FREE(cfdata->bg);
cfdata->bg = strdup(file);
cfdata->use_theme_bg = 0;
@@ -180,8 +179,8 @@
_cb_files_files_changed(void *data, Evas_Object *obj, void *event_info)
{
E_Config_Dialog_Data *cfdata;
- const char *p;
- char *homedir, buf[4096];
+ const char *p, *homedir;
+ char buf[4096];
cfdata = data;
if (!cfdata->bg) return;
@@ -192,9 +191,7 @@
if (strncmp(p, cfdata->bg, strlen(p))) return;
}
homedir = e_user_homedir_get();
- if (!homedir) return;
snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds", homedir);
- free(homedir);
if (!p) return;
if (!strncmp(cfdata->bg, buf, strlen(buf)))
p = cfdata->bg + strlen(buf) + 1;
@@ -275,7 +272,8 @@
_cb_dir(void *data, Evas_Object *obj, void *event_info)
{
E_Config_Dialog_Data *cfdata;
- char path[4096], *homedir;
+ char path[4096];
+ const char *homedir;
cfdata = data;
if (cfdata->fmdir == 1)
@@ -286,7 +284,6 @@
{
homedir = e_user_homedir_get();
snprintf(path, sizeof(path), "%s/.e/e/backgrounds", homedir);
- free(homedir);
}
e_fm2_path_set(cfdata->o_fm, path, "/");
}
@@ -392,14 +389,13 @@
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *ot, *of, *il, *ol;
- char path[4096], *homedir;
- const char *f;
+ char path[4096];
+ const char *f, *homedir;
E_Fm2_Config fmc;
E_Zone *z;
E_Radio_Group *rg;
homedir = e_user_homedir_get();
- if (!homedir) return NULL;
z = e_zone_current_get(cfd->con);
@@ -505,7 +501,6 @@
e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
- free(homedir);
e_dialog_resizable_set(cfd->dia, 1);
return ot;
}
@@ -537,14 +532,13 @@
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *ot, *of, *il, *ol;
- char path[4096], *homedir;
- const char *f;
+ char path[4096];
+ const char *f, *homedir;
E_Fm2_Config fmc;
E_Zone *z;
E_Radio_Group *rg;
homedir = e_user_homedir_get();
- if (!homedir) return NULL;
z = e_zone_current_get(cfd->con);
@@ -663,7 +657,6 @@
e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
- free(homedir);
e_dialog_resizable_set(cfd->dia, 1);
return ot;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_gradient.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_int_config_wallpaper_gradient.c 22 Sep 2006 04:18:41 -0000 1.12
+++ e_int_config_wallpaper_gradient.c 22 Sep 2006 19:55:11 -0000 1.13
@@ -241,21 +241,17 @@
Evas *evas;
int fd, num = 1;
const char *file;
+ const char *homedir;
char buf[4096], cmd[4096], tmpn[4096];
- char *homedir, *fstrip;
+ char *fstrip;
FILE *f;
evas = e_win_evas_get(import->dia->win);
file = import->cfdata->name;
homedir = e_user_homedir_get();
- if (!homedir) return;
fstrip = ecore_file_strip_ext(file);
- if (!fstrip)
- {
- free(homedir);
- return;
- }
+ if (!fstrip) return;
snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds/%s.edj", homedir, fstrip);
while (ecore_file_exists(buf))
{
@@ -263,7 +259,6 @@
num++;
}
free(fstrip);
- free(homedir);
strcpy(tmpn, "/tmp/e_bgdlg_new.edc-tmp-XXXXXX");
fd = mkstemp(tmpn);
if (fd < 0)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_import.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_int_config_wallpaper_import.c 22 Sep 2006 04:18:41 -0000 1.25
+++ e_int_config_wallpaper_import.c 22 Sep 2006 19:55:11 -0000 1.26
@@ -292,22 +292,17 @@
Evas_Object *img;
int fd, num = 1;
int w = 0, h = 0;
- const char *file;
+ const char *file, *homedir;
char buf[4096], cmd[4096], tmpn[4096], ipart[4096], enc[128];
- char *imgdir = NULL, *homedir, *fstrip;
+ char *imgdir = NULL, *fstrip;
int cr = 255, cg = 255, cb = 255, ca = 255;
FILE *f;
evas = e_win_evas_get(import->win);
file = ecore_file_get_file(import->cfdata->file);
homedir = e_user_homedir_get();
- if (!homedir) return;
fstrip = ecore_file_strip_ext(file);
- if (!fstrip)
- {
- free(homedir);
- return;
- }
+ if (!fstrip) return;
snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds/%s.edj", homedir, fstrip);
while (ecore_file_exists(buf))
{
@@ -315,7 +310,6 @@
num++;
}
free(fstrip);
- free(homedir);
strcpy(tmpn, "/tmp/e_bgdlg_new.edc-tmp-XXXXXX");
fd = mkstemp(tmpn);
if (fd < 0)
@@ -503,7 +497,8 @@
E_Win *win;
const char *path;
const char *file;
- char buf[4096], *homedir;
+ const char *homedir;
+ char buf[4096];
int is_bg, is_theme;
win = data;
@@ -520,11 +515,9 @@
else
{
homedir = e_user_homedir_get();
- if (!homedir) return;
snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds/%s",
homedir, file);
- E_FREE(homedir);
-
+
is_bg = edje_file_group_exists(import->cfdata->file,
"e/desktop/background");
is_theme =
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -3 -r1.164 -r1.165
--- e_int_menus.c 22 Sep 2006 10:12:32 -0000 1.164
+++ e_int_menus.c 22 Sep 2006 19:55:11 -0000 1.165
@@ -183,17 +183,12 @@
{
E_Menu *m;
char buf[4096];
- char *homedir;
+ const char *homedir;
homedir = e_user_homedir_get();
- if (homedir)
- {
- snprintf(buf, sizeof(buf), "%s/.e/e/applications/menu/favorite", homedir);
- m = e_int_menus_apps_new(buf);
- free(homedir);
- return m;
- }
- return NULL;
+ snprintf(buf, sizeof(buf), "%s/.e/e/applications/menu/favorite", homedir);
+ m = e_int_menus_apps_new(buf);
+ return m;
}
EAPI E_Menu *
@@ -201,17 +196,12 @@
{
E_Menu *m;
char buf[4096];
- char *homedir;
+ const char *homedir;
homedir = e_user_homedir_get();
- if (homedir)
- {
- snprintf(buf, sizeof(buf), "%s/.e/e/applications/menu/all", homedir);
- m = e_int_menus_apps_new(buf);
- free(homedir);
- return m;
- }
- return NULL;
+ snprintf(buf, sizeof(buf), "%s/.e/e/applications/menu/all", homedir);
+ m = e_int_menus_apps_new(buf);
+ return m;
}
EAPI E_Menu *
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -3 -r1.188 -r1.189
--- e_main.c 16 Sep 2006 11:51:05 -0000 1.188
+++ e_main.c 22 Sep 2006 19:55:11 -0000 1.189
@@ -267,16 +267,12 @@
/* fixes for FOOLS that keep cp'ing default.edj into ~/.e/e/themes */
{
- char *homedir;
+ const char *homedir;
homedir = e_user_homedir_get();
- if (homedir)
- {
- snprintf(buf, sizeof(buf), "%s/.e/e/themes/default.edj", homedir);
- if (ecore_file_exists(buf))
- ecore_file_unlink(buf);
- free(homedir);
- }
+ snprintf(buf, sizeof(buf), "%s/.e/e/themes/default.edj", homedir);
+ if (ecore_file_exists(buf))
+ ecore_file_unlink(buf);
}
@@ -828,7 +824,7 @@
static int
_e_main_dirs_init(void)
{
- char *homedir;
+ const char *homedir;
char buf[PATH_MAX];
const char *dirs[] =
{
@@ -857,7 +853,6 @@
int i;
homedir = e_user_homedir_get();
- if (!homedir) return 0;
for (i = 0; i < (int)(sizeof(dirs) / sizeof(char *)); i++)
{
snprintf(buf, sizeof(buf), dirs[i], homedir);
@@ -866,7 +861,6 @@
e_error_message_show("Error creating directory:\n"
"%s",
buf);
- free(homedir);
return 0;
}
}
@@ -911,7 +905,6 @@
homedir);
system(buf);
}
- free(homedir);
return 1;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_path.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_path.c 9 Apr 2006 11:55:18 -0000 1.20
+++ e_path.c 22 Sep 2006 19:55:11 -0000 1.21
@@ -28,23 +28,17 @@
{
E_Path_Dir *epd;
char *new_path;
- char *home_dir;
+ const char *home_dir;
int len1, len2;
home_dir = e_user_homedir_get();
- if (!home_dir) return;
len1 = strlen(home_dir);
len2 = strlen(path);
new_path = malloc(len1 + len2 + 1);
- if (!new_path)
- {
- free(home_dir);
- return;
- }
+ if (!new_path) return;
epd = malloc(sizeof(E_Path_Dir));
if (!epd)
{
- free(home_dir);
free(new_path);
return;
}
@@ -53,7 +47,6 @@
strcat(new_path, path + 1);
epd->dir = evas_stringshare_add(new_path);
free(new_path);
- free(home_dir);
ep->default_dir_list = evas_list_append(ep->default_dir_list, epd);
}
else
@@ -89,23 +82,17 @@
{
E_Path_Dir *epd;
char *new_path;
- char *home_dir;
+ const char *home_dir;
int len1, len2;
home_dir = e_user_homedir_get();
- if (!home_dir) return;
len1 = strlen(home_dir);
len2 = strlen(path);
new_path = malloc(len1 + len2 + 1);
- if (!new_path)
- {
- free(home_dir);
- return;
- }
+ if (!new_path) return;
epd = malloc(sizeof(E_Path_Dir));
if (!epd)
{
- free(home_dir);
free(new_path);
return;
}
@@ -114,7 +101,6 @@
strcat(new_path, path + 1);
epd->dir = evas_stringshare_add(new_path);
free(new_path);
- free(home_dir);
*(ep->user_dir_list) = evas_list_append(*(ep->user_dir_list), epd);
}
else
@@ -139,23 +125,17 @@
{
E_Path_Dir *epd;
char *new_path;
- char *home_dir;
+ const char *home_dir;
int len1, len2;
home_dir = e_user_homedir_get();
- if (!home_dir) return;
len1 = strlen(home_dir);
len2 = strlen(path);
new_path = malloc(len1 + len2 + 1);
- if (!new_path)
- {
- free(home_dir);
- return;
- }
+ if (!new_path) return;
epd = malloc(sizeof(E_Path_Dir));
if (!epd)
{
- free(home_dir);
free(new_path);
return;
}
@@ -164,7 +144,6 @@
strcat(new_path, path + 1);
epd->dir = evas_stringshare_add(new_path);
free(new_path);
- free(home_dir);
*(ep->user_dir_list) = evas_list_prepend(*(ep->user_dir_list), epd);
}
else
@@ -190,22 +169,16 @@
if (path[0] == '~')
{
char *new_path;
- char *home_dir;
+ const char *home_dir;
int len1, len2;
home_dir = e_user_homedir_get();
- if (!home_dir) return;
len1 = strlen(home_dir);
len2 = strlen(path);
new_path = malloc(len1 + len2 + 1);
- if (!new_path)
- {
- free(home_dir);
- return;
- }
+ if (!new_path) return;
strcpy(new_path, home_dir);
strcat(new_path, path + 1);
- free(home_dir);
for (l = *(ep->user_dir_list); l; l = l->next)
{
E_Path_Dir *epd;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_prefix.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_prefix.c 24 Jul 2006 07:20:43 -0000 1.18
+++ e_prefix.c 22 Sep 2006 19:55:11 -0000 1.19
@@ -195,7 +195,7 @@
char buf[4096], buf2[4096], *p;
FILE *f;
#ifdef PREFIX_CACHE_FILE
- char *home;
+ const char *home;
#endif
/* sometimes this isnt the case - so we need to do a more exhaustive search
@@ -214,8 +214,7 @@
/* 1. check cache file - as a first attempt. this will speed up subsequent
* hunts - if needed */
home = e_user_homedir_get();
- if (!home) return 0;
-
+
snprintf(buf, sizeof(buf), "%s/.e/e/prefix_share_cache.txt", home);
f = fopen(buf, "r");
if (f)
@@ -237,7 +236,6 @@
snprintf(buf2, sizeof(buf2), "%s/locale", buf);
_prefix_path_locale = strdup(buf2);
fclose(f);
- free(home);
return 1;
}
}
@@ -319,14 +317,10 @@
fprintf(f, "%s\n", _prefix_path_data);
fclose(f);
}
- free(home);
#endif
return 1;
}
/* fail. everything failed */
-#ifdef PREFIX_CACHE_FILE
- free(home);
-#endif
return 0;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_startup.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_startup.c 7 Jan 2006 10:39:45 -0000 1.7
+++ e_startup.c 22 Sep 2006 19:55:11 -0000 1.8
@@ -20,7 +20,7 @@
EAPI void
e_startup(E_Startup_Mode mode)
{
- char *homedir;
+ const char *homedir;
char buf[PATH_MAX];
homedir = e_user_homedir_get();
@@ -28,7 +28,6 @@
snprintf(buf, sizeof(buf), "%s/.e/e/applications/startup", homedir);
else if (mode == E_STARTUP_RESTART)
snprintf(buf, sizeof(buf), "%s/.e/e/applications/restart", homedir);
- free(homedir);
startup_apps = e_app_new(buf, 1);
if (!startup_apps)
{
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_user.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_user.c 15 Jul 2006 16:29:14 -0000 1.4
+++ e_user.c 22 Sep 2006 19:55:11 -0000 1.5
@@ -4,19 +4,19 @@
#include "e.h"
/* externally accessible functions */
-EAPI char *
+EAPI const char *
e_user_homedir_get(void)
{
char *homedir;
int len;
homedir = getenv("HOME");
- if (!homedir) return strdup("/tmp");
+ if (!homedir) return "/tmp";
len = strlen(homedir);
while ((len > 1) && (homedir[len - 1] == '/'))
{
homedir[len - 1] = 0;
len--;
}
- return strdup(homedir);
+ return homedir;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_user.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_user.h 7 Feb 2005 13:51:09 -0000 1.4
+++ e_user.h 22 Sep 2006 19:55:11 -0000 1.5
@@ -6,7 +6,7 @@
#ifndef E_USER_H
#define E_USER_H
-EAPI char *e_user_homedir_get(void);
+EAPI const char *e_user_homedir_get(void);
#endif
#endif
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- e_widget_fsel.c 21 Sep 2006 20:01:50 -0000 1.40
+++ e_widget_fsel.c 22 Sep 2006 19:55:11 -0000 1.41
@@ -70,8 +70,8 @@
_e_wid_fsel_favorites_add(void *data1, void *data2)
{
E_Widget_Data *wd;
- const char *current_path;
- char buf[4096], *fname, *homedir;
+ const char *current_path, *homedir;
+ char buf[4096], *fname;
struct stat st;
int i = 1;
FILE *f;
@@ -80,7 +80,6 @@
current_path = e_fm2_real_path_get(wd->o_files_fm);
if (!ecore_file_is_dir(current_path)) return;
homedir = e_user_homedir_get();
- if (!homedir) return;
snprintf(buf, sizeof(buf), "%s/.e/e/fileman/favorites/%s",
homedir, ecore_file_get_file(current_path));
if (stat(buf, &st) < 0) symlink(current_path, buf);
@@ -109,7 +108,6 @@
}
}
e_fm2_refresh(wd->o_favorites_fm);
- free(homedir);
}
static void
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-23 08:45:00
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fdo_menu_to_order.c
Log Message:
Get homedir from e, since .e should be relative to this dir.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fdo_menu_to_order.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_fdo_menu_to_order.c 22 Sep 2006 10:12:32 -0000 1.14
+++ e_fdo_menu_to_order.c 23 Sep 2006 08:44:58 -0000 1.15
@@ -34,7 +34,7 @@
ecore_desktop_instrumentation_reset();
/* Nuke the old menus. */
- snprintf(dir, sizeof(dir), "%s/.e/e/applications/menu/all/", ecore_desktop_home_get());
+ snprintf(dir, sizeof(dir), "%s/.e/e/applications/menu/all/", e_user_homedir_get());
ecore_file_recursive_rm(dir);
menu_count = 0;
item_count = 0;
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-23 10:15:28
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fdo_menu_to_order.c
Log Message:
Use e's homedir
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fdo_menu_to_order.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_fdo_menu_to_order.c 23 Sep 2006 08:44:58 -0000 1.15
+++ e_fdo_menu_to_order.c 23 Sep 2006 10:15:24 -0000 1.16
@@ -68,7 +68,7 @@
if (order_data.sheap)
{
ecore_sheap_set_free_cb(order_data.sheap, free);
- snprintf(order_data.order_path, sizeof(order_data.order_path), "%s/.e/e/applications/menu/all/%s", ecore_desktop_home_get(), path);
+ snprintf(order_data.order_path, sizeof(order_data.order_path), "%s/.e/e/applications/menu/all/%s", e_user_homedir_get(), path);
/* Check if we need to create the directory. */
if (!ecore_file_exists(order_data.order_path))
{
@@ -124,7 +124,7 @@
printf("MAKING MENU ITEM %s -> %s (%s)\n", order_data->order_path, file, key);
#endif
item_count++;
- snprintf(path2, sizeof(path2), "%s/.e/e/applications/all/%s", ecore_desktop_home_get(), key);
+ snprintf(path2, sizeof(path2), "%s/.e/e/applications/all/%s", e_user_homedir_get(), key);
if (!ecore_file_exists(path2))
ecore_file_symlink(file, path2);
ecore_sheap_insert(order_data->sheap, strdup(key));
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-24 13:37:39
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.c
Log Message:
Add cast.
Remove unused variables.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -3 -r1.189 -r1.190
--- e_mod_main.c 18 Sep 2006 03:49:45 -0000 1.189
+++ e_mod_main.c 24 Sep 2006 13:37:37 -0000 1.190
@@ -173,7 +173,7 @@
evas_object_geometry_get(o, &x, &y, &w, &h);
inst->drop_handler =
- e_drop_handler_add(inst->gcc->gadcon, inst,
+ e_drop_handler_add(E_OBJECT(inst->gcc->gadcon), inst,
_pager_inst_cb_enter, _pager_inst_cb_move,
_pager_inst_cb_leave, _pager_inst_cb_drop,
drop, 2, x, y, w, h);
@@ -1624,7 +1624,6 @@
{
Evas_Event_Mouse_Wheel *ev;
Pager_Desk *pd;
- Evas_List *l;
ev = event_info;
pd = data;
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-24 13:38:08
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibox
Modified Files:
e_mod_main.c
Log Message:
Add cast.
Remove unused variables.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/ibox/e_mod_main.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- e_mod_main.c 18 Sep 2006 03:49:45 -0000 1.68
+++ e_mod_main.c 24 Sep 2006 13:37:37 -0000 1.69
@@ -155,7 +155,7 @@
evas_object_geometry_get(o, &x, &y, &w, &h);
inst->drop_handler =
- e_drop_handler_add(inst->gcc->gadcon, inst,
+ e_drop_handler_add(E_OBJECT(inst->gcc->gadcon), inst,
_ibox_inst_cb_enter, _ibox_inst_cb_move,
_ibox_inst_cb_leave, _ibox_inst_cb_drop,
drop, 1, x, y, w, h);
|
|
From: Enlightenment C. <no...@cv...> - 2006-09-24 13:38:08
|
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_main.c
Log Message:
Add cast.
Remove unused variables.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -3 -r1.147 -r1.148
--- e_mod_main.c 22 Sep 2006 19:55:11 -0000 1.147
+++ e_mod_main.c 24 Sep 2006 13:37:37 -0000 1.148
@@ -810,7 +810,6 @@
_ibar_cb_menu_add_application_cb(void *data, const char *path)
{
IBar *b;
- IBar_Icon *ic;
E_App *a;
b = data;
|
Thanks for helping keep SourceForge clean.
X