Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : screenshot
Dir : e_modules/screenshot
Modified Files:
e_mod_config.h e_mod_config.c e_mod_main.c e_mod_main.h
configure.in Makefile.am
Log Message:
Rename e_int_config calls to avoid future conflicts with E namespace.
Formatting
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_config.h 16 Dec 2005 01:07:33 -0000 1.1
+++ e_mod_config.h 18 Dec 2005 06:18:07 -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_screenshot(E_Container *con, Screen *s);
+EAPI void _config_screenshot_module(E_Container *con, Screen *s);
#endif
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_config.c 18 Dec 2005 03:53:39 -0000 1.2
+++ e_mod_config.c 18 Dec 2005 06:18:07 -0000 1.3
@@ -61,7 +61,7 @@
/* Config Calls */
void
-e_int_config_screenshot(E_Container *con, Screen *s)
+_config_screenshot_module(E_Container *con, Screen *s)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View v;
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_main.c 17 Dec 2005 21:44:27 -0000 1.3
+++ e_mod_main.c 18 Dec 2005 06:18:07 -0000 1.4
@@ -53,7 +53,8 @@
return e;
}
-int e_modapi_shutdown(E_Module *m)
+int
+e_modapi_shutdown(E_Module *m)
{
Screen *s;
@@ -71,7 +72,8 @@
return 1;
}
-int e_modapi_save(E_Module *m)
+int
+e_modapi_save(E_Module *m)
{
Screen *e;
@@ -82,13 +84,15 @@
return 1;
}
-int e_modapi_info(E_Module *m)
+int
+e_modapi_info(E_Module *m)
{
m->icon_file = strdup(PACKAGE_DATA_DIR"/module_icon.png");
return 1;
}
-int e_modapi_about(E_Module *m)
+int
+e_modapi_about(E_Module *m)
{
e_module_dialog_show(_("Enlightenment Screenshot Module"),
("This module is used to take screenshots"));
@@ -104,11 +108,12 @@
s = m->data;
if (!s) return 0;
con = e_container_current_get(e_manager_current_get());
- e_int_config_screenshot(con, s);
+ _config_screenshot_module(con, s);
return 1;
}
-static Screen *_screen_init(E_Module *m)
+static Screen
+*_screen_init(E_Module *m)
{
Screen *e;
E_Menu_Item *mi;
@@ -247,7 +252,8 @@
return e;
}
-static void _screen_shutdown(Screen *e)
+static void
+_screen_shutdown(Screen *e)
{
_screen_face_free(e->face);
@@ -259,7 +265,8 @@
free(e);
}
-static void _screen_config_menu_new(Screen *e)
+static void
+_screen_config_menu_new(Screen *e)
{
E_Menu *mn;
@@ -267,7 +274,8 @@
e->config_menu = mn;
}
-static int _screen_face_init(Screen_Face *sf)
+static int
+_screen_face_init(Screen_Face *sf)
{
Evas_Object *o;
@@ -304,7 +312,8 @@
return 1;
}
-static void _screen_face_free(Screen_Face *ef)
+static void
+_screen_face_free(Screen_Face *ef)
{
if (ef->menu) e_object_del(E_OBJECT(ef->menu));
if (ef->event_object) evas_object_del(ef->event_object);
@@ -317,7 +326,8 @@
screen_count--;
}
-static void _screen_face_menu_new(Screen_Face *face)
+static void
+_screen_face_menu_new(Screen_Face *face)
{
E_Menu *mn;
E_Menu_Item *mi;
@@ -335,7 +345,8 @@
e_menu_item_callback_set(mi, _screen_face_cb_menu_edit, face);
}
-static void _screen_face_enable(Screen_Face *face)
+static void
+_screen_face_enable(Screen_Face *face)
{
face->conf->enabled = 1;
e_config_save_queue();
@@ -343,7 +354,8 @@
evas_object_show(face->event_object);
}
-static void _screen_face_disable(Screen_Face *face)
+static void
+_screen_face_disable(Screen_Face *face)
{
face->conf->enabled = 0;
e_config_save_queue();
@@ -351,7 +363,8 @@
evas_object_hide(face->event_object);
}
-static void _screen_face_cb_gmc_change(void *data, E_Gadman_Client *gmc,
E_Gadman_Change change)
+static void
+_screen_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change
change)
{
Screen_Face *ef;
Evas_Coord x, y, w, h;
@@ -373,7 +386,8 @@
}
}
-static void _screen_face_cb_mouse_down(void *data, Evas *e, Evas_Object
*obj,void *event_info)
+static void
+_screen_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj,void
*event_info)
{
Ecore_Exe *x;
Evas_Event_Mouse_Down *ev;
@@ -449,7 +463,8 @@
}
}
-static void _screen_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi)
+static void
+_screen_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi)
{
Screen_Face *face;
@@ -457,7 +472,8 @@
e_gadman_mode_set(face->gmc->gadman, E_GADMAN_MODE_EDIT);
}
-char *get_options(char **opt)
+char
+*get_options(char **opt)
{
int i, j;
char buff[1024];
@@ -481,7 +497,8 @@
return strdup(buff);
}
-char *get_filename(Config *conf)
+char
+*get_filename(Config *conf)
{
char buff[256];
time_t t;
@@ -546,7 +563,8 @@
}
}
-static int _screen_exe_cb_exit(void *data, int type, void *event)
+static int
+_screen_exe_cb_exit(void *data, int type, void *event)
{
Ecore_Event_Exe_Exit *ev;
Ecore_Exe *x;
@@ -563,7 +581,7 @@
ecore_event_handler_del(_screen_exe_exit_handler);
-#ifdef OSIRIS
+#ifdef WANT_OSIRIS
char buff[256], tmp[1024];
time_t t;
struct tm *loctime;
@@ -620,12 +638,13 @@
return 0;
}
-static void _screen_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
+static void
+_screen_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
{
Screen_Face *sf;
E_Config_Dialog *cfg;
sf = data;
if (!sf) return;
- e_int_config_screenshot(sf->con, sf->screen);
+ _config_screenshot_module(sf->con, sf->screen);
}
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_main.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_main.h 16 Dec 2005 01:07:33 -0000 1.1
+++ e_mod_main.h 18 Dec 2005 06:18:07 -0000 1.2
@@ -71,6 +71,5 @@
EAPI int e_modapi_save (E_Module *m);
EAPI int e_modapi_info (E_Module *m);
EAPI int e_modapi_about (E_Module *m);
-char *get_home();
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/screenshot/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- configure.in 16 Dec 2005 01:07:33 -0000 1.1
+++ configure.in 18 Dec 2005 06:18:07 -0000 1.2
@@ -203,10 +203,10 @@
)
if test "x$want_osiris" = "xyes"; then
- AC_DEFINE(OSIRIS, 1, [Define to 1 to enable osiris code])
- AM_CONDITIONAL(OSIRIS, true)
+ AC_DEFINE(WANT_OSIRIS, 1, [Define to 1 to enable osiris code])
+ AM_CONDITIONAL(WANT_OSIRIS, true)
else
- AM_CONDITIONAL(OSIRIS, false)
+ AM_CONDITIONAL(WANT_OSIRIS, false)
fi
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/screenshot/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 16 Dec 2005 01:07:33 -0000 1.1
+++ Makefile.am 18 Dec 2005 06:18:07 -0000 1.2
@@ -28,8 +28,10 @@
pkgdir = $(datadir)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c e_mod_main.h e_mod_config.c
e_mod_config.h
-
+module_la_SOURCES = e_mod_main.c \
+ e_mod_main.h \
+ e_mod_config.c \
+ e_mod_config.h
module_la_LIBADD = @e_libs@ -lm
module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h
-------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
