Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
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/ibar/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 04:47:41 -0000 1.1
+++ e_mod_config.h 18 Dec 2005 06:28:42 -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_ibar(E_Container *con, IBar *ibar);
+EAPI void _config_ibar_module(E_Container *con, IBar *ibar);
#endif
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/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 20:54:52 -0000 1.8
+++ e_mod_config.c 18 Dec 2005 06:28:42 -0000 1.9
@@ -5,11 +5,6 @@
typedef struct _cfdata CFData;
typedef struct _Cfg_File_Data Cfg_File_Data;
-#define ICONSIZE_SMALL 24
-#define ICONSIZE_MEDIUM 32
-#define ICONSIZE_LARGE 40
-#define ICONSIZE_VERYLARGE 48
-
struct _cfdata
{
int autofit;
@@ -34,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_ibar(E_Container *con, IBar *ibar)
+void
+_config_ibar_module(E_Container *con, IBar *ibar)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View v;
@@ -51,7 +47,8 @@
cfd = e_config_dialog_new(con, _("IBar Configuration"), NULL, 0, &v, ibar);
}
-static void _fill_data(IBar *ib, CFData *cfdata)
+static void
+_fill_data(IBar *ib, CFData *cfdata)
{
cfdata->autofit = (ib->conf->width == IBAR_WIDTH_AUTO);
cfdata->follower = ib->conf->follower;
@@ -60,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;
IBar *ib;
@@ -71,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;
IBar *ib;
@@ -92,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)
{
IBar *ib;
Evas_List *l;
@@ -123,10 +124,10 @@
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, *ot;
- E_Radio_Group *rg;
+ Evas_Object *o, *of, *ob;
IBar *ib;
ib = cfd->data;
@@ -159,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)
{
IBar *ib;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- e_mod_main.c 17 Dec 2005 20:54:52 -0000 1.94
+++ e_mod_main.c 18 Dec 2005 06:28:42 -0000 1.95
@@ -170,7 +170,7 @@
ib = m->data;
con = e_container_current_get(e_manager_current_get());
- if (ib) e_int_config_ibar(con, ib);
+ if (ib) _config_ibar_module(con, ib);
return 1;
}
@@ -648,7 +648,7 @@
ibb = data;
if (!ibb) return;
- e_int_config_ibar(ibb->con, ibb->ibar);
+ _config_ibar_module(ibb->con, ibb->ibar);
}
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
