This email list is read-only. Emails sent to this list will be discarded
----------------------------------
client/session.c | 10 ++++++++--
client/session.h | 4 ++++
gdbus/gdbus.h | 9 +++++++++
gdbus/mainloop.c | 6 ++++++
gdbus/object.c | 6 +++++-
gdbus/watch.c | 7 +++++++
6 files changed, 39 insertions(+), 3 deletions(-)
New commits:
commit 2ce5d38bceba6ed6d66cd12a35651c97187ae9ed
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Sat Dec 6 15:45:57 2008 +0100
Add missing gdbus function declarations
commit 768cfa6a57358d570a5ff9d5de46b24d077eb432
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Sat Dec 6 15:38:32 2008 +0100
Fix error message creation
commit ac8dea53b44ed3fd93214ca4a0f919f627072d5c
Author: Raymond Liu <[EMAIL PROTECTED]>
Date: Fri Dec 5 11:19:42 2008 +0800
Export session_get and minior fix on get_xfer_listing_progess
Diff in this email is a maximum of 400 lines.
diff --git a/client/session.c b/client/session.c
index c76dabb..1f2bb77 100644
--- a/client/session.c
+++ b/client/session.c
@@ -1073,9 +1073,15 @@ static void get_xfer_listing_progress(GwObexXfer *xfer,
return;
complete:
- if (err == 0)
- callback->func(callback->session, callback->data);
+ if (err == 0) {
+ agent_notify_progress(session->conn, session->agent_name,
+ session->agent_path, session->transfer_path,
+ session->filled);
+ agent_notify_complete(session->conn, session->agent_name,
+ session->agent_path, session->transfer_path);
+ callback->func(callback->session, callback->data);
+ }
unregister_transfer(session);
session_unref(callback->session);
diff --git a/client/session.h b/client/session.h
index f0c113c..519153b 100644
--- a/client/session.h
+++ b/client/session.h
@@ -68,6 +68,10 @@ int session_set_agent(struct session_data *session, const
char *name,
const char *path);
int session_send(struct session_data *session, const char *filename,
const char *remotename);
+int session_get(struct session_data *session, const char *type,
+ const char *filename, const char *targetname,
+ const guint8 *apparam, gint apparam_size,
+ session_callback_t func);
int session_pull(struct session_data *session,
const char *type, const char *filename,
session_callback_t function, void *user_data);
diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h
index 5ee5c1a..e0d653a 100644
--- a/gdbus/gdbus.h
+++ b/gdbus/gdbus.h
@@ -34,9 +34,15 @@ extern "C" {
typedef void (* GDBusWatchFunction) (DBusConnection *connection,
void *user_data);
+typedef gboolean (* GDBusSignalFunction) (DBusConnection *connection,
+ DBusMessage *message, void *user_data);
+
DBusConnection *g_dbus_setup_bus(DBusBusType type, const char *name,
DBusError *error);
+gboolean g_dbus_request_name(DBusConnection *connection, const char *name,
+ DBusError *error);
+
gboolean g_dbus_check_service(DBusConnection *connection, const char *name);
gboolean g_dbus_set_disconnect_function(DBusConnection *connection,
@@ -120,6 +126,9 @@ guint g_dbus_add_service_watch(DBusConnection *connection,
const char *name,
guint g_dbus_add_disconnect_watch(DBusConnection *connection, const char *name,
GDBusWatchFunction function,
void *user_data, GDBusDestroyFunction destroy);
+guint g_dbus_add_signal_watch(DBusConnection *connection,
+ const char *rule, GDBusSignalFunction function,
+ void *user_data, GDBusDestroyFunction destroy);
gboolean g_dbus_remove_watch(DBusConnection *connection, guint tag);
void g_dbus_remove_all_watches(DBusConnection *connection);
diff --git a/gdbus/mainloop.c b/gdbus/mainloop.c
index 2e9948d..9e49326 100644
--- a/gdbus/mainloop.c
+++ b/gdbus/mainloop.c
@@ -275,6 +275,12 @@ DBusConnection *g_dbus_setup_bus(DBusBusType type, const
char *name,
return conn;
}
+gboolean g_dbus_request_name(DBusConnection *connection, const char *name,
+ DBusError *error)
+{
+ return TRUE;
+}
+
gboolean g_dbus_check_service(DBusConnection *connection, const char *name)
{
DBusMessage *message, *reply;
diff --git a/gdbus/object.c b/gdbus/object.c
index 50313a2..e3e96ce 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -523,7 +523,11 @@ gboolean g_dbus_unregister_interface(DBusConnection
*connection,
DBusMessage *g_dbus_create_error_valist(DBusMessage *message, const char *name,
const char *format, va_list args)
{
- return dbus_message_new_error(message, name, format);
+ char str[1024];
+
+ vsnprintf(str, sizeof(str), format, args);
+
+ return dbus_message_new_error(message, name, str);
}
DBusMessage *g_dbus_create_error(DBusMessage *message, const char *name,
diff --git a/gdbus/watch.c b/gdbus/watch.c
index 857d8d7..ec3be64 100644
--- a/gdbus/watch.c
+++ b/gdbus/watch.c
@@ -311,6 +311,13 @@ guint g_dbus_add_disconnect_watch(DBusConnection
*connection, const char *name,
user_data, destroy);
}
+guint g_dbus_add_signal_watch(DBusConnection *connection,
+ const char *rule, GDBusSignalFunction function,
+ void *user_data, GDBusDestroyFunction destroy)
+{
+ return 0;
+}
+
gboolean g_dbus_remove_watch(DBusConnection *connection, guint id)
{
struct name_data *data;
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
