Enlightenment CVS committal
Author : pfritz
Project : e17
Module : apps/elitaire
Dir : e17/apps/elitaire/src
Modified Files:
edje_frontend_game.cpp edje_frontend_gui.cpp eli_app.cpp
eli_hiscore.c eli_statistics.c ewl_dialog_hiscore.cpp main.cpp
Log Message:
- use the proper ecore_list functions
- remove debug printfs
- todo--
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/src/edje_frontend_game.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_frontend_game.cpp 8 Jun 2007 17:32:49 -0000 1.1
+++ edje_frontend_game.cpp 9 Jun 2007 23:20:09 -0000 1.2
@@ -139,7 +139,6 @@
{
_Eli_App_End * eend;
- printf("_app_wait\n");
eend = (_Eli_App_End *) data;
if (eli_highscore_accept(eend->eap->current.game,
eend->points, eend->type))
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/src/edje_frontend_gui.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_frontend_gui.cpp 8 Jun 2007 17:32:49 -0000 1.1
+++ edje_frontend_gui.cpp 9 Jun 2007 23:20:09 -0000 1.2
@@ -77,6 +77,7 @@
void _eli_edje_frontend_state_notify(Eli_App * eap)
{
+#if 0
switch (eap->state) {
case ELI_STATE_PLAYING:
printf("playing\n");
@@ -97,6 +98,7 @@
printf("rest\n");
break;
}
+#endif
}
/* init Ecore_Evas stuff */
@@ -507,8 +509,6 @@
eef = (Eli_Edje_Frontend *) data;
ev = (Evas_Event_Key_Down *) event_info;
- printf("You hit key: %s \n", ev->key);
-
if (!strcmp(ev->key, "Control_L") || !strcmp(ev->key, "Control_R")) {
eef->key.ctrl_down = true;
return;
@@ -641,8 +641,6 @@
Evas_Object * item;
item = edje_object_add(evas_object_evas_get(container));
- printf("cards %s\n", cards_name);
-
if (edje_object_file_set(item, file, "element")) {
Evas_Coord w, h;
@@ -674,10 +672,9 @@
file);
evas_object_del(item);
}
- ecore_list_next(l);
}
+ ecore_list_goto_first(l);
- l->current = l->first;
if (file)
free(file);
}
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/src/eli_app.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eli_app.cpp 8 Jun 2007 17:32:49 -0000 1.1
+++ eli_app.cpp 9 Jun 2007 23:20:09 -0000 1.2
@@ -161,7 +161,6 @@
if (eap->next.game) return;
eap->next.game = strdup(game);
- printf("%s\n",game);
/* end current game */
eli_app_game_end(eap);
}
@@ -329,8 +328,8 @@
l = eli_theme_names_get();
/* selecting the gui theme */
- while (l->current) {
- name = (char *) l->current->data;
+ ecore_list_goto_first(l);
+ while ((name = (char *) ecore_list_next(l))) {
file = ecore_config_theme_with_path_from_name_get(name);
/* selecting the gui theme */
@@ -341,9 +340,8 @@
ecore_list_append(cards, name);
free(file);
- ecore_list_next(l);
}
- l->current = l->first;
+ ecore_list_goto_first(l);
eap->theme.gui.list = gui;
eap->theme.cards.list = cards;
@@ -366,9 +364,9 @@
dir_list = eli_theme_dir_get();
if (!dir_list) {
- fprintf(stderr, "Warning: there are no possible theme paths\n"
- "I'm unsure why this happens :(\n");
- return NULL;
+ fprintf(stderr, "Warning: there are no possible theme paths\n"
+ "I'm unsure why this happens :(\n");
+ return NULL;
}
out_l = ecore_list_new();
@@ -380,7 +378,7 @@
file_l = ecore_file_ls(dir);
if (file_l) {
- char * file;
+ char * file;
while ((file = (char *) ecore_list_next(file_l))) {
if (ecore_str_has_suffix(file, ".edj"))
@@ -402,9 +400,13 @@
char ** eli_theme_dir_get()
{
char * dirs;
+ char ** dirs_array;
dirs = ecore_config_theme_search_path_get();
- return ecore_str_split(dirs, "|", -1);
+ dirs_array = ecore_str_split(dirs, "|", -1);
+ free(dirs);
+
+ return dirs_array;
}
static char * theme_cut_off_suffix(const char * file)
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/src/eli_hiscore.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eli_hiscore.c 8 Jun 2007 17:32:49 -0000 1.1
+++ eli_hiscore.c 9 Jun 2007 23:20:09 -0000 1.2
@@ -150,8 +150,6 @@
if (!game || !username || !eet_file_name) return 0;
- printf("e_add: %s %s %f\n", game, username, points);
-
entry = _eli_entry_new(username, points, type);
l = eli_highscore_get(game);
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/src/eli_statistics.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eli_statistics.c 8 Jun 2007 17:32:49 -0000 1.1
+++ eli_statistics.c 9 Jun 2007 23:20:09 -0000 1.2
@@ -120,7 +120,6 @@
{
Eet_File * file;
- printf("%s\n", game);
if (ecore_file_exists(eet_file_name)) {
file = eet_open(eet_file_name, EET_FILE_MODE_READ_WRITE);
}
@@ -132,11 +131,8 @@
}
}
- printf("%s %p %p\n", game, edd_statistics, stats);
eet_data_write(file, edd_statistics, game, stats, 1);
- printf("%s %p %p\n", game, edd_statistics, stats);
eet_close(file);
- printf("%s %p %p\n", game, edd_statistics, stats);
return 1;
}
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/src/ewl_dialog_hiscore.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_dialog_hiscore.cpp 8 Jun 2007 17:32:49 -0000 1.1
+++ ewl_dialog_hiscore.cpp 9 Jun 2007 23:20:09 -0000 1.2
@@ -302,8 +302,6 @@
text = ewl_text_text_get(EWL_TEXT(wh_entry));
wh_entry = NULL;
- printf("%p - %p - %p \n", wh->eap->current.game, wh->eap, wh);
- printf("%s - %s - %f\n", wh->eap->current.game, text, wh->points);
eli_highscore_entry_add(wh->eap->current.game, text, wh->points,
wh->type);
eli_app_highscore_open(wh->eap, wh->eap->current.game);
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/src/main.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- main.cpp 8 Jun 2007 17:32:49 -0000 1.1
+++ main.cpp 9 Jun 2007 23:20:09 -0000 1.2
@@ -24,7 +24,6 @@
setlocale(LC_MONETARY, "");
setlocale(LC_CTYPE, "");
bindtextdomain(PACKAGE, PACKAGE_LOCALE_DIR);
- printf("%s\n", PACKAGE_LOCALE_DIR);
bind_textdomain_codeset(PACKAGE, "UTF-8");
textdomain(PACKAGE);
#endif
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
