Enlightenment CVS committal
Author : lok
Project : e17
Module : proto
Dir : e17/proto/emphasis/src/bin
Modified Files:
emphasis_callbacks.c emphasis_config_gui.c emphasis_mpc.c
Log Message:
Don't exit if the server version is wrong.
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_callbacks.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- emphasis_callbacks.c 25 Aug 2006 14:58:06 -0000 1.12
+++ emphasis_callbacks.c 6 Oct 2006 15:50:30 -0000 1.13
@@ -778,7 +778,6 @@
mpc_playlist_delete(list);
}
}
- etk_widget_redraw_queue(ETK_WIDGET(player->media.pls));
}
/**
@@ -950,7 +949,7 @@
configgui = gui->config_gui;
emphasis_configgui_autoset(configgui);
- etk_widget_show_all(configgui->window);
+ etk_widget_show(configgui->window);
}
Etk_Bool
@@ -961,7 +960,7 @@
configgui = data;
- etk_widget_hide_all(configgui->window);
+ etk_widget_hide(configgui->window);
return ETK_FALSE;
}
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_config_gui.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- emphasis_config_gui.c 20 Aug 2006 22:48:49 -0000 1.3
+++ emphasis_config_gui.c 6 Oct 2006 15:50:30 -0000 1.4
@@ -49,8 +49,11 @@
config = config_load();
- etk_entry_text_set(ETK_ENTRY(configgui->hostname),
- config->hostname);
+ if(config->hostname)
+ {
+ etk_entry_text_set(ETK_ENTRY(configgui->hostname),
+ config->hostname);
+ }
if(config->password)
{
etk_entry_text_set(ETK_ENTRY(configgui->password),
===================================================================
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_mpc.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- emphasis_mpc.c 21 Aug 2006 14:58:50 -0000 1.9
+++ emphasis_mpc.c 6 Oct 2006 15:50:30 -0000 1.10
@@ -18,17 +18,17 @@
{
mpd_send_password(mo);
timer = ecore_timer_add(0.2, mpc_update, NULL);
+ if (!mpd_server_check_version(mo, 0, 12, 0))
+ {
+ fprintf(stderr, "Wrong server version. Emphasis require MPD
0.12.0\n");
+ mpc_disconnect();
+ ecore_timer_del(timer);
+ timer = NULL;
+ }
}
else
{
timer = NULL;
- }
-
- if (!mpd_server_check_version(mo, 0, 12, 0))
- {
- fprintf(stderr, "Wrong server version. Emphasis require MPD 0.12.0\n");
- mpc_disconnect();
- exit(-1);
}
return timer;
-------------------------------------------------------------------------
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.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
