Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/bin
Modified Files:
Makefile.am hal.c test.c
Log Message:
* cleanup build
* don't rely on efreet/ewl for now (the hal test code should be a separate
app...)
* instead of adding methods directly to objects, add them to interfaces,
then share the interface definitions between objects
===================================================================
RCS file: /cvs/e/e17/proto/e_dbus/src/bin/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 21 Mar 2007 10:31:16 -0000 1.2
+++ Makefile.am 22 Mar 2007 04:07:29 -0000 1.3
@@ -5,15 +5,10 @@
-I$(top_srcdir)/src/lib/hal \
-I$(top_srcdir)/src/lib/nm \
@ECORE_CFLAGS@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
--g -Werror
[EMAIL PROTECTED]@
LIBS = \
@ECORE_LIBS@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
@DBUS_LIBS@
bin_PROGRAMS = e_dbus_test \
===================================================================
RCS file: /cvs/e/e17/proto/e_dbus/src/bin/hal.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- hal.c 22 Mar 2007 01:44:12 -0000 1.3
+++ hal.c 22 Mar 2007 04:07:29 -0000 1.4
@@ -1,11 +1,11 @@
-#define EWL_GUI 1
+#define EWL_GUI 0
#include "E_Hal.h"
#if EWL_GUI
#include <Ewl.h>
+#include <Efreet.h>
#endif
-#include <Efreet.h>
#include <string.h>
/* test app */
@@ -772,9 +772,9 @@
ecore_init();
ecore_string_init();
e_dbus_init();
- efreet_init();
#if EWL_GUI
+ efreet_init();
if (!ewl_init(&argc, argv))
{
fprintf(stderr, "Unable to init EWL.\n");
@@ -808,13 +808,13 @@
#if EWL_GUI
ewl_main();
+ efreet_shutdown();
+ ewl_shutdown();
#else
ecore_main_loop_begin();
#endif
- efreet_shutdown();
ecore_list_destroy(storage_devices);
ecore_list_destroy(volumes);
- ewl_shutdown();
e_dbus_connection_unref(conn);
e_dbus_shutdown();
ecore_string_shutdown();
===================================================================
RCS file: /cvs/e/e17/proto/e_dbus/src/bin/test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- test.c 22 Mar 2007 01:44:12 -0000 1.2
+++ test.c 22 Mar 2007 04:07:29 -0000 1.3
@@ -65,8 +65,11 @@
_setup(E_DBus_Connection *conn)
{
E_DBus_Object *repeater;
+ E_DBus_Interface *iface;
repeater = e_dbus_object_add(conn, "/org/e/Repeater", NULL);
- e_dbus_object_method_add(repeater, "org.e.Repeater", "Repeat", NULL, NULL,
cb_repeat);
+ iface = e_dbus_interface_new("org.e.Repeater");
+ e_dbus_interface_method_add(iface, "Repeat", NULL, NULL, cb_repeat);
+ e_dbus_object_interface_attach(repeater, iface);
return 1;
}
-------------------------------------------------------------------------
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
