Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibox
Modified Files:
e_mod_config.h e_mod_config.c e_mod_main.c
Log Message:
Rename e_int_config calls to avoid E namespace conflicts
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_config.h 13 Dec 2005 14:32:18 -0000 1.1
+++ e_mod_config.h 18 Dec 2005 06:30:39 -0000 1.2
@@ -3,6 +3,6 @@
#ifndef E_MOD_CONFIG_H
#define E_MOD_CONFIG_H
#include "e_mod_main.h"
-EAPI void e_int_config_ibox(E_Container *con, IBox *ibox);
+EAPI void _config_ibox_module(E_Container *con, IBox *ibox);
#endif
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_config.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_config.c 17 Dec 2005 21:16:38 -0000 1.8
+++ e_mod_config.c 18 Dec 2005 06:30:39 -0000 1.9
@@ -29,7 +29,8 @@
static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
CFData *cfdata);
static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-void e_int_config_ibox(E_Container *con, IBox *ibox)
+void
+_config_ibox_module(E_Container *con, IBox *ibox)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View v;
@@ -46,7 +47,8 @@
cfd = e_config_dialog_new(con, _("IBox Configuration"), NULL, 0, &v, ibox);
}
-static void _fill_data(IBox *ib, CFData *cfdata)
+static void
+_fill_data(IBox *ib, CFData *cfdata)
{
cfdata->autofit = (ib->conf->width == IBOX_WIDTH_AUTO);
cfdata->follower = ib->conf->follower;
@@ -55,7 +57,8 @@
cfdata->autoscroll_speed = ib->conf->autoscroll_speed;
}
-static void *_create_data(E_Config_Dialog *cfd)
+static void
+*_create_data(E_Config_Dialog *cfd)
{
CFData *cfdata;
IBox *ib;
@@ -66,12 +69,14 @@
return cfdata;
}
-static void _free_data(E_Config_Dialog *cfd, CFData *cfdata)
+static void
+_free_data(E_Config_Dialog *cfd, CFData *cfdata)
{
free(cfdata);
}
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
CFData *cfdata)
+static Evas_Object
+*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{
Evas_Object *o, *ob;
IBox *ib;
@@ -87,7 +92,8 @@
return o;
}
-static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+static int
+_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
{
IBox *ib;
Evas_List *l;
@@ -118,7 +124,8 @@
return 1;
}
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
CFData *cfdata)
+static Evas_Object
+*_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{
Evas_Object *o, *of, *ob;
IBox *ib;
@@ -153,7 +160,8 @@
return o;
}
-static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+static int
+_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
{
IBox *ib;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_main.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- e_mod_main.c 17 Dec 2005 22:57:15 -0000 1.32
+++ e_mod_main.c 18 Dec 2005 06:30:39 -0000 1.33
@@ -157,7 +157,7 @@
if (!e->boxes) return 0;
face = e->boxes->data;
if (!face) return 0;
- e_int_config_ibox(face->con, face->ibox);
+ _config_ibox_module(face->con, face->ibox);
return 1;
}
@@ -473,7 +473,7 @@
ibb = (IBox_Box *)data;
if (!ibb) return;
- e_int_config_ibox(ibb->con, ibb->ibox);
+ _config_ibox_module(ibb->con, ibb->ibox);
}
static void
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
