E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: configure.in Log Message: Fix minor oversight with x86_64 libdir. Thanks Sebastian === RCS file: /cvs/e/e_modules/mbar/configure.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- configure.in25 Jul 2006 03:52:17 - 1.6 +++ configure.in25 Jul 2006 13:32:09 - 1.7 @@ -102,7 +102,7 @@ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, ${HOME}/.e/e/modules/${PACKAGE}, Package installed data destination) datadir=${HOME}/.e/e/modules/${PACKAGE} else -AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, ${libdir}/lib/enlightenment/modules/${PACKAGE}, Package installed data destination) +AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, ${libdir}/enlightenment/modules/${PACKAGE}, Package installed data destination) datadir=${libdir}/enlightenment/modules/${PACKAGE} fi - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: configure.in Log Message: Bad Marcus, no cookie :) . Fixed x86_64 install patch. === RCS file: /cvs/e/e_modules/mbar/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- configure.in25 Jul 2006 01:39:23 - 1.5 +++ configure.in25 Jul 2006 03:52:17 - 1.6 @@ -102,7 +102,7 @@ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, ${HOME}/.e/e/modules/${PACKAGE}, Package installed data destination) datadir=${HOME}/.e/e/modules/${PACKAGE} else -AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, ${prefix}/lib/enlightenment/modules/${PACKAGE}, Package installed data destination) +AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, ${libdir}/lib/enlightenment/modules/${PACKAGE}, Package installed data destination) datadir=${libdir}/enlightenment/modules/${PACKAGE} fi - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_config_point.c Log Message: More Cleanup. === RCS file: /cvs/e/e_modules/mbar/e_mod_config_point.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_config_point.c17 Jul 2006 23:20:51 - 1.6 +++ e_mod_config_point.c17 Jul 2006 23:49:17 - 1.7 @@ -31,22 +31,16 @@ int is_new; }; -/* local subsystem functions */ - static void _e_eap_edit_fill_data(E_Config_Dialog_Data *cdfata); static void *_e_eap_edit_create_data(E_Config_Dialog *cfd); static void _e_eap_edit_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data); static int _e_eap_edit_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data); -//static int _e_eap_edit_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data); static Evas_Object *_e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *data); -//static Evas_Object *_e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *data); static void _e_eap_edit_select_cb(Evas_Object *obj, char *file, void *data); static void _e_eap_edit_hilite_cb(Evas_Object *obj, char *file, void *data); #define IFDUP(src, dst) if (src) dst = strdup(src); else dst = NULL -/* externally accessible functions */ - void point_edit_show(E_Container *con, E_App *a, E_App *apps, Evas_Object *il) { @@ -69,23 +63,19 @@ v = E_NEW(E_Config_Dialog_View, 1); if (v) { -/* methods */ v-create_cfdata = _e_eap_edit_create_data; v-free_cfdata = _e_eap_edit_free_data; v-basic.apply_cfdata = _e_eap_edit_basic_apply_data; v-basic.create_widgets = _e_eap_edit_basic_create_widgets; v-override_auto_apply = 1; -/* create config diaolg for NULL object/data */ + cfd = e_config_dialog_new(con, _(Mount Point Editor), NULL, 0, v, editor); } } -/* local subsystem functions */ - static void _e_eap_edit_fill_data(E_Config_Dialog_Data *cfdata) { - /*- BASIC -*/ IFDUP(cfdata-editor-eap-name, cfdata-name); if (cfdata-editor-eap-exe) { @@ -97,7 +87,6 @@ IFDUP(cfdata-editor-eap-generic, cfdata-generic); IFDUP(cfdata-editor-eap-comment, cfdata-comment); - //IFDUP(cfdata-editor-eap-icon_class, cfdata-iclass); IFDUP(cfdata-editor-eap-path, cfdata-path); cfdata-startup_notify = cfdata-editor-eap-startup_notify; cfdata-wait_exit = cfdata-editor-eap-wait_exit; @@ -214,7 +203,6 @@ editor = data-editor; eap = editor-eap; - //ol = e_widget_list_add(evas, 0, 1); ol = e_widget_table_add(evas, 0); o = e_widget_frametable_add(evas, _(Icon), 0); @@ -266,7 +254,6 @@ editor = data; editor-img_set = 1; - printf(selected: %s\n, file); } void @@ -276,5 +263,4 @@ editor = data; editor-img_set = 1; - printf(hilited: %s\n, file); } - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_config.c Log Message: Remove some silly comments. === RCS file: /cvs/e/e_modules/mbar/e_mod_config.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_config.c 17 Jul 2006 23:20:51 - 1.6 +++ e_mod_config.c 17 Jul 2006 23:50:16 - 1.7 @@ -33,7 +33,6 @@ v = E_NEW(E_Config_Dialog_View, 1); - /* Dialog Methods */ v-create_cfdata = _create_data; v-free_cfdata = _free_data; v-basic.apply_cfdata = _basic_apply_data; @@ -41,7 +40,6 @@ v-advanced.apply_cfdata = _advanced_apply_data; v-advanced.create_widgets = _advanced_create_widgets; - /* Create The Dialog */ snprintf(buf, sizeof(buf), %s/module.eap, e_module_dir_get(mbar-module)); cfd = e_config_dialog_new(con, _(Mount Bar Configuration), buf, 0, v, mbar); mbar-config_dialog = cfd; @@ -177,7 +175,6 @@ e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); - /* allow overlap checkbox */ of = e_widget_framelist_add(evas, _(Extras), 0); ob = e_widget_check_add(evas, _(Allow windows to overlap this gadget), (cfdata-allow_overlap)); e_widget_framelist_object_append(of, ob); @@ -197,7 +194,6 @@ else if (!(cfdata-follower) (mb-conf-follower)) mb-conf-follower = 0; - /* allow overlap check box */ if (cfdata-allow_overlap !mb-conf-allow_overlap) mb-conf-allow_overlap = 1; else if (!cfdata-allow_overlap mb-conf-allow_overlap) - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar/data/themes Modified Files: Makefile.am Log Message: Proper install and make distcheck now. === RCS file: /cvs/e/e_modules/mbar/data/themes/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 29 Mar 2006 00:47:39 - 1.3 +++ Makefile.am 14 Jul 2006 19:20:15 - 1.4 @@ -5,16 +5,15 @@ filesdir = $(datadir) files_DATA = \ -fonts/VeraBd.ttf \ -mbar.edj \ -mbar.edc +mbar.edj -EXTRA_DIST = $(files_DATA) $(wildcard images/*.png) +EXTRA_DIST = $(files_DATA) \ + $(wildcard images/*.png) \ + fonts/VeraBd.ttf \ + mbar.edc -mbar.edj: Makefile mbar.edc -$(EDJE_CC) $(EDJE_FLAGS) \ -mbar.edc \ -mbar.edj +%.edj: %.edc + $(EDJE_CC) $(EDJE_FLAGS) $ $@ clean-local: rm -f *.edj - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: Makefile.am Log Message: Proper install and make distcheck now. === RCS file: /cvs/e/e_modules/mbar/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 4 Jun 2006 12:59:16 - 1.2 +++ Makefile.am 14 Jul 2006 19:20:14 - 1.3 @@ -15,6 +15,7 @@ -I$(top_srcdir) \ -I$(includedir) \ @e_cflags@ + pkgdir = $(datadir)/$(MODULE_ARCH) pkg_LTLIBRARIES= module.la module_la_SOURCES = e_mod_main.c \ - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.c Log Message: Make all active e_modules work with the new e_module_dialog_show function change(s). If you get errors building these, update e17/apps/e . === RCS file: /cvs/e/e_modules/mbar/e_mod_main.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- e_mod_main.c4 Jun 2006 12:59:16 - 1.21 +++ e_mod_main.c2 Jul 2006 19:06:09 - 1.22 @@ -172,7 +172,7 @@ EAPI int e_modapi_about(E_Module *m) { - e_module_dialog_show(_(Enlightenment Mount Bar Module), + e_module_dialog_show(m, _(Enlightenment Mount Bar Module), _(This is the Mount Bar module for Enlightenment.)); return 1; } Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.c Log Message: Make mbar build with new e_module api changes. === RCS file: /cvs/e/e_modules/mbar/e_mod_main.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- e_mod_main.c2 Jul 2006 19:06:09 - 1.22 +++ e_mod_main.c2 Jul 2006 20:24:53 - 1.23 @@ -2007,12 +2007,12 @@ if (!strcmp(tag, Unmount)) { if (mounted) - e_module_dialog_show(_(Mount Bar Module), _(Unmount Failed.)); + e_module_dialog_show(NULL, _(Mount Bar Module), _(Unmount Failed.)); } else if (!strcmp(tag, Mount)) { if (!mounted) - e_module_dialog_show(_(Mount Bar Module), _(Mount Failed.)); + e_module_dialog_show(NULL, _(Mount Bar Module), _(Mount Failed.)); else { if (ic-app-exe) @@ -2028,7 +2028,7 @@ else if (!strcmp(tag, Eject)) { if (mounted) - e_module_dialog_show(_(Mount Bar Module), _(Eject Failed.)); + e_module_dialog_show(NULL, _(Mount Bar Module), _(Eject Failed.)); } _mbar_set_state(ic, mounted); Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_config.c e_mod_main.c e_mod_main.h Log Message: Update some e_modules to use module icons in their config dialogs. === RCS file: /cvs/e/e_modules/mbar/e_mod_config.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_config.c 7 Apr 2006 09:12:31 - 1.4 +++ e_mod_config.c 3 Jul 2006 07:37:32 - 1.5 @@ -29,7 +29,8 @@ { E_Config_Dialog *cfd; E_Config_Dialog_View *v; - + char buf[4096]; + v = E_NEW(E_Config_Dialog_View, 1); /* Dialog Methods */ @@ -41,7 +42,8 @@ v-advanced.create_widgets = _advanced_create_widgets; /* Create The Dialog */ - cfd = e_config_dialog_new(con, _(Mount Bar Configuration), NULL, 0, v, mbar); + snprintf(buf, sizeof(buf), %s/module.eap, e_module_dir_get(mbar-module)); + cfd = e_config_dialog_new(con, _(Mount Bar Configuration), buf, 0, v, mbar); mbar-config_dialog = cfd; } === RCS file: /cvs/e/e_modules/mbar/e_mod_main.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- e_mod_main.c2 Jul 2006 20:24:53 - 1.23 +++ e_mod_main.c3 Jul 2006 07:37:32 - 1.24 @@ -138,6 +138,7 @@ /* actually init mbar */ mb = _mbar_new(); + mb-module = m; return mb; } @@ -379,6 +380,7 @@ #endif evas_list_free(mb-conf-bars); + mb-module = NULL; free(mb-conf); free(mb); } === RCS file: /cvs/e/e_modules/mbar/e_mod_main.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_main.h4 Jun 2006 12:59:16 - 1.5 +++ e_mod_main.h3 Jul 2006 07:37:32 - 1.6 @@ -41,7 +41,8 @@ E_App *apps; Evas_List *bars; E_Menu *config_menu; - + E_Module *module; + Config *conf; E_Config_Dialog *config_dialog; #ifdef HAVE_LINUX Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: COPYING Added Files: COPYING-PLAIN Log Message: License Fix to Bsd. === RCS file: /cvs/e/e_modules/mbar/COPYING,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- COPYING 15 Mar 2006 00:26:18 - 1.1 +++ COPYING 16 Jun 2006 15:43:05 - 1.2 @@ -1,340 +1,28 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 +Copyright (C) 2000 Christopher Michael and various contributors (see AUTHORS) - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The Program, below, -refers to any such program or work, and a work based on the Program -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term modification.) Each licensee is addressed as you. - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.h e_mod_main.c Makefile.am Added Files: module.eap Log Message: Make mbar module work again :) === RCS file: /cvs/e/e_modules/mbar/e_mod_main.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_main.h5 Apr 2006 17:48:49 - 1.4 +++ e_mod_main.h4 Jun 2006 12:59:16 - 1.5 @@ -108,7 +108,6 @@ EAPI void *e_modapi_init(E_Module *m); EAPI int e_modapi_shutdown(E_Module *m); EAPI int e_modapi_save(E_Module *m); -EAPI int e_modapi_info(E_Module *m); EAPI int e_modapi_about(E_Module *m); EAPI int e_modapi_config(E_Module *m); === RCS file: /cvs/e/e_modules/mbar/e_mod_main.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- e_mod_main.c8 Apr 2006 00:12:30 - 1.20 +++ e_mod_main.c4 Jun 2006 12:59:16 - 1.21 @@ -138,7 +138,6 @@ /* actually init mbar */ mb = _mbar_new(); - m-config_menu = mb-config_menu; return mb; } @@ -147,9 +146,6 @@ { MBar *mb; - if (m-config_menu) - m-config_menu = NULL; - mb = m-data; if (!mb) return 1; @@ -170,13 +166,6 @@ mb = m-data; e_config_domain_save(module.mbar, conf_edd, mb-conf); - return 1; -} - -EAPI int -e_modapi_info(E_Module *m) -{ - m-icon_file = strdup(PACKAGE_DATA_DIR /module_icon.png); return 1; } === RCS file: /cvs/e/e_modules/mbar/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 15 Mar 2006 00:26:18 - 1.1 +++ Makefile.am 4 Jun 2006 12:59:16 - 1.2 @@ -5,7 +5,8 @@ # data files for the module filesdir = $(datadir) files_DATA = \ -module_icon.png +module_icon.png \ +module.eap EXTRA_DIST = $(files_DATA) ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_config_point.c Log Message: Allow setting exec to emtpy string without mount points disappearing. === RCS file: /cvs/e/e_modules/mbar/e_mod_config_point.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_config_point.c7 Apr 2006 09:12:31 - 1.4 +++ e_mod_config_point.c8 Apr 2006 11:15:42 - 1.5 @@ -88,11 +88,12 @@ { /*- BASIC -*/ IFDUP(cfdata-editor-eap-name, cfdata-name); - if (cfdata-editor-eap-exe) - IFDUP(cfdata-editor-eap-exe, cfdata-exe); - else - IFDUP(cfdata-editor-eap-name, cfdata-exe); - + if (cfdata-editor-eap-exe) + { + if (strcmp(cfdata-editor-eap-exe, cfdata-editor-eap-name)) + IFDUP(cfdata-editor-eap-exe, cfdata-exe); + } + IFDUP(cfdata-editor-eap-generic, cfdata-generic); IFDUP(cfdata-editor-eap-comment, cfdata-comment); //IFDUP(cfdata-editor-eap-icon_class, cfdata-iclass); @@ -169,10 +170,20 @@ eap-name = evas_stringshare_add(cfdata-name); if (cfdata-exe) - eap-exe = evas_stringshare_add(cfdata-exe); - else - if (cfdata-name) - eap-exe = evas_stringshare_add(cfdata-name); + { + if (strlen(cfdata-exe) 0) + eap-exe = evas_stringshare_add(cfdata-exe); + else + { +if (cfdata-name) + eap-exe = evas_stringshare_add(cfdata-name); + } + } + else + { + if (cfdata-name) + eap-exe = evas_stringshare_add(cfdata-name); + } if (cfdata-image) eap-image = evas_stringshare_add(cfdata-image); @@ -186,7 +197,7 @@ eap-height = 128; e_app_fields_save(eap); - + if (cfdata-is_new) { e_app_append(eap, editor-apps); --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.c Log Message: Removed some extra printfs not needed anymore. === RCS file: /cvs/e/e_modules/mbar/e_mod_main.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- e_mod_main.c7 Apr 2006 22:28:11 - 1.19 +++ e_mod_main.c8 Apr 2006 00:12:30 - 1.20 @@ -430,7 +430,6 @@ } break; case E_APP_DEL: -printf(Change Del\n); if (e_app_is_parent(mb-apps, a)) { MBar_Icon *ic; @@ -442,7 +441,6 @@ } break; case E_APP_CHANGE: -printf(App Change\n); if (e_app_is_parent(mb-apps, a)) { MBar_Icon *ic; @@ -469,7 +467,6 @@ } break; case E_APP_ORDER: -printf(App Order\n); if (a == mb-apps) { for (ll = mb-apps-subapps; ll; ll = ll-next) @@ -485,7 +482,6 @@ } break; case E_APP_EXEC: -printf(App Exec\n); if (e_app_is_parent(mb-apps, a)) { MBar_Icon *ic; --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.c e_mod_config.c e_mod_config_point.c Log Message: Allow setting exec to empty. - Basically this copies the name field into exec so that e app change callback doesn't delete it. === RCS file: /cvs/e/e_modules/mbar/e_mod_main.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- e_mod_main.c6 Apr 2006 23:03:26 - 1.17 +++ e_mod_main.c7 Apr 2006 09:12:31 - 1.18 @@ -421,6 +421,7 @@ } break; case E_APP_DEL: +printf(Change Del\n); if (e_app_is_parent(mb-apps, a)) { MBar_Icon *ic; @@ -432,6 +433,7 @@ } break; case E_APP_CHANGE: +printf(App Change\n); if (e_app_is_parent(mb-apps, a)) { MBar_Icon *ic; @@ -458,6 +460,7 @@ } break; case E_APP_ORDER: +printf(App Order\n); if (a == mb-apps) { for (ll = mb-apps-subapps; ll; ll = ll-next) @@ -473,6 +476,7 @@ } break; case E_APP_EXEC: +printf(App Exec\n); if (e_app_is_parent(mb-apps, a)) { MBar_Icon *ic; @@ -2008,8 +2012,11 @@ { if (ic-app-exe) { - e_zone_app_exec(ic-mbb-gmc-zone, ic-app); - e_exehist_add(mbar, ic-app-exe); + if (!strstr(ic-app-exe, ic-app-name)) + { + e_zone_app_exec(ic-mbb-gmc-zone, ic-app); + e_exehist_add(mbar, ic-app-exe); + } } } } === RCS file: /cvs/e/e_modules/mbar/e_mod_config.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_config.c 5 Apr 2006 17:48:49 - 1.3 +++ e_mod_config.c 7 Apr 2006 09:12:31 - 1.4 @@ -84,8 +84,11 @@ { Evas_Object *o, *ob, *of, *ot, *il; Evas_List *l; + MBar *mb; char buf[4096]; + mb = cfd-data; + o = e_widget_list_add(evas, 0, 0); ob = e_widget_check_add(evas, _(Show Follower), (cfdata-follower)); e_widget_list_object_append(o, ob, 1, 1, 0.5); @@ -97,9 +100,9 @@ ot = e_widget_table_add(evas, 0); il = e_widget_ilist_add(evas, 32, 32, NULL); e_widget_min_size_set(il, 100, 130); - if (cfdata-apps-subapps) + if (mb-apps-subapps) { -for (l = cfdata-apps-subapps; l; l = l-next) +for (l = mb-apps-subapps; l; l = l-next) { E_App *app; Evas_Object *ic; @@ -115,11 +118,11 @@ e_widget_ilist_go(il); e_widget_table_object_append(ot, il, 0, 0, 3, 3, 1, 0, 1, 0); - ob = e_widget_button_add(evas, _(New Point), NULL, _new_point, il, cfdata); + ob = e_widget_button_add(evas, _(New Point), NULL, _new_point, il, cfd); e_widget_table_object_append(ot, ob, 0, 3, 1, 1, 1, 0, 1, 0); - ob = e_widget_button_add(evas, _(Edit Point), NULL, _edit_point, il, cfdata); + ob = e_widget_button_add(evas, _(Edit Point), NULL, _edit_point, il, cfd); e_widget_table_object_append(ot, ob, 1, 3, 1, 1, 1, 0, 1, 0); - ob = e_widget_button_add(evas, _(Delete Point), NULL, _delete_point, il, cfdata); + ob = e_widget_button_add(evas, _(Delete Point), NULL, _delete_point, il, cfd); e_widget_table_object_append(ot, ob, 2, 3, 1, 1, 1, 0, 1, 0); e_widget_framelist_object_append(of, ot); @@ -217,37 +220,42 @@ { E_App *app; Evas_Object *il; - E_Config_Dialog_Data *cfdata; - - cfdata = data2; - + E_Config_Dialog *cfd; + MBar *mb; + + cfd = data2; il = data; + mb = cfd-data; + app = e_app_raw_new(); - point_edit_show(cfdata-con, app, cfdata-apps, il); + point_edit_show(cfd-cfdata-con, app, mb-apps, il); } static void _edit_point(void *data, void *data2) { Evas_Object *il; - E_Config_Dialog_Data *cfdata; + E_Config_Dialog *cfd; Evas_List *l; + MBar *mb; const char *name; il = data; - cfdata = data2; + cfd = data2; + mb = cfd-data; + name = e_widget_ilist_selected_label_get(il); if (!name) return; - for (l = cfdata-apps-subapps; l; l = l-next) + for (l = mb-apps-subapps; l; l = l-next) { E_App *app; app = l-data; if (!strcmp(app-name, name)) { - point_edit_show(cfdata-con, app); +point_edit_show(cfd-cfdata-con, app, mb-apps, il); break; } } @@ -257,17 +265,20 @@ _delete_point(void *data, void *data2) { Evas_Object
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.c Log Message: Added evas_list_free in appropriate places. === RCS file: /cvs/e/e_modules/mbar/e_mod_main.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- e_mod_main.c7 Apr 2006 09:12:31 - 1.18 +++ e_mod_main.c7 Apr 2006 22:28:11 - 1.19 @@ -183,7 +183,8 @@ EAPI int e_modapi_about(E_Module *m) { - e_module_dialog_show(_(Enlightenment Mount Bar Module), _(This is the Mount Bar module for Enlightenment.)); + e_module_dialog_show(_(Enlightenment Mount Bar Module), + _(This is the Mount Bar module for Enlightenment.)); return 1; } @@ -192,25 +193,31 @@ { MBar *mb; Evas_List *l; - + E_Container *con; + mb = m-data; if (!mb) return 0; if (!mb-bars) return 0; + + con = e_container_current_get(e_manager_current_get()); + for (l = mb-bars; l; l = l-next) { MBar_Bar *mbb; mbb = l-data; if (!mbb) - return 0; -if (mbb-con == e_container_current_get(e_manager_current_get())) + continue; + +if (mbb-con == con) { _config_mbar_module(mbb-con, mb); break; } } + evas_list_free(l); return 1; } @@ -342,7 +349,9 @@ _mbar_bar_disable(mbb); } } + evas_list_free(l2); } + evas_list_free(l); #ifdef HAVE_LINUX /* Add File Monitor for /etc/mtab */ @@ -534,6 +543,7 @@ break; } } + evas_list_free(l); } static MBar_Bar * @@ -613,6 +623,7 @@ a = l-data; ic = _mbar_icon_new(mbb, a); } + evas_list_free(l); } mbb-align_req = 0.5; mbb-align = 0.5; @@ -893,9 +904,9 @@ ic = l-data; if (!strcmp(ic-app-generic, a-generic)) -//if (e_app_equals(ic-app, a)) return ic; } + evas_list_free(l); return NULL; } @@ -1075,7 +1086,8 @@ w, h /* max */ ); } - + evas_list_free(l); + mbb-align_req = 0.5; mbb-align = 0.5; e_box_align_set(mbb-box_object, 0.5, 0.5); @@ -1262,7 +1274,6 @@ MBar_Bar *mbb; mbb = data; - evas_object_resize(o, w, h); evas_object_resize(mbb-event_object, w, h); } @@ -1781,6 +1792,7 @@ _mbar_bar_update_policy(mbb); _mbar_bar_frame_resize(mbb); } + evas_list_free(l); } static void @@ -1816,6 +1828,7 @@ evas_object_show(o); } + evas_list_free(l); } else if (!enabled) { @@ -1827,6 +1840,7 @@ evas_object_del(mbb-overlay_object); mbb-overlay_object = NULL; } + evas_list_free(l); } } @@ -1867,7 +1881,9 @@ } e_box_thaw(mbb-box_object); _mbar_bar_frame_resize(mbb); + evas_list_free(ll); } + evas_list_free(l); } static void @@ -1927,6 +1943,8 @@ x = ecore_exe_run(buf, ic); if (x) ecore_exe_tag_set(x, Mount); + + evas_list_free(ll); } static void @@ -1948,6 +1966,8 @@ x = ecore_exe_run(buf, ic); if (x) ecore_exe_tag_set(x, Unount); + + evas_list_free(ll); } static void @@ -2035,7 +2055,8 @@ edje_object_signal_emit(ic-overlay_object, stop, ); if (ic-mbb-overlay_object) edje_object_signal_emit(ic-mbb-overlay_object, stop, ); - + + evas_list_free(ll); return 0; } @@ -2252,7 +2273,9 @@ #endif _mbar_set_state(ic, mounted); } + evas_list_free(il); } +evas_list_free(l); } } } @@ -2300,7 +2323,9 @@ mounted = _mbar_bsd_is_mounted(ic-app-generic); _mbar_set_state(ic, mounted); } + evas_list_free(il); } + evas_list_free(l); } #endif --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.c Log Message: Fix icon_find function to return the proper icon. This fixes the wrong icons flashing when mount/unmount. === RCS file: /cvs/e/e_modules/mbar/e_mod_main.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_mod_main.c6 Apr 2006 20:14:26 - 1.14 +++ e_mod_main.c6 Apr 2006 20:35:24 - 1.15 @@ -487,8 +487,8 @@ edje_object_signal_emit(ll-data, start, ); edje_object_signal_emit(ic-bg_object, start, ); edje_object_signal_emit(ic-overlay_object, start, ); -if (ic-mbb-overlay_object) - edje_object_signal_emit(ic-mbb-overlay_object, start, ); +if (mbb-overlay_object) + edje_object_signal_emit(mbb-overlay_object, start, ); } else { @@ -497,8 +497,8 @@ edje_object_signal_emit(ll-data, exec, ); edje_object_signal_emit(ic-bg_object, exec, ); edje_object_signal_emit(ic-overlay_object, exec, ); -if (ic-mbb-overlay_object) - edje_object_signal_emit(ic-mbb-overlay_object, exec, ); +if (mbb-overlay_object) + edje_object_signal_emit(mbb-overlay_object, exec, ); } } } @@ -520,8 +520,8 @@ edje_object_signal_emit(ll-data, stop, ); edje_object_signal_emit(ic-bg_object, stop, ); edje_object_signal_emit(ic-overlay_object, stop, ); -if (ic-mbb-overlay_object) - edje_object_signal_emit(ic-mbb-overlay_object, stop, ); +if (mbb-overlay_object) + edje_object_signal_emit(mbb-overlay_object, stop, ); } } } @@ -888,7 +888,8 @@ MBar_Icon *ic; ic = l-data; -if (e_app_equals(ic-app, a)) + if (!strcmp(ic-app-generic, a-generic)) +//if (e_app_equals(ic-app, a)) return ic; } return NULL; @@ -1917,7 +1918,7 @@ edje_object_signal_emit(ic-overlay_object, start, ); if (ic-mbb-overlay_object) edje_object_signal_emit(ic-mbb-overlay_object, start, ); - + snprintf(buf, sizeof(buf), MOUNT %s, ic-app-generic); x = ecore_exe_run(buf, ic); if (x) @@ -1938,7 +1939,7 @@ edje_object_signal_emit(ic-overlay_object, start, ); if (ic-mbb-overlay_object) edje_object_signal_emit(ic-mbb-overlay_object, start, ); - + snprintf(buf, sizeof(buf), UMOUNT %s, ic-app-generic); x = ecore_exe_run(buf, ic); if (x) @@ -2027,7 +2028,7 @@ edje_object_signal_emit(ic-overlay_object, stop, ); if (ic-mbb-overlay_object) edje_object_signal_emit(ic-mbb-overlay_object, stop, ); - + return 0; } --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.c Log Message: Fix adding eaps to order file. === RCS file: /cvs/e/e_modules/mbar/e_mod_main.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_mod_main.c6 Apr 2006 20:35:24 - 1.15 +++ e_mod_main.c6 Apr 2006 21:30:03 - 1.16 @@ -2197,21 +2197,14 @@ { FILE *f; char path[4096]; - + char buf[1024]; + snprintf(path, sizeof(path), %s/.e/e/applications/%s/.order, getenv(HOME), dir); - - if (!ecore_file_exists(path)) - { -f = fopen(path, w); -if (!f) - return; -fclose(f); - } - - f = fopen(path, w+); + f = fopen(path, a); if (!f) return; - fwrite(name, sizeof(char), strlen(name), f); + snprintf(buf, sizeof(buf), %s\n, name); + fwrite(buf, sizeof(char), strlen(buf), f); fclose(f); } --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.c Log Message: Better in_order checking. Don't include the new line char when comparing strings. === RCS file: /cvs/e/e_modules/mbar/e_mod_main.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- e_mod_main.c6 Apr 2006 21:30:03 - 1.16 +++ e_mod_main.c6 Apr 2006 23:03:26 - 1.17 @@ -2310,13 +2310,14 @@ if (!ecore_file_exists(path)) return 0; - if (!(f = fopen(path, r))) + f = fopen(path, r); + if (!f) return 0; ret = 0; while (fgets(name, sizeof(name), f) != NULL) { -if (!strcmp(name, eap)) +if (strstr(name, eap)) { ret = 1; break; --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_config_point.c Log Message: Don't save eaps to all dir, use mbar dir instead. === RCS file: /cvs/e/e_modules/mbar/e_mod_config_point.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_config_point.c5 Apr 2006 17:48:49 - 1.2 +++ e_mod_config_point.c7 Apr 2006 00:52:15 - 1.3 @@ -156,7 +156,7 @@ { if (cfdata-name) path = basename(cfdata-name); -snprintf(buf, sizeof(buf), %s/.e/e/applications/all/%s.eap, getenv(HOME), path); +snprintf(buf, sizeof(buf), %s/.e/e/applications/mbar/%s.eap, getenv(HOME), path); eap-path = buf; } --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: configure.in Log Message: Removed eet, evas, ecore, and esmart configure checks as they are not needed. === RCS file: /cvs/e/e_modules/mbar/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- configure.in22 Mar 2006 01:58:15 - 1.3 +++ configure.in2 Apr 2006 21:08:29 - 1.4 @@ -109,48 +109,6 @@ #AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) #AC_SUBST(dlopen_libs) -AC_ARG_WITH(ecore-config, -[ --with-ecore-config=ECORE_CONFIG use ecore-config specified ], -[ - ECORE_CONFIG=$withval; - echo using $ECORE_CONFIG for ecore-config; -],[ - PROG=ecore-config; - AC_PATH_PROG(ECORE_CONFIG, $PROG, , $PATH) -]) -ecore_cflags=`$ECORE_CONFIG --cflags` -ecore_libs=`$ECORE_CONFIG --libs` -AC_SUBST(ecore_cflags) -AC_SUBST(ecore_libs) - -AC_ARG_WITH(evas-config, -[ --with-evas-config=EVAS_CONFIG use evas-config specified ], -[ - EVAS_CONFIG=$withval; - echo using $EVAS_CONFIG for evas-config; -],[ - PROG=evas-config; - AC_PATH_PROG(EVAS_CONFIG, $PROG, , $PATH) -]) -evas_cflags=`$EVAS_CONFIG --cflags` -evas_libs=`$EVAS_CONFIG --libs` -AC_SUBST(evas_cflags) -AC_SUBST(evas_libs) - -AC_ARG_WITH(esmart-config, -[ --with-esmart-config=ESMART_CONFIG use esmart-config specified ], -[ - ESMART_CONFIG=$withval; - echo using $ESMART_CONFIG for esmart-config; -],[ - PROG=esmart-config; - AC_PATH_PROG(ESMART_CONFIG, $PROG, , $PATH) -]) -esmart_cflags=`$ESMART_CONFIG --cflags` -esmart_libs=`$ESMART_CONFIG --libs` -AC_SUBST(esmart_cflags) -AC_SUBST(esmart_libs) - AC_ARG_WITH(edje-config, [ --with-edje-config=EDJE_CONFIG use edje-config specified ], [ @@ -177,20 +135,6 @@ edje_cc=`$EDJE_CONFIG --prefix`/bin/edje_cc ]) AC_SUBST(edje_cc) - -AC_ARG_WITH(eet-config, -[ --with-eet-config=EET_CONFIG use eet-config specified ], -[ - EET_CONFIG=$withval; - echo using $EET_CONFIG for eet-config; -],[ - PROG=eet-config; - AC_PATH_PROG(EET_CONFIG, $PROG, , $PATH) -]) -eet_cflags=`$EET_CONFIG --cflags` -eet_libs=`$EET_CONFIG --libs` -AC_SUBST(eet_cflags) -AC_SUBST(eet_libs) AC_ARG_WITH(enlightenment-config, [ --with-enlightenment-config=E_CONFIGuse enlightenment-config specified ], --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.c Log Message: Better fstab handling for pr0t0cod7. If the eap exists, skip creating it, but make sure it's in the order file. === RCS file: /cvs/e/e_modules/mbar/e_mod_main.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_mod_main.c29 Mar 2006 04:11:36 - 1.11 +++ e_mod_main.c29 Mar 2006 20:56:09 - 1.12 @@ -114,6 +114,7 @@ static void_mbar_parse_fstab(MBar *mb); static void_mbar_add_order(const char *dir, const char *name); static void_mbar_mtab_update(void *data, Ecore_File_Monitor *monitor, Ecore_File_Event event, const char *path); +static int _mbar_eap_in_order(const char *dir, const char *eap); #ifdef HAVE_BSD static int _mbar_bsd_is_mounted(const char *path); @@ -285,7 +286,9 @@ strcpy(buf, mb-conf-appdir); mb-apps = e_app_new(buf, 0); + _mbar_parse_fstab(mb); + if (mb-apps) e_app_subdir_scan(mb-apps, 0); e_app_change_callback_add(_mbar_app_change, mb); @@ -2070,7 +2073,7 @@ int i, u; char *token = NULL; - if ((f = fopen(FSTAB, r)) == NULL) + if (!(f = fopen(FSTAB, r))) return; *s = 0; @@ -2138,6 +2141,7 @@ { char icon[4096]; char path[4096]; +char eap[1024]; E_App *a; snprintf(path, sizeof(path), @@ -2156,10 +2160,22 @@ e_app_append(a, mb-apps); /* Add to order */ - char eap[1024]; snprintf(eap, sizeof(eap), %s.eap, basename(info[0])); _mbar_add_order(mb-conf-appdir, eap); } +else + { + /* Eap Exists for this device. Check if it's in order file*/ + int ret; + + snprintf(eap, sizeof(eap), %s.eap, basename(info[0])); + ret = _mbar_eap_in_order(mb-conf-appdir, eap); + if (!ret) + { + /* Add to order if not there */ + _mbar_add_order(mb-conf-appdir, eap); + } + } } for (i = 0; i 4; i++) @@ -2281,3 +2297,33 @@ } } #endif + +static int +_mbar_eap_in_order(const char *dir, const char *eap) +{ + FILE *f; + char path[4096]; + char name[4096]; + int ret; + + snprintf(path, sizeof(path), + %s/.e/e/applications/%s/.order, getenv(HOME), dir); + + if (!ecore_file_exists(path)) + return 0; + + if (!(f = fopen(path, r))) + return 0; + + ret = 0; + while (fgets(name, sizeof(name), f) != NULL) + { + if (!strcmp(name, eap)) + { +ret = 1; +break; + } + } + fclose(f); + return ret; +} --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_config.c Log Message: Remove unused typedef === RCS file: /cvs/e/e_modules/mbar/e_mod_config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.c 15 Mar 2006 00:26:18 - 1.1 +++ e_mod_config.c 28 Mar 2006 18:29:02 - 1.2 @@ -2,8 +2,6 @@ #include e_mod_config.h #include config.h -typedef struct _Cfg_File_Data Cfg_File_Data; - struct _E_Config_Dialog_Data { int follower; --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar/data/themes/fonts Log Message: Directory /cvs/e/e_modules/mbar/data/themes/fonts added to the repository --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar/data/themes/fonts Added Files: VeraBd.ttf Log Message: A font for basic label support --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar/data/themes Modified Files: mbar.edc Log Message: Basic label support for now. This will change in the future. === RCS file: /cvs/e/e_modules/mbar/data/themes/mbar.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- mbar.edc15 Mar 2006 00:28:39 - 1.1 +++ mbar.edc29 Mar 2006 00:24:59 - 1.2 @@ -1,3 +1,8 @@ +fonts +{ + font: VeraBd.ttf Vera Bold; +} + images { image: e17_ibar_bg_h.png COMP; @@ -697,7 +702,6 @@ } } } - group { name: modules/mbar/icon; @@ -745,7 +749,42 @@ color: 0 0 0 0; } } +part + { + name: label; + type: TEXT; + clip_to: item_clip; + effect: SOFT_SHADOW; + mouse_events: 0; + description + { + state: default 0.0; + rel1 +{ + relative: 0.0 0.0; + offset: 0 0; + to: item; +} + rel2 +{ + relative: 1.0 1.0; + offset: -1 -1; + to: item; +} + color: 255 255 255 255; + color3: 0 0 0 70; + text +{ + text: ; + font: Vera Bold; + size: 10; + min: 1 1; + align: 0.5 0.5; +} + } + } } + programs { program --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.c Log Message: Basic label support. Has some issues with long labels. This is preliminary and Will change in the future. === RCS file: /cvs/e/e_modules/mbar/e_mod_main.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_main.c20 Mar 2006 23:57:48 - 1.7 +++ e_mod_main.c29 Mar 2006 00:25:58 - 1.8 @@ -785,6 +785,8 @@ } evas_object_show(o); + edje_object_part_text_set(ic-bg_object, label, a-comment); + o = edje_object_add(mbb-evas); ic-icon_object = o; evas_object_resize(o, mbb-mbar-conf-iconsize, mbb-mbar-conf-iconsize); --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.c Log Message: Watch for changes to label and update. === RCS file: /cvs/e/e_modules/mbar/e_mod_main.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_mod_main.c29 Mar 2006 00:25:58 - 1.8 +++ e_mod_main.c29 Mar 2006 00:46:57 - 1.9 @@ -400,13 +400,15 @@ ic = _mbar_icon_new(mbb, a); if (ic) { + edje_object_part_text_set(ic-bg_object, label, a-comment); for (ll = mb-apps-subapps; ll; ll = ll-next) { E_App *a2; a2 = ll-data; ic = _mbar_icon_find(mbb, a2); - if (ic) _mbar_icon_reorder_after(ic, NULL); + if (ic) + _mbar_icon_reorder_after(ic, NULL); } _mbar_bar_frame_resize(mbb); } @@ -418,7 +420,8 @@ MBar_Icon *ic; ic = _mbar_icon_find(mbb, a); - if (ic) _mbar_icon_free(ic); + if (ic) + _mbar_icon_free(ic); _mbar_bar_frame_resize(mbb); } break; @@ -428,19 +431,22 @@ MBar_Icon *ic; ic = _mbar_icon_find(mbb, a); - if (ic) _mbar_icon_free(ic); + if (ic) + _mbar_icon_free(ic); evas_image_cache_flush(mbb-evas); evas_image_cache_reload(mbb-evas); ic = _mbar_icon_new(mbb, a); if (ic) { + edje_object_part_text_set(ic-bg_object, label, a-comment); for (ll = mb-apps-subapps; ll; ll = ll-next) { E_App *a2; a2 = ll-data; ic = _mbar_icon_find(mbb, a2); - if (ic) _mbar_icon_reorder_after(ic, NULL); + if (ic) + _mbar_icon_reorder_after(ic, NULL); } _mbar_bar_frame_resize(mbb); } --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar/data/themes Modified Files: Makefile.am Log Message: Distribute the font file === RCS file: /cvs/e/e_modules/mbar/data/themes/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 22 Mar 2006 01:58:15 - 1.2 +++ Makefile.am 29 Mar 2006 00:47:39 - 1.3 @@ -1,10 +1,11 @@ MAINTAINERCLEANFILES = Makefile.in EDJE_CC = @edje_cc@ -EDJE_FLAGS = -v -id images +EDJE_FLAGS = -v -id images -fd fonts filesdir = $(datadir) files_DATA = \ +fonts/VeraBd.ttf \ mbar.edj \ mbar.edc --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.c Log Message: Hide labels on mouse out. Show on mouse in. === RCS file: /cvs/e/e_modules/mbar/e_mod_main.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- e_mod_main.c29 Mar 2006 00:46:57 - 1.9 +++ e_mod_main.c29 Mar 2006 04:01:23 - 1.10 @@ -833,6 +833,7 @@ ); edje_object_signal_emit(ic-bg_object, passive, ); + edje_object_signal_emit(ic-icon_object, passive, ); edje_object_signal_emit(ic-overlay_object, passive, ); #ifdef HAVE_LINUX @@ -1268,9 +1269,11 @@ evas_object_stack_below(ic-overlay_object, ic-event_object); evas_event_thaw(ic-mbb-evas); edje_object_signal_emit(ic-bg_object, active, ); - edje_object_signal_emit(ic-overlay_object, active, ); + edje_object_signal_emit(ic-icon_object, active, ); + edje_object_signal_emit(ic-overlay_object, active, ); if (ic-mbb-overlay_object) edje_object_signal_emit(ic-mbb-overlay_object, active, ); + edje_object_part_text_set(ic-bg_object, label, ic-app-comment); } static void @@ -1282,9 +1285,11 @@ ev = event_info; ic = data; edje_object_signal_emit(ic-bg_object, passive, ); + edje_object_signal_emit(ic-icon_object, passive, ); edje_object_signal_emit(ic-overlay_object, passive, ); if (ic-mbb-overlay_object) edje_object_signal_emit(ic-mbb-overlay_object, passive, ); + edje_object_part_text_set(ic-bg_object, label, ); } static void --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.c Log Message: Minor formatting. === RCS file: /cvs/e/e_modules/mbar/e_mod_main.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_mod_main.c29 Mar 2006 04:01:23 - 1.10 +++ e_mod_main.c29 Mar 2006 04:11:36 - 1.11 @@ -400,7 +400,6 @@ ic = _mbar_icon_new(mbb, a); if (ic) { - edje_object_part_text_set(ic-bg_object, label, a-comment); for (ll = mb-apps-subapps; ll; ll = ll-next) { E_App *a2; @@ -438,7 +437,6 @@ ic = _mbar_icon_new(mbb, a); if (ic) { - edje_object_part_text_set(ic-bg_object, label, a-comment); for (ll = mb-apps-subapps; ll; ll = ll-next) { E_App *a2; @@ -790,8 +788,6 @@ edje_object_file_set(o, buf, modules/mbar/icon); } evas_object_show(o); - - edje_object_part_text_set(ic-bg_object, label, a-comment); o = edje_object_add(mbb-evas); ic-icon_object = o; @@ -1273,7 +1269,7 @@ edje_object_signal_emit(ic-overlay_object, active, ); if (ic-mbb-overlay_object) edje_object_signal_emit(ic-mbb-overlay_object, active, ); - edje_object_part_text_set(ic-bg_object, label, ic-app-comment); + edje_object_part_text_set(ic-bg_object, label, ic-app-comment); } static void @@ -1289,7 +1285,7 @@ edje_object_signal_emit(ic-overlay_object, passive, ); if (ic-mbb-overlay_object) edje_object_signal_emit(ic-mbb-overlay_object, passive, ); - edje_object_part_text_set(ic-bg_object, label, ); + edje_object_part_text_set(ic-bg_object, label, ); } static void --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: TODO Log Message: ++TODO item for boneyfrog === RCS file: /cvsroot/enlightenment/e_modules/mbar/TODO,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- TODO15 Mar 2006 00:26:18 - 1.1 +++ TODO20 Mar 2006 16:58:39 - 1.2 @@ -8,6 +8,4 @@ Support automount Support labels for devices. Support turning off eject for a device. - - - +Support Polling mtab to keep track of what is mounted/unmounted. --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.c TODO Log Message: Support Monitoring /etc/mtab for mount changes, requested by boneyfrog --TODO === RCS file: /cvsroot/enlightenment/e_modules/mbar/e_mod_main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_main.c18 Mar 2006 23:17:23 - 1.2 +++ e_mod_main.c20 Mar 2006 21:08:48 - 1.3 @@ -108,6 +108,7 @@ static int _mbar_parse_file(char *file, const char *mntpath); static void_mbar_parse_fstab(MBar *mb); static void_mbar_add_order(const char *dir, const char *name); +static void_mbar_mtab_update(void *data, Ecore_File_Monitor *monitor, Ecore_File_Event event, const char *path); /* Config Updated Function Protos */ static void_mbar_bar_cb_width_auto(void *data); @@ -325,6 +326,9 @@ } } } + + /* Add File Monitor for /etc/mtab */ + mb-mon = ecore_file_monitor_add(/etc/mtab, _mbar_mtab_update, mb); return mb; } @@ -342,6 +346,10 @@ if (mb-conf-appdir) evas_stringshare_del(mb-conf-appdir); e_app_change_callback_del(_mbar_app_change, mb); e_object_del(E_OBJECT(mb-config_menu)); + + if (mb-mon) + ecore_file_monitor_del(mb-mon); + evas_list_free(mb-conf-bars); free(mb-conf); free(mb); @@ -2154,3 +2162,39 @@ fwrite(name, sizeof(char), strlen(name), f); fclose(f); } + +static void +_mbar_mtab_update(void *data, Ecore_File_Monitor *monitor, Ecore_File_Event event, const char *path) +{ + MBar *mb; + Evas_List *l, *il; + const char *file; + + mb = data; + if (!mb) + return; + + file = ecore_file_get_file((char *)path); + if (!strcmp(file, mtab)) + { + if (event == ECORE_FILE_EVENT_MODIFIED) + { +for (l = mb-bars; l; l = l-next) + { + MBar_Bar *mbb; + mbb = l-data; + if (!mbb) + continue; + for (il = mbb-icons; il; il = il-next) + { + MBar_Icon *ic; + int mounted; + + ic = il-data; + mounted = _mbar_is_mounted(ic-app-generic); + _mbar_set_state(ic, mounted); + } + } + } + } +} === RCS file: /cvsroot/enlightenment/e_modules/mbar/TODO,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- TODO20 Mar 2006 16:58:39 - 1.2 +++ TODO20 Mar 2006 21:08:49 - 1.3 @@ -8,4 +8,3 @@ Support automount Support labels for devices. Support turning off eject for a device. -Support Polling mtab to keep track of what is mounted/unmounted. --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.c Log Message: More BSD/Linux trapping. === RCS file: /cvsroot/enlightenment/e_modules/mbar/e_mod_main.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_main.c20 Mar 2006 22:45:51 - 1.4 +++ e_mod_main.c20 Mar 2006 22:51:08 - 1.5 @@ -1876,9 +1876,11 @@ mounted = _mbar_parse_file(PROCMOUNTS, path); if (mounted = 0) { + #ifdef LINUX mounted = _mbar_parse_file(MTAB, path); if (mounted = 0) mounted = 0; + #endif } return mounted; } --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.c Log Message: Some formatting and cleanup. === RCS file: /cvsroot/enlightenment/e_modules/mbar/e_mod_main.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_main.c20 Mar 2006 22:51:08 - 1.5 +++ e_mod_main.c20 Mar 2006 23:05:20 - 1.6 @@ -10,10 +10,6 @@ #include e_mod_config.h #include config.h -#ifdef HAVE_LINUX -#include mntent.h -#endif - #ifdef HAVE_BSD #include sys/mount.h #endif @@ -56,7 +52,6 @@ static MBar_Bar *_mbar_bar_new(MBar *mb, E_Container *con); static void_mbar_bar_free(MBar_Bar *mbb); static void_mbar_bar_menu_new(MBar_Bar *mbb); -/* static void_mbar_bar_enable(MBar_Bar *mbb); */ static void_mbar_bar_disable(MBar_Bar *mbb); static void_mbar_bar_frame_resize(MBar_Bar *mbb); static void_mbar_bar_edge_change(MBar_Bar *mbb, int edge); @@ -150,15 +145,15 @@ m-config_menu = NULL; mb = m-data; - if (mb) + if (!mb) + return 1; + + if (mb-config_dialog) { - if (mb-config_dialog) - { -e_object_del(E_OBJECT(mb-config_dialog)); -mb-config_dialog = NULL; - } - _mbar_free(mb); + e_object_del(E_OBJECT(mb-config_dialog)); + mb-config_dialog = NULL; } + _mbar_free(mb); return 1; } @@ -221,7 +216,8 @@ bar_count = 0; mb = E_NEW(MBar, 1); - if (!mb) return NULL; + if (!mb) + return NULL; conf_bar_edd = E_CONFIG_DD_NEW(MBar_Config_Bar, Config_Bar); #undef T @@ -337,7 +333,7 @@ #ifdef HAVE_LINUX /* Add File Monitor for /etc/mtab */ - mb-mon = ecore_file_monitor_add(/etc/mtab, _mbar_mtab_update, mb); + mb-mon = ecore_file_monitor_add(MTAB, _mbar_mtab_update, mb); #endif return mb; @@ -519,7 +515,8 @@ char buf[4096]; mbb = E_NEW(MBar_Bar, 1); - if (!mbb) return NULL; + if (!mbb) + return NULL; mbb-mbar = mb; mb-bars = evas_list_append(mb-bars, mbb); @@ -647,11 +644,6 @@ * of apps has changed since last startup */ _mbar_bar_frame_resize(mbb); - /* - edje_object_signal_emit(mbb-bar_object, passive, ); - edje_object_signal_emit(mbb-overlay_object, passive, ); - */ - return mbb; } @@ -667,15 +659,20 @@ e_drop_handler_del(mbb-drop_handler); - if (mbb-timer) ecore_timer_del(mbb-timer); - if (mbb-animator) ecore_animator_del(mbb-animator); + if (mbb-timer) + ecore_timer_del(mbb-timer); + if (mbb-animator) + ecore_animator_del(mbb-animator); evas_object_del(mbb-bar_object); - if (mbb-overlay_object) evas_object_del(mbb-overlay_object); + if (mbb-overlay_object) + evas_object_del(mbb-overlay_object); evas_object_del(mbb-box_object); evas_object_del(mbb-event_object); - if (mbb-drag_object) evas_object_del(mbb-drag_object); + if (mbb-drag_object) + evas_object_del(mbb-drag_object); mbb-drag_object = NULL; - if (mbb-drag_object_overlay) evas_object_del(mbb-drag_object_overlay); + if (mbb-drag_object_overlay) + evas_object_del(mbb-drag_object_overlay); mbb-drag_object_overlay = NULL; e_gadman_client_save(mbb-gmc); @@ -720,25 +717,13 @@ _config_mbar_module(mbb-con, mbb-mbar); } -/* -static void -_mbar_bar_enable(MBar_Bar *mbb) -{ - mbb-conf-enabled = 1; - evas_object_show(mbb-bar_object); - if (mbb-overlay_object) evas_object_show(mbb-overlay_object); - evas_object_show(mbb-box_object); - evas_object_show(mbb-event_object); - e_config_save_queue(); -} -*/ - static void _mbar_bar_disable(MBar_Bar *mbb) { mbb-conf-enabled = 0; evas_object_hide(mbb-bar_object); - if (mbb-overlay_object) evas_object_hide(mbb-overlay_object); + if (mbb-overlay_object) + evas_object_hide(mbb-overlay_object); evas_object_hide(mbb-box_object); evas_object_hide(mbb-event_object); e_config_save_queue(); @@ -748,7 +733,6 @@ _mbar_icon_new(MBar_Bar *mbb, E_App *a) { MBar_Icon *ic; - // char *str; Evas_Object *o; Evas_Coord w, h; char buf[4096]; @@ -756,7 +740,8 @@ int ow, oh; ic = E_NEW(MBar_Icon, 1); - if (!ic) return NULL; + if (!ic) + return NULL; ic-mbb = mbb; ic-app = a; e_object_ref(E_OBJECT(a)); @@ -825,13 +810,6 @@ w, h /* max */ ); -/* - str = (char *)edje_object_data_get(ic-icon_object, raise_on_hilight); - if (str) - { - if (atoi(str) == 1) ic-raise_on_hilight = 1; - } -*/ edje_object_signal_emit(ic-bg_object, passive, ); edje_object_signal_emit(ic-overlay_object, passive, ); @@ -1171,7 +1149,8 @@ { Evas_Coord ww, hh, bx, by, bw, bh, d1, d2, mw, mh; - if (!mbb-overlay_object) return; + if (!mbb-overlay_object) + return;
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.h e_mod_main.c Log Message: More BSD-izing for mounts. === RCS file: /cvsroot/enlightenment/e_modules/mbar/e_mod_main.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_main.h20 Mar 2006 22:45:51 - 1.2 +++ e_mod_main.h20 Mar 2006 23:57:48 - 1.3 @@ -4,6 +4,8 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H +#include config.h + typedef struct _Config Config; typedef struct _Config_Bar Config_Bar; typedef struct _MBarMBar; @@ -42,7 +44,12 @@ Config *conf; E_Config_Dialog *config_dialog; + #ifdef HAVE_LINUX Ecore_File_Monitor *mon; + #endif + #ifdef HAVE_BSD + Ecore_Timer*mon_timer; + #endif }; struct _MBar_Bar === RCS file: /cvsroot/enlightenment/e_modules/mbar/e_mod_main.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_main.c20 Mar 2006 23:05:20 - 1.6 +++ e_mod_main.c20 Mar 2006 23:57:48 - 1.7 @@ -11,6 +11,8 @@ #include config.h #ifdef HAVE_BSD +#include sys/param.h +#include sys/ucred.h #include sys/mount.h #endif @@ -113,6 +115,11 @@ static void_mbar_add_order(const char *dir, const char *name); static void_mbar_mtab_update(void *data, Ecore_File_Monitor *monitor, Ecore_File_Event event, const char *path); +#ifdef HAVE_BSD +static int _mbar_bsd_is_mounted(const char *path); +static int _mbar_bsd_cb_timer(void *data); +#endif + /* Config Updated Function Protos */ static void_mbar_bar_cb_width_auto(void *data); static void_mbar_bar_cb_follower(void *data); @@ -335,7 +342,10 @@ /* Add File Monitor for /etc/mtab */ mb-mon = ecore_file_monitor_add(MTAB, _mbar_mtab_update, mb); #endif - +#ifdef HAVE_BSD + mb-mon_timer = ecore_timer_add(2.0, _mbar_bsd_cb_timer, mb); +#endif + return mb; } @@ -358,7 +368,11 @@ if (mb-mon) ecore_file_monitor_del(mb-mon); #endif - +#ifdef HAVE_BSD + if (mb-mon_timer) + ecore_timer_del(mb-mon_timer); +#endif + evas_list_free(mb-conf-bars); free(mb-conf); free(mb); @@ -813,7 +827,12 @@ edje_object_signal_emit(ic-bg_object, passive, ); edje_object_signal_emit(ic-overlay_object, passive, ); + #ifdef HAVE_LINUX _mbar_set_state(ic, _mbar_is_mounted(ic-app-generic)); + #endif + #ifdef HAVE_BSD + _mbar_set_state(ic, _mbar_bsd_is_mounted(ic-app-generic)); + #endif return ic; } @@ -1291,7 +1310,12 @@ if (!drag) { _mbar_exe_exit_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _mbar_exe_cb_exit, NULL); +#ifdef HAVE_LINUX mounted = _mbar_is_mounted(ic-app-generic); +#endif +#ifdef HAVE_BSD +mounted = _mbar_bsd_is_mounted(ic-app-generic); +#endif _mbar_set_state(ic, mounted); if (!mounted) _mbar_mount_point(ic); @@ -1491,7 +1515,8 @@ evas_object_move(mbb-overlay_object, x, y + (h * mbb-follow) - (mh / 2)); } } - if (mbb-timer) return 1; + if (mbb-timer) + return 1; mbb-animator = NULL; return 0; } @@ -1857,11 +1882,9 @@ mounted = _mbar_parse_file(PROCMOUNTS, path); if (mounted = 0) { - #ifdef LINUX mounted = _mbar_parse_file(MTAB, path); if (mounted = 0) mounted = 0; - #endif } return mounted; } @@ -1947,8 +1970,13 @@ return 1; ic = ecore_exe_data_get(x); - tag = ecore_exe_tag_get(x); + tag = ecore_exe_tag_get(x); + #ifdef HAVE_LINUX mounted = _mbar_is_mounted(ic-app-generic); + #endif + #ifdef HAVE_BSD + mounted = _mbar_bsd_is_mounted(ic-app-generic); + #endif x = NULL; ecore_event_handler_del(_mbar_exe_exit_handler); @@ -2141,8 +2169,7 @@ char path[4096]; snprintf(path, sizeof(path), - %s/.e/e/applications/%s/.order, - getenv(HOME), dir); + %s/.e/e/applications/%s/.order, getenv(HOME), dir); if (!ecore_file_exists(path)) { @@ -2187,10 +2214,61 @@ int mounted; ic = il-data; + #ifdef HAVE_LINUX mounted = _mbar_is_mounted(ic-app-generic); + #endif + #ifdef HAVE_BSD + mounted = _mbar_bsd_is_mounted(ic-app-generic); + #endif _mbar_set_state(ic, mounted); } } } } } + +#ifdef HAVE_BSD +static int +_mbar_bsd_is_mounted(const char *path) +{ +
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: configure.in e_mod_main.c e_mod_main.h Log Message: Begin BSD-izing of new mount module === RCS file: /cvsroot/enlightenment/e_modules/mbar/configure.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- configure.in15 Mar 2006 00:26:18 - 1.1 +++ configure.in20 Mar 2006 22:45:51 - 1.2 @@ -21,6 +21,15 @@ AC_SUBST(MODULE_ARCH) AC_DEFINE_UNQUOTED(MODULE_ARCH, $MODULE_ARCH, Module architecture) +case $host_os in +*bsd*) + AC_DEFINE(HAVE_BSD, [], Have a BSD distribution) +;; +linux*) + AC_DEFINE(HAVE_LINUX, [], Have a Linux distribution) +;; +esac + dnl AC_CHECK_HEADERS(dirent.h,, AC_MSG_ERROR([Cannot find dirent.h]) dnl Check for things we need to mount/unmount/eject === RCS file: /cvsroot/enlightenment/e_modules/mbar/e_mod_main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_main.c20 Mar 2006 21:08:48 - 1.3 +++ e_mod_main.c20 Mar 2006 22:45:51 - 1.4 @@ -10,6 +10,14 @@ #include e_mod_config.h #include config.h +#ifdef HAVE_LINUX +#include mntent.h +#endif + +#ifdef HAVE_BSD +#include sys/mount.h +#endif + /* TODO List: * * * Listen to change of main e_app! @@ -326,9 +334,12 @@ } } } - + +#ifdef HAVE_LINUX /* Add File Monitor for /etc/mtab */ mb-mon = ecore_file_monitor_add(/etc/mtab, _mbar_mtab_update, mb); +#endif + return mb; } @@ -346,10 +357,12 @@ if (mb-conf-appdir) evas_stringshare_del(mb-conf-appdir); e_app_change_callback_del(_mbar_app_change, mb); e_object_del(E_OBJECT(mb-config_menu)); - + +#ifdef HAVE_LINUX if (mb-mon) ecore_file_monitor_del(mb-mon); - +#endif + evas_list_free(mb-conf-bars); free(mb-conf); free(mb); === RCS file: /cvsroot/enlightenment/e_modules/mbar/e_mod_main.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.h15 Mar 2006 00:26:18 - 1.1 +++ e_mod_main.h20 Mar 2006 22:45:51 - 1.2 @@ -41,7 +41,8 @@ E_Menu *config_menu; Config *conf; - E_Config_Dialog *config_dialog; + E_Config_Dialog *config_dialog; + Ecore_File_Monitor *mon; }; struct _MBar_Bar --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Modified Files: e_mod_main.c Log Message: Appdir should match module name === RCS file: /cvsroot/enlightenment/e_modules/mbar/e_mod_main.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.c15 Mar 2006 00:26:18 - 1.1 +++ e_mod_main.c18 Mar 2006 23:17:23 - 1.2 @@ -239,7 +239,7 @@ if (!mb-conf) { mb-conf = E_NEW(Config, 1); - mb-conf-appdir = evas_stringshare_add(mount); + mb-conf-appdir = evas_stringshare_add(mbar); mb-conf-follower = 1; mb-conf-follow_speed = 0.9; mb-conf-autoscroll_speed = 0.95; --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Log Message: Directory /cvsroot/enlightenment/e_modules/mbar added to the repository --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar/data Log Message: Directory /cvsroot/enlightenment/e_modules/mbar/data added to the repository --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar Added Files: AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS README TODO autogen.sh config.h configure.in e_mod_config.c e_mod_config.h e_mod_config_point.c e_mod_config_point.h e_mod_main.c e_mod_main.h module_icon.png Log Message: Added New mount module. Kept old mount directory for a while. --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar/data/themes Log Message: Directory /cvsroot/enlightenment/e_modules/mbar/data/themes added to the repository --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar/data Added Files: Makefile.am Log Message: New mount module --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar/data/themes Added Files: Makefile.am mbar.edc Log Message: New Mount module --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mbar devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mbar Dir : e_modules/mbar/data/themes/images Added Files: e17_ibar_arrow_d.png e17_ibar_arrow_l.png e17_ibar_arrow_r.png e17_ibar_arrow_u.png e17_ibar_bg_h.png e17_ibar_bg_v.png e17_ibar_handle_h.png e17_ibar_handle_h2.png e17_ibar_handle_thumb_h.png e17_ibar_handle_thumb_v.png e17_ibar_handle_v.png e17_ibar_handle_v2.png e17_ibar_lamp_d.png e17_ibar_lamp_exec_d.png e17_ibar_lamp_exec_l.png e17_ibar_lamp_exec_r.png e17_ibar_lamp_exec_u.png e17_ibar_lamp_l.png e17_ibar_lamp_r.png e17_ibar_lamp_u.png e17_ibar_over_h.png e17_ibar_over_v.png e17_pager_desk.png lock.png Log Message: New mount module images --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs