leif pushed a commit to branch master.
commit e2f5ba1969592b5d4522a128b66c763bb1b41946
Author: Leif Middelschulte <[email protected]>
Date: Tue May 7 19:54:47 2013 +0200
How about commiting the remaining renaming too, eh?
---
configure.ac | 2 +-
src/modules/dbus/Makefile.am | 4 +-
src/modules/dbus/dbus-connection.cc | 16 ++---
src/modules/dbus/dbus-connection.h | 6 +-
src/modules/dbus/dbus-message.cc | 22 +++---
src/modules/dbus/dbus-message.h | 6 +-
src/modules/dbus/dbus-module.h | 2 +-
src/modules/dbus/dbus-object.cc | 4 +-
src/modules/dbus/dbus-object.h | 4 +-
src/modules/dbus/dbus-pending.cc | 24 +++----
src/modules/dbus/dbus-pending.h | 12 ++--
src/modules/dbus/dbus-proxy.cc | 132 ++++++++++++++++++------------------
src/modules/dbus/dbus-proxy.h | 6 +-
src/modules/dbus/dbus.cc | 4 +-
14 files changed, 122 insertions(+), 122 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4c46a70..5942605 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,7 +111,7 @@ PKG_CHECK_MODULES([ELEMENTARY], [
ecore-evas >= 1.0.999
])
PKG_CHECK_MODULES([ECORECON], [ecore-con >= 1.0.999])
-PKG_CHECK_MODULES([EDBUS], [eldbus])
+PKG_CHECK_MODULES([ELDBUS], [eldbus])
PKG_CHECK_MODULES([EIO], [eio])
# Detect systemd user session directory properly
diff --git a/src/modules/dbus/Makefile.am b/src/modules/dbus/Makefile.am
index 5462f9a..c78e409 100644
--- a/src/modules/dbus/Makefile.am
+++ b/src/modules/dbus/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-DPACKAGE_TMP_DIR=\"/tmp\" \
-@EDBUS_CFLAGS@
+@ELDBUS_CFLAGS@
moddir = $(libdir)/$(PACKAGE)/$(MODULE_ARCH)
mod_LTLIBRARIES = libdbus.la
@@ -20,6 +20,6 @@ libdbus_la_SOURCES = dbus.cc \
dbus-message.cc \
dbus-pending.cc
-libdbus_la_LIBADD = @EDBUS_LIBS@ @V8_LIBS@
+libdbus_la_LIBADD = @ELDBUS_LIBS@ @V8_LIBS@
libdbus_la_LDFLAGS = -module -avoid-version -no-undefined
libdbus_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/modules/dbus/dbus-connection.cc
b/src/modules/dbus/dbus-connection.cc
index 26f848e..d2e76b7 100644
--- a/src/modules/dbus/dbus-connection.cc
+++ b/src/modules/dbus/dbus-connection.cc
@@ -3,14 +3,14 @@
namespace dbus {
-DConnection::DConnection(EDBus_Connection_Type type)
- : conn(edbus_connection_ref(edbus_connection_get(type)))
+DConnection::DConnection(Eldbus_Connection_Type type)
+ : conn(eldbus_connection_ref(eldbus_connection_get(type)))
{
}
DConnection::~DConnection()
{
- edbus_connection_unref(conn);
+ eldbus_connection_unref(conn);
}
void DConnection::Init(Handle<Object> target)
@@ -31,21 +31,21 @@ void DConnection::Init(Handle<Object> target)
Handle<Value> DConnection::New(const Arguments& args)
{
HandleScope scope;
- EDBus_Connection_Type type;
+ Eldbus_Connection_Type type;
if (args[0]->IsString()) {
String::Utf8Value v(args[0]->ToString());
if (!strcmp(*v, "session"))
- type = EDBUS_CONNECTION_TYPE_SESSION;
+ type = ELDBUS_CONNECTION_TYPE_SESSION;
else if (!strcmp(*v, "system"))
- type = EDBUS_CONNECTION_TYPE_SYSTEM;
+ type = ELDBUS_CONNECTION_TYPE_SYSTEM;
else if (!strcmp(*v, "starter"))
- type = EDBUS_CONNECTION_TYPE_STARTER;
+ type = ELDBUS_CONNECTION_TYPE_STARTER;
else
THROW_EXCEPTION("Wrong connection type");
} else {
- type = EDBUS_CONNECTION_TYPE_SESSION;
+ type = ELDBUS_CONNECTION_TYPE_SESSION;
}
DConnection *obj = new DConnection(type);
diff --git a/src/modules/dbus/dbus-connection.h
b/src/modules/dbus/dbus-connection.h
index ed77930..d8c7a7e 100644
--- a/src/modules/dbus/dbus-connection.h
+++ b/src/modules/dbus/dbus-connection.h
@@ -11,16 +11,16 @@ class DConnection : public ObjectWrap {
public:
static void Init(Handle<Object> target);
- EDBus_Connection *GetConnection() { return conn; }
+ Eldbus_Connection *GetConnection() { return conn; }
private:
- DConnection(EDBus_Connection_Type type);
+ DConnection(Eldbus_Connection_Type type);
~DConnection();
static Handle<Value> New(const Arguments& args);
static Handle<Value> GetObject(const Arguments& args);
- EDBus_Connection *conn;
+ Eldbus_Connection *conn;
};
}
diff --git a/src/modules/dbus/dbus-message.cc b/src/modules/dbus/dbus-message.cc
index 8dd76e5..e1b5c1b 100644
--- a/src/modules/dbus/dbus-message.cc
+++ b/src/modules/dbus/dbus-message.cc
@@ -7,7 +7,7 @@ Persistent<FunctionTemplate> DMessage::base_template;
DMessage::~DMessage()
{
- edbus_message_unref(msg);
+ eldbus_message_unref(msg);
}
void DMessage::Init(Handle<Object> target)
@@ -71,7 +71,7 @@ Handle<Value> DMessage::NewCall(const Arguments& args)
if (!args[3]->IsString())
THROW_EXCEPTION("Expecting method as string");
- EDBus_Message *msg = edbus_message_method_call_new(
+ Eldbus_Message *msg = eldbus_message_method_call_new(
*String::Utf8Value(args[0]),
*String::Utf8Value(args[1]),
*String::Utf8Value(args[2]),
@@ -96,7 +96,7 @@ Handle<Value> DMessage::NewSignal(const Arguments& args)
if (!args[2]->IsString())
THROW_EXCEPTION("Expecting name as string");
- EDBus_Message *msg = NULL;
+ Eldbus_Message *msg = NULL;
if (!msg)
THROW_EXCEPTION("Could not build signal message");
@@ -113,7 +113,7 @@ Handle<Value> DMessage::NewMethodReturn(const Arguments&
args)
HandleScope scope;
DMessage *self = ObjectWrap::Unwrap<DMessage>(args.This());
- EDBus_Message *msg = edbus_message_method_return_new(self->msg);
+ Eldbus_Message *msg = eldbus_message_method_return_new(self->msg);
if (!msg)
THROW_EXCEPTION("Could not build reply message");
@@ -136,7 +136,7 @@ Handle<Value> DMessage::NewError(const Arguments& args)
if (!args[1]->IsString())
THROW_EXCEPTION("Expecting error_msg as string");
- EDBus_Message *msg = edbus_message_error_new(reply->GetMessage(),
+ Eldbus_Message *msg = eldbus_message_error_new(reply->GetMessage(),
*String::Utf8Value(args[0]),
*String::Utf8Value(args[1]));
if (!msg)
@@ -154,7 +154,7 @@ Handle<Value> DMessage::GetPath(Local<String>, const
AccessorInfo& info)
HandleScope scope;
DMessage *self = ObjectWrap::Unwrap<DMessage>(info.This());
- return scope.Close(String::New(edbus_message_path_get(self->msg)));
+ return scope.Close(String::New(eldbus_message_path_get(self->msg)));
}
Handle<Value> DMessage::GetInterface(Local<String>, const AccessorInfo& info)
@@ -162,7 +162,7 @@ Handle<Value> DMessage::GetInterface(Local<String>, const
AccessorInfo& info)
HandleScope scope;
DMessage *self = ObjectWrap::Unwrap<DMessage>(info.This());
- return scope.Close(String::New(edbus_message_interface_get(self->msg)));
+ return scope.Close(String::New(eldbus_message_interface_get(self->msg)));
}
Handle<Value> DMessage::GetMember(Local<String>, const AccessorInfo& info)
@@ -170,7 +170,7 @@ Handle<Value> DMessage::GetMember(Local<String>, const
AccessorInfo& info)
HandleScope scope;
DMessage *self = ObjectWrap::Unwrap<DMessage>(info.This());
- return scope.Close(String::New(edbus_message_member_get(self->msg)));
+ return scope.Close(String::New(eldbus_message_member_get(self->msg)));
}
Handle<Value> DMessage::GetSender(Local<String>, const AccessorInfo& info)
@@ -178,7 +178,7 @@ Handle<Value> DMessage::GetSender(Local<String>, const
AccessorInfo& info)
HandleScope scope;
DMessage *self = ObjectWrap::Unwrap<DMessage>(info.This());
- return scope.Close(String::New(edbus_message_sender_get(self->msg)));
+ return scope.Close(String::New(eldbus_message_sender_get(self->msg)));
}
Handle<Value> DMessage::GetSignature(Local<String>, const AccessorInfo& info)
@@ -186,7 +186,7 @@ Handle<Value> DMessage::GetSignature(Local<String>, const
AccessorInfo& info)
HandleScope scope;
DMessage *self = ObjectWrap::Unwrap<DMessage>(info.This());
- return scope.Close(String::New(edbus_message_signature_get(self->msg)));
+ return scope.Close(String::New(eldbus_message_signature_get(self->msg)));
}
Handle<Value> DMessage::GetError(Local<String>, const AccessorInfo& info)
@@ -196,7 +196,7 @@ Handle<Value> DMessage::GetError(Local<String>, const
AccessorInfo& info)
const char *name, *text;
Local<Object> obj = Object::New();
- if (!edbus_message_error_get(self->msg, &name, &text)) {
+ if (!eldbus_message_error_get(self->msg, &name, &text)) {
name = "success";
text = "Not an error message";
}
diff --git a/src/modules/dbus/dbus-message.h b/src/modules/dbus/dbus-message.h
index e75e8d5..b6f5abf 100644
--- a/src/modules/dbus/dbus-message.h
+++ b/src/modules/dbus/dbus-message.h
@@ -13,12 +13,12 @@ public:
static void Init(Handle<Object> target);
static Handle<Value> NewInstance(DConnection *conn, const Arguments &args);
- EDBus_Message *GetMessage() { return msg; }
+ Eldbus_Message *GetMessage() { return msg; }
static bool IsMessage(Handle<Value> v);
private:
- DMessage(EDBus_Message *msg_)
+ DMessage(Eldbus_Message *msg_)
: msg(msg_) {}
~DMessage();
@@ -39,7 +39,7 @@ private:
static Handle<Value> NewMethodReturn(const Arguments& args);
static Handle<Value> NewSignal(const Arguments& args);
- EDBus_Message *msg;
+ Eldbus_Message *msg;
static Persistent<FunctionTemplate> base_template;
};
diff --git a/src/modules/dbus/dbus-module.h b/src/modules/dbus/dbus-module.h
index a369a79..ce727c7 100644
--- a/src/modules/dbus/dbus-module.h
+++ b/src/modules/dbus/dbus-module.h
@@ -1,7 +1,7 @@
#ifndef DBUS_MODULE_H
#define DBUS_MODULE_H
-#include <EDBus.h>
+#include <Eldbus.h>
#include <v8.h>
#include "node_object_wrap.h"
diff --git a/src/modules/dbus/dbus-object.cc b/src/modules/dbus/dbus-object.cc
index 2f8e507..fce68a3 100644
--- a/src/modules/dbus/dbus-object.cc
+++ b/src/modules/dbus/dbus-object.cc
@@ -8,13 +8,13 @@ namespace dbus {
Persistent<Function> DObject::constructor;
DObject::DObject(DConnection *connection, const char *bus, const char *path)
- : obj(edbus_object_ref(edbus_object_get(connection->GetConnection(), bus,
path)))
+ : obj(eldbus_object_ref(eldbus_object_get(connection->GetConnection(), bus,
path)))
{
}
DObject::~DObject()
{
- edbus_object_unref(obj);
+ eldbus_object_unref(obj);
}
void DObject::Init(Handle<Object>)
diff --git a/src/modules/dbus/dbus-object.h b/src/modules/dbus/dbus-object.h
index 784d906..84c8e35 100644
--- a/src/modules/dbus/dbus-object.h
+++ b/src/modules/dbus/dbus-object.h
@@ -13,7 +13,7 @@ public:
static void Init(Handle<Object> target);
static Handle<Value> NewInstance(DConnection *conn, const Arguments &args);
- EDBus_Object *GetObject() { return obj; }
+ Eldbus_Object *GetObject() { return obj; }
private:
DObject(DConnection *connection, const char *bus, const char *path);
@@ -24,7 +24,7 @@ private:
static Handle<Value> Send(const Arguments& args);
static Handle<Value> GetProxy(const Arguments& args);
- EDBus_Object *obj;
+ Eldbus_Object *obj;
};
}
diff --git a/src/modules/dbus/dbus-pending.cc b/src/modules/dbus/dbus-pending.cc
index ecfd91c..08de120 100644
--- a/src/modules/dbus/dbus-pending.cc
+++ b/src/modules/dbus/dbus-pending.cc
@@ -6,11 +6,11 @@ namespace dbus {
Persistent<Function> DPending::constructor;
-DPending::DPending(EDBus_Pending *pending_)
+DPending::DPending(Eldbus_Pending *pending_)
: pending(pending_)
{
- edbus_pending_free_cb_add(pending, FreeCb, this);
- edbus_pending_data_set(pending, "this", this);
+ eldbus_pending_free_cb_add(pending, FreeCb, this);
+ eldbus_pending_data_set(pending, "this", this);
}
void DPending::FreeCb(void *data, const void *)
@@ -48,7 +48,7 @@ Handle<Value> DPending::New(const Arguments& args)
{
HandleScope scope;
- EDBus_Pending *wrapped = static_cast<EDBus_Pending
*>(External::Unwrap(args[0]));
+ Eldbus_Pending *wrapped = static_cast<Eldbus_Pending
*>(External::Unwrap(args[0]));
DPending *pending = new DPending(wrapped);
pending->Wrap(args.This());
pending->Ref();
@@ -56,7 +56,7 @@ Handle<Value> DPending::New(const Arguments& args)
return args.This();
}
-Handle<Value> DPending::NewInstance(EDBus_Pending *pending)
+Handle<Value> DPending::NewInstance(Eldbus_Pending *pending)
{
HandleScope scope;
const unsigned argc = 1;
@@ -67,7 +67,7 @@ Handle<Value> DPending::NewInstance(EDBus_Pending *pending)
Handle<Value> DPending::Cancel(const Arguments& args)
{
DPending *self = ObjectWrap::Unwrap<DPending>(args.This());
- edbus_pending_cancel(self->pending);
+ eldbus_pending_cancel(self->pending);
return args.This();
}
@@ -88,30 +88,30 @@ Handle<Value> DPending::OnComplete(const Arguments& args)
Handle<Value> DPending::Destination(Local<String>, const AccessorInfo& info)
{
DPending *self = ObjectWrap::Unwrap<DPending>(info.This());
- return String::New(edbus_pending_destination_get(self->pending));
+ return String::New(eldbus_pending_destination_get(self->pending));
}
Handle<Value> DPending::Interface(Local<String>, const AccessorInfo& info)
{
DPending *self = ObjectWrap::Unwrap<DPending>(info.This());
- return String::New(edbus_pending_interface_get(self->pending));
+ return String::New(eldbus_pending_interface_get(self->pending));
}
Handle<Value> DPending::Method(Local<String>, const AccessorInfo& info)
{
DPending *self = ObjectWrap::Unwrap<DPending>(info.This());
- return String::New(edbus_pending_method_get(self->pending));
+ return String::New(eldbus_pending_method_get(self->pending));
}
Handle<Value> DPending::Path(Local<String>, const AccessorInfo& info)
{
DPending *self = ObjectWrap::Unwrap<DPending>(info.This());
- return String::New(edbus_pending_path_get(self->pending));
+ return String::New(eldbus_pending_path_get(self->pending));
}
-Handle<Object> DPending::ToObject(EDBus_Pending *pending)
+Handle<Object> DPending::ToObject(Eldbus_Pending *pending)
{
- DPending *self = static_cast<DPending *>(edbus_pending_data_get(pending,
"this"));
+ DPending *self = static_cast<DPending *>(eldbus_pending_data_get(pending,
"this"));
return self->handle_;
}
diff --git a/src/modules/dbus/dbus-pending.h b/src/modules/dbus/dbus-pending.h
index 4ad6bef..c82d183 100644
--- a/src/modules/dbus/dbus-pending.h
+++ b/src/modules/dbus/dbus-pending.h
@@ -8,19 +8,19 @@ using namespace v8;
namespace dbus {
class DPending : public ObjectWrap {
- EDBus_Pending *pending;
+ Eldbus_Pending *pending;
public:
static void Init(Handle<Object> target);
- EDBus_Connection *GetConnection() { return conn; }
- static Handle<Value> NewInstance(EDBus_Pending *pending);
- static Handle<Object> ToObject(EDBus_Pending *pending);
+ Eldbus_Connection *GetConnection() { return conn; }
+ static Handle<Value> NewInstance(Eldbus_Pending *pending);
+ static Handle<Object> ToObject(Eldbus_Pending *pending);
private:
static Persistent<Function> constructor;
- DPending(EDBus_Pending *pending_);
+ DPending(Eldbus_Pending *pending_);
static void FreeCb(void *data, const void *deadptr);
@@ -35,7 +35,7 @@ private:
static Handle<Value> Method(Local<String>, const AccessorInfo& info);
static Handle<Value> Path(Local<String>, const AccessorInfo& info);
- EDBus_Connection *conn;
+ Eldbus_Connection *conn;
};
}
diff --git a/src/modules/dbus/dbus-proxy.cc b/src/modules/dbus/dbus-proxy.cc
index 3ac35b6..f4416e7 100644
--- a/src/modules/dbus/dbus-proxy.cc
+++ b/src/modules/dbus/dbus-proxy.cc
@@ -9,7 +9,7 @@ namespace dbus {
Persistent<Function> DProxy::constructor;
static Handle<Value> einaValueToValue(Eina_Value *value);
-static void append(EDBus_Message_Iter *iter, Handle<Value> val);
+static void append(Eldbus_Message_Iter *iter, Handle<Value> val);
class DProperties : ObjectWrap
{
@@ -18,8 +18,8 @@ public:
static Handle<Value> NewInstance(DObject *obj, const char *iface, const
Arguments &args);
private:
- EDBus_Signal_Handler *sh;
- EDBus_Proxy *proxy;
+ Eldbus_Signal_Handler *sh;
+ Eldbus_Proxy *proxy;
char *iface;
DProperties(DObject *obj, const char *_iface);
@@ -29,27 +29,27 @@ private:
static Handle<Value> New(const Arguments& args);
static Handle<Value> Getter(Local<String> prop, const AccessorInfo& info);
static Handle<Value> Setter(Local<String> prop, Local<Value> val, const
AccessorInfo& info);
- static void SetterCb(void *data, const EDBus_Message *msg, EDBus_Pending
*pending);
- static void OnChanged(void *data, const EDBus_Message *msg);
- static void GetAll(void *data, const EDBus_Message *msg, EDBus_Pending
*pending);
- static bool IsErrorMessage(const EDBus_Message *msg);
+ static void SetterCb(void *data, const Eldbus_Message *msg, Eldbus_Pending
*pending);
+ static void OnChanged(void *data, const Eldbus_Message *msg);
+ static void GetAll(void *data, const Eldbus_Message *msg, Eldbus_Pending
*pending);
+ static bool IsErrorMessage(const Eldbus_Message *msg);
};
Persistent<Function> DProperties::constructor;
DProperties::DProperties(DObject *obj, const char *_iface)
{
- proxy = edbus_proxy_ref
- (edbus_proxy_get(obj->GetObject(), "org.freedesktop.DBus.Properties"));
+ proxy = eldbus_proxy_ref
+ (eldbus_proxy_get(obj->GetObject(), "org.freedesktop.DBus.Properties"));
iface = strdup(_iface);
- sh = edbus_proxy_signal_handler_add(proxy, "PropertiesChanged", OnChanged,
this);
- edbus_proxy_call(proxy, "GetAll", GetAll, this, -1, "s", iface);
+ sh = eldbus_proxy_signal_handler_add(proxy, "PropertiesChanged", OnChanged,
this);
+ eldbus_proxy_call(proxy, "GetAll", GetAll, this, -1, "s", iface);
}
DProperties::~DProperties()
{
- edbus_signal_handler_unref(sh);
- edbus_proxy_unref(proxy);
+ eldbus_signal_handler_unref(sh);
+ eldbus_proxy_unref(proxy);
free(iface);
}
@@ -86,19 +86,19 @@ Handle<Value> DProperties::Getter(Local<String>, const
AccessorInfo&)
return Handle<Value>();
}
-bool DProperties::IsErrorMessage(const EDBus_Message *msg)
+bool DProperties::IsErrorMessage(const Eldbus_Message *msg)
{
HandleScope scope;
const char *errname, *errmsg;
- if (!edbus_message_error_get(msg, &errname, &errmsg))
+ if (!eldbus_message_error_get(msg, &errname, &errmsg))
return false;
ERR("%s: %s\n", errname, errmsg);
return true;
}
-void DProperties::SetterCb(void *, const EDBus_Message *msg, EDBus_Pending *)
+void DProperties::SetterCb(void *, const Eldbus_Message *msg, Eldbus_Pending *)
{
IsErrorMessage(msg);
}
@@ -108,11 +108,11 @@ Handle<Value> DProperties::Setter(Local<String> prop,
Local<Value> val, const Ac
HandleScope scope;
DProperties *self = ObjectWrap::Unwrap<DProperties>(info.This());
- EDBus_Message *msg;
- EDBus_Message_Iter *iter;
+ Eldbus_Message *msg;
+ Eldbus_Message_Iter *iter;
- msg = edbus_proxy_method_call_new(self->proxy, "Set");
- iter = edbus_message_iter_get(msg);
+ msg = eldbus_proxy_method_call_new(self->proxy, "Set");
+ iter = eldbus_message_iter_get(msg);
append(iter, String::New(self->iface));
append(iter, prop);
@@ -122,18 +122,18 @@ Handle<Value> DProperties::Setter(Local<String> prop,
Local<Value> val, const Ac
variant->Set(String::NewSymbol("signature"), String::New("v"), DontEnum);
append(iter, variant);
- edbus_proxy_send(self->proxy, msg, SetterCb, NULL, -1);
+ eldbus_proxy_send(self->proxy, msg, SetterCb, NULL, -1);
return val;
}
-void DProperties::OnChanged(void *data, const EDBus_Message *msg)
+void DProperties::OnChanged(void *data, const Eldbus_Message *msg)
{
HandleScope scope;
if (IsErrorMessage(msg))
return;
- Eina_Value *ev = edbus_message_to_eina_value(msg);
+ Eina_Value *ev = eldbus_message_to_eina_value(msg);
Handle<Object> changed =
einaValueToValue(ev)->ToObject()->Get(1)->ToObject()->Get(0)->ToObject();
@@ -141,14 +141,14 @@ void DProperties::OnChanged(void *data, const
EDBus_Message *msg)
self->handle_->ForceSet(changed->Get(0),
changed->Get(1)->ToObject()->Get(0));
}
-void DProperties::GetAll(void *data, const EDBus_Message *msg, EDBus_Pending *)
+void DProperties::GetAll(void *data, const Eldbus_Message *msg, Eldbus_Pending
*)
{
HandleScope scope;
if (IsErrorMessage(msg))
return;
- Eina_Value *ev = edbus_message_to_eina_value(msg);
+ Eina_Value *ev = eldbus_message_to_eina_value(msg);
Local<Array> props =
Local<Array>::Cast(einaValueToValue(ev)->ToObject()->Get(0));
DProperties *self = static_cast<DProperties *>(data);
@@ -160,7 +160,7 @@ void DProperties::GetAll(void *data, const EDBus_Message
*msg, EDBus_Pending *)
}
DProxy::DProxy(DObject *_obj, const char *_iface)
- : proxy(edbus_proxy_ref(edbus_proxy_get(_obj->GetObject(), _iface)))
+ : proxy(eldbus_proxy_ref(eldbus_proxy_get(_obj->GetObject(), _iface)))
{
obj = _obj;
iface = strdup(_iface);
@@ -168,7 +168,7 @@ DProxy::DProxy(DObject *_obj, const char *_iface)
DProxy::~DProxy()
{
- edbus_proxy_unref(proxy);
+ eldbus_proxy_unref(proxy);
free(iface);
}
@@ -224,7 +224,7 @@ Handle<Value> DProxy::NewInstance(DObject *obj, const
Arguments& args)
}
struct WrappedMessage {
- static void Call(Handle<Function> callback, const EDBus_Message *msg);
+ static void Call(Handle<Function> callback, const Eldbus_Message *msg);
};
Handle<Value> DProxy::Getter(Local<String> prop, const AccessorInfo& info)
@@ -241,22 +241,22 @@ Handle<Value> DProxy::Getter(Local<String> prop, const
AccessorInfo& info)
return scope.Close(func);
}
-void WrappedMessage::Call(Handle<Function> callback, const EDBus_Message *msg)
+void WrappedMessage::Call(Handle<Function> callback, const Eldbus_Message *msg)
{
unsigned int argc = 0;
Eina_Value *ev = NULL;
Eina_Value_Struct st;
const char *errname, *errmsg;
- if (edbus_message_error_get(msg, &errname, &errmsg))
+ if (eldbus_message_error_get(msg, &errname, &errmsg))
{
ERR("%s: %s", errname, errmsg);
return;
}
- if (strlen(edbus_message_signature_get(msg)) > 0)
+ if (strlen(eldbus_message_signature_get(msg)) > 0)
{
- ev = edbus_message_to_eina_value(msg);
+ ev = eldbus_message_to_eina_value(msg);
eina_value_pget(ev, &st);
argc = st.desc->member_count;
}
@@ -278,7 +278,7 @@ public:
WrappedSignalHandler(DProxy *proxy_, const char *signal_name_, Handle<Value>
cb_, Handle<Value> data_)
: cb(Persistent<Value>::New(cb_))
, data(Persistent<Value>::New(data_))
- , sh(edbus_proxy_signal_handler_add(proxy_->GetProxy(),
+ , sh(eldbus_proxy_signal_handler_add(proxy_->GetProxy(),
signal_name_,
WrappedSignalHandler::Invoke,
this)) {}
@@ -288,9 +288,9 @@ public:
private:
Persistent<Value> cb;
Persistent<Value> data;
- EDBus_Signal_Handler *sh;
+ Eldbus_Signal_Handler *sh;
- static void Invoke(void *data, const EDBus_Message *msg);
+ static void Invoke(void *data, const Eldbus_Message *msg);
};
static Handle<Value> einaValueToValue(Eina_Value *value)
@@ -387,7 +387,7 @@ static Handle<Value> einaValueToValue(Eina_Value *value)
return val;
}
-void WrappedSignalHandler::Invoke(void *data, const EDBus_Message *msg)
+void WrappedSignalHandler::Invoke(void *data, const Eldbus_Message *msg)
{
HandleScope scope;
WrappedSignalHandler *self = static_cast<WrappedSignalHandler *>(data);
@@ -397,7 +397,7 @@ void WrappedSignalHandler::Invoke(void *data, const
EDBus_Message *msg)
WrappedSignalHandler::~WrappedSignalHandler()
{
- edbus_signal_handler_unref(sh);
+ eldbus_signal_handler_unref(sh);
}
Handle<Value> DProxy::AddSignalHandler(const Arguments& args)
@@ -498,7 +498,7 @@ static Local<String> getSignature(Handle<Value> val)
return getSignature(String::New(""), val);
}
-static void append(EDBus_Message_Iter *iter, Handle<Value> val)
+static void append(Eldbus_Message_Iter *iter, Handle<Value> val)
{
if (val->IsUndefined())
return;
@@ -508,48 +508,48 @@ static void append(EDBus_Message_Iter *iter,
Handle<Value> val)
switch (sig)
{
default:
- edbus_message_iter_basic_append(iter, sig, *String::Utf8Value(val));
+ eldbus_message_iter_basic_append(iter, sig, *String::Utf8Value(val));
break;
case 'b':
- edbus_message_iter_basic_append(iter, sig, val->BooleanValue());
+ eldbus_message_iter_basic_append(iter, sig, val->BooleanValue());
break;
case 'n':
case 'i':
case 'x':
- edbus_message_iter_basic_append(iter, sig, val->Int32Value());
+ eldbus_message_iter_basic_append(iter, sig, val->Int32Value());
break;
case 'y':
case 'q':
case 'u':
case 't':
- edbus_message_iter_basic_append(iter, sig, val->ToUint32()->Value());
+ eldbus_message_iter_basic_append(iter, sig, val->ToUint32()->Value());
break;
case 'd':
- edbus_message_iter_basic_append(iter, sig, val->NumberValue());
+ eldbus_message_iter_basic_append(iter, sig, val->NumberValue());
break;
case 'e':
{
- EDBus_Message_Iter *dict;
+ Eldbus_Message_Iter *dict;
Local<Object> obj = val->ToObject();
Local<Array> props = obj->GetOwnPropertyNames();
char *s = strdup(*String::Utf8Value(getSignature(val)));
- edbus_message_iter_arguments_append(iter, s, &dict);
+ eldbus_message_iter_arguments_append(iter, s, &dict);
for (unsigned int i = 0, len = props->Length(); i < len; i++)
{
- EDBus_Message_Iter *entry;
+ Eldbus_Message_Iter *entry;
Local<Value> key = props->Get(i);
- edbus_message_iter_arguments_append(dict, &s[1], &entry);
+ eldbus_message_iter_arguments_append(dict, &s[1], &entry);
append(entry, key);
append(entry, obj->Get(key));
- edbus_message_iter_container_close(dict, entry);
+ eldbus_message_iter_container_close(dict, entry);
}
- edbus_message_iter_container_close(iter, dict);
+ eldbus_message_iter_container_close(iter, dict);
free(s);
break;
}
@@ -559,53 +559,53 @@ static void append(EDBus_Message_Iter *iter,
Handle<Value> val)
Local<Array> props = obj->GetOwnPropertyNames();
Local<Value> v = obj->Get(props->Get(0));
- EDBus_Message_Iter *sub_iter = edbus_message_iter_container_new
+ Eldbus_Message_Iter *sub_iter = eldbus_message_iter_container_new
(iter, sig, *String::Utf8Value(getSignature(v)));
append(sub_iter, v);
- edbus_message_iter_container_close(iter, sub_iter);
+ eldbus_message_iter_container_close(iter, sub_iter);
break;
}
case 'a':
{
Local<Object> obj = val->ToObject();
Local<Array> props = obj->GetOwnPropertyNames();
- EDBus_Message_Iter *sub_iter = edbus_message_iter_container_new
+ Eldbus_Message_Iter *sub_iter = eldbus_message_iter_container_new
(iter, sig, &(*String::Utf8Value(getSignature(val)))[1]);
for (unsigned int i = 0, len = props->Length(); i < len; i++)
append(sub_iter, obj->Get(props->Get(i)));
- edbus_message_iter_container_close(iter, sub_iter);
+ eldbus_message_iter_container_close(iter, sub_iter);
break;
}
case 'r':
{
- EDBus_Message_Iter *sub_iter;
+ Eldbus_Message_Iter *sub_iter;
Local<Object> obj = val->ToObject();
Local<Array> props = obj->GetOwnPropertyNames();
- edbus_message_iter_arguments_append
+ eldbus_message_iter_arguments_append
(iter, *String::Utf8Value(getSignature(val)), &sub_iter);
for (unsigned int i = 0, len = props->Length(); i < len; i++)
append(sub_iter, obj->Get(props->Get(i)));
- edbus_message_iter_container_close(iter, sub_iter);
+ eldbus_message_iter_container_close(iter, sub_iter);
break;
}
}
}
-void DProxy::Send_Cb(void *, const EDBus_Message *msg, EDBus_Pending *pending)
+void DProxy::Send_Cb(void *, const Eldbus_Message *msg, Eldbus_Pending
*pending)
{
HandleScope scope;
const char *errname, *errmsg;
Handle<Object> obj = DPending::ToObject(pending);
- if (edbus_message_error_get(msg, &errname, &errmsg))
+ if (eldbus_message_error_get(msg, &errname, &errmsg))
{
Local<Value> on_error = obj->GetHiddenValue(String::New("onError"));
if (on_error.IsEmpty())
@@ -628,9 +628,9 @@ void DProxy::Send_Cb(void *, const EDBus_Message *msg,
EDBus_Pending *pending)
Eina_Value_Struct st;
unsigned int argc = 0;
- if (strlen(edbus_message_signature_get(msg)) > 0)
+ if (strlen(eldbus_message_signature_get(msg)) > 0)
{
- ev = edbus_message_to_eina_value(msg);
+ ev = eldbus_message_to_eina_value(msg);
eina_value_pget(ev, &st);
argc = st.desc->member_count;
}
@@ -654,9 +654,9 @@ Handle<Value> DProxy::Send(const Arguments& args)
DProxy *self = ObjectWrap::Unwrap<DProxy>(args.This());
- EDBus_Message *msg;
- EDBus_Pending *pending;
- EDBus_Message_Iter *iter;
+ Eldbus_Message *msg;
+ Eldbus_Pending *pending;
+ Eldbus_Message_Iter *iter;
Local<Value> method = args.Callee()->Get(String::New("method"));
unsigned int args_cnt = 0;
@@ -664,13 +664,13 @@ Handle<Value> DProxy::Send(const Arguments& args)
if (method->IsUndefined())
method = args[args_cnt++];
- msg = edbus_proxy_method_call_new(self->proxy, *String::Utf8Value(method));
- iter = edbus_message_iter_get(msg);
+ msg = eldbus_proxy_method_call_new(self->proxy, *String::Utf8Value(method));
+ iter = eldbus_message_iter_get(msg);
for (unsigned int len = args.Length(); args_cnt < len; args_cnt++)
append(iter, args[args_cnt]);
- pending = edbus_proxy_send(self->proxy, msg, Send_Cb, NULL, -1);
+ pending = eldbus_proxy_send(self->proxy, msg, Send_Cb, NULL, -1);
return scope.Close(DPending::NewInstance(pending));
}
diff --git a/src/modules/dbus/dbus-proxy.h b/src/modules/dbus/dbus-proxy.h
index 06ed17d..2fe2121 100644
--- a/src/modules/dbus/dbus-proxy.h
+++ b/src/modules/dbus/dbus-proxy.h
@@ -13,7 +13,7 @@ public:
static void Init(Handle<Object> target);
static Handle<Value> NewInstance(DObject *obj, const Arguments &args);
- EDBus_Proxy *GetProxy() { return proxy; }
+ Eldbus_Proxy *GetProxy() { return proxy; }
Persistent<Value> properties;
private:
@@ -28,11 +28,11 @@ private:
static Handle<Value> Send(const Arguments &args);
static Handle<Value> GetProperties(const Arguments &args);
- static void Send_Cb(void *data, const EDBus_Message *msg, EDBus_Pending
*pending);
+ static void Send_Cb(void *data, const Eldbus_Message *msg, Eldbus_Pending
*pending);
static Handle<Value> Getter(Local<String> prop, const AccessorInfo& info);
- EDBus_Proxy *proxy;
+ Eldbus_Proxy *proxy;
DObject *obj;
char *iface;
};
diff --git a/src/modules/dbus/dbus.cc b/src/modules/dbus/dbus.cc
index 415cbb4..8723f95 100644
--- a/src/modules/dbus/dbus.cc
+++ b/src/modules/dbus/dbus.cc
@@ -1,5 +1,5 @@
#include <Ecore.h>
-#include <EDBus.h>
+#include <Eldbus.h>
#include <v8.h>
#include "node_object_wrap.h"
@@ -107,7 +107,7 @@ void RegisterModule(Handle<Object> target)
INF("Initializing dbus module with log domain %d", dbus::_log_domain);
ecore_init();
- edbus_init();
+ eldbus_init();
target->Set(String::NewSymbol("Boolean"),
FunctionTemplate::New(DBoolean)->GetFunction());
target->Set(String::NewSymbol("Byte"),
FunctionTemplate::New(DByte)->GetFunction());
--
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and
their applications. This 200-page book is written by three acclaimed
leaders in the field. The early access version is available now.
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
