dbus 0.1.8 → 0.1.9

data/ext/ruby-dbus-bus.c

@@ -43,6 +43,74 @@ mDBusBinding_bus_get(int argc, VALUE *argv)
   return CONN_NEW(conn);
 }
 
+/*
+ *  call-seq:
+ *      bus_register(connection) => true|false
+ *
+ *  Registers a connection with the bus
+ */
+static VALUE
+mDBusBinding_bus_register(VALUE klass, VALUE conn)
+{
+  dbus_bool_t ret;
+
+  ret = FALSE;
+  RDBUS_TRY(
+    ret = dbus_bus_register(CONN_GET(conn), &error)
+  );
+
+  if (ret)
+    return Qtrue;
+  return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *      bus_set_base_service(connection, base_service) => true|false
+ *
+ *  Sets the base service name of the given connection.
+ *
+ */
+static VALUE
+mDBusBinding_bus_set_base_service(VALUE klass, VALUE conn, VALUE name)
+{
+  if (!dbus_bus_set_base_service(CONN_GET(conn), StringValuePtr(name)))
+    return Qfalse;
+  return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *      bus_get_base_service(connection) => name
+ *
+ *  Gets the base service name of the given connection. This value can be used 
+ *  for the +destination+ field of a DBusMessage.
+ */
+static VALUE
+mDBusBinding_bus_get_base_service(VALUE klass, VALUE conn)
+{
+  return rb_str_new2(dbus_bus_get_base_service(CONN_GET(conn)));
+}
+
+/*
+ *  call-seq:
+ *      bus_get_unix_user(connection, service_name) => uid
+ *
+ *  Gets the UNIX user ID for for the given service on this bus.
+ */
+static VALUE
+mDBusBinding_bus_get_unix_user(VALUE klass, VALUE conn, VALUE name)
+{
+  VALUE uid;
+
+  uid = -1;
+  RDBUS_TRY(
+    uid = LONG2NUM(dbus_bus_get_unix_user(CONN_GET(conn),
+                                          StringValuePtr(name), &error))
+  );
+  return uid;
+}
+
 /*
  *  call-seq:
  *      bus_acquire_service(connection, service_name, [flags=0]) => retcode
@@ -135,11 +203,53 @@ mDBusBinding_bus_remove_match(VALUE klass, VALUE conn, VALUE rule)
   return Qnil;
 }
 
+/*
+ *  call-seq:
+ *      bus_activate_service(connection, service_name, [flags=0]) => [true|false, result]
+ * 
+ *  Activates the given service. The flags parameter currently (D-BUS 0.22) does
+ *  nothing.
+ */
+static VALUE
+mDBusBinding_bus_activate_service(int argc, VALUE *argv)
+{
+  VALUE conn;
+  VALUE name;
+  VALUE flags;
+  dbus_uint32_t service_flags;
+  dbus_uint32_t result;
+  VALUE ret;
+  dbus_bool_t dbus_ret;
+
+  conn = name = flags = Qnil;
+  service_flags = 0;
+  rb_scan_args(argc, argv, "21", &conn, &name, &flags);
+  if (flags != Qnil)
+    service_flags = NUM2INT(flags);
+
+  result = 0;
+  dbus_ret = FALSE;
+  RDBUS_TRY(
+    dbus_ret = dbus_bus_activate_service(CONN_GET(conn), StringValuePtr(name),
+                                         service_flags, &result, &error)
+  );
+
+  ret = rb_ary_new();
+  rb_ary_push(ret, dbus_ret ? Qtrue : Qfalse);
+  rb_ary_push(ret, INT2NUM(result));
+  return ret;
+}
+
 void Init_dbus_bus()
 {
   rb_define_module_function(mDBusBinding, "bus_get", mDBusBinding_bus_get, -1);
+  rb_define_module_function(mDBusBinding, "bus_register", mDBusBinding_bus_register, 1);
+  rb_define_module_function(mDBusBinding, "bus_set_base_service", mDBusBinding_bus_set_base_service, 2);
+  rb_define_module_function(mDBusBinding, "bus_get_base_service", mDBusBinding_bus_get_base_service, 1);
+  rb_define_module_function(mDBusBinding, "bus_get_unix_user", mDBusBinding_bus_get_unix_user, 2);
   rb_define_module_function(mDBusBinding, "bus_acquire_service", mDBusBinding_bus_acquire_service, -1);
   rb_define_module_function(mDBusBinding, "bus_service_exists", mDBusBinding_bus_service_exists, 2);
+  rb_define_module_function(mDBusBinding, "bus_activate_service", mDBusBinding_bus_activate_service, -1);
   rb_define_module_function(mDBusBinding, "bus_add_match", mDBusBinding_bus_add_match, 2);
   rb_define_module_function(mDBusBinding, "bus_remove_match", mDBusBinding_bus_remove_match, 2);
 }

data/ext/ruby-dbus-connection.c

@@ -99,19 +99,6 @@ cDBusConnection_open(VALUE klass, VALUE address)
   return CONN_NEW_TAKE_OWNERSHIP(conn);
 }
 
-/*
- *  call-seq:
- *      get_base_service => name
- *
- *  Gets the base service name of the connection. This value can be used 
- *  for the +destination+ field of a DBusMessage.
- */
-static VALUE
-cDBusConnection_get_base_service(VALUE self)
-{
-  return rb_str_new2(dbus_bus_get_base_service(CONN_GET(self)));
-}
-
 /*
  *  call-seq:
  *      setup_with_g_main => nil
@@ -472,8 +459,10 @@ _on_object_path_unregister(DBusConnection *conn, void *user_data)
   exc = 0;
   rb_protect(_real_call_unregister_cb, (VALUE)args, &exc);
 
-  if (exc)
-    rb_warn("Unregister callback raised exception (ignored)");
+  if (exc) {
+    rb_warn("Unregister callback raised exception (ignored), backtrace:");
+		rb_backtrace();
+	}
 
   ruby_xfree(data);
 }
@@ -505,10 +494,12 @@ _on_object_path_message(DBusConnection *conn, DBusMessage *msg, void *user_data)
   exc = 0;
   ret = rb_protect(_real_call_message_cb, (VALUE)args, &exc);
 
-  if (exc)
-    rb_warn("Message callback raised exception (ignored)");
+  if (exc) {
+    rb_warn("Message callback raised exception (ignored), backtrace:");
+		rb_backtrace();
+	}
 
-  if (ret == Qnil)
+  if (NIL_P(ret))
     result = DBUS_HANDLER_RESULT_HANDLED;
   result = NUM2INT(ret);
   return result;
@@ -635,10 +626,12 @@ _on_filter_message(DBusConnection *conn, DBusMessage *msg, void *user_data)
   exc = 0;
   ret = rb_protect(_real_call_filter_cb, (VALUE)args, &exc);
 
-  if (exc)
-    rb_warn("Filter callback raised exception (ignored)");
+  if (exc) {
+    rb_warn("Filter callback raised exception (ignored), backtrace:");
+		rb_backtrace();
+	}
 
-  if (ret == Qnil)
+  if (NIL_P(ret))
     result = DBUS_HANDLER_RESULT_HANDLED;
   result = NUM2INT(ret);
   return result;
@@ -739,7 +732,6 @@ Init_dbus_connection()
   rb_define_singleton_method(cDBusConnection, "open", cDBusConnection_open, 1);
   rb_define_singleton_method(cDBusConnection, "new", cDBusConnection_open, 1);
 
-  rb_define_method(cDBusConnection, "get_base_service", cDBusConnection_get_base_service, 0);
   rb_define_method(cDBusConnection, "setup_with_g_main", cDBusConnection_setup_with_g_main, 0);
   rb_define_method(cDBusConnection, "disconnect", cDBusConnection_disconnect, 0);
   rb_define_method(cDBusConnection, "get_is_connected", cDBusConnection_get_is_connected, 0);

data/lib/dbus.rb

@@ -87,6 +87,26 @@ module DBus
       rule
     end
 
+    # Activates the given service on this bus
+    def activate_service(service_name, flags=0)
+      DBus::Binding::bus_activate_service(@connection, service_name, flags)
+    end
+
+    # Returns the UNIX user ID for the given service
+    def get_unix_user(service_name)
+      DBus::Binding::bus_get_unix_user(@connection, service_name)
+    end
+
+    # Returns the base service name of this bus
+    def get_base_service
+      DBus::Binding::bus_get_base_service(@connection)
+    end
+
+    # Sets the base service name of this bus
+    def set_base_service(service_name)
+      DBus::Binding::bus_set_base_service(@connection, service_name)
+    end
+
     protected
     def signal_dispatcher(connection, message)
       return HANDLER_RESULT_NOT_YET_HANDLED unless message.get_type == MESSAGE_TYPE_SIGNAL

data/lib/dbus/version.rb

@@ -13,7 +13,7 @@ module DBus
   module BindingVersion
     VERSION_MAJOR = 0
     VERSION_MINOR = 1
-    VERSION_PATCH = 8
+    VERSION_PATCH = 9
   end
   
   # Contains the string version of the D-BUS bindings

data/test/tc_connection.rb

@@ -19,6 +19,14 @@ class TC_DBusConnection < Test::Unit::TestCase
     conn = DBus::Binding::bus_get(DBus::BUS_SYSTEM)
     assert(!conn.nil?)
     assert(conn.is_a?(DBus::Binding::DBusConnection))
+    service_name = DBus::Binding::bus_get_base_service(conn)
+    assert(!service_name.nil?)
+    # uid = DBus::Binding::bus_get_unix_user(conn, nil)
+    # p uid
+    # assert(uid)
+    DBus::Binding::bus_set_base_service(conn, "test.service.Name")
+    assert(DBus::Binding::bus_get_base_service(conn) == "test.service.Name")
+    #DBus::Binding::bus_activate_service(conn, "org.gnomemeeting.instance")
   end
 
   def test_conn_open_new

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.1
+rubygems_version: 0.8.3
 specification_version: 1
 name: dbus
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
-date: 2004-12-12
+  version: 0.1.9
+date: 2004-12-28
 summary: Ruby bindings for D-BUS.
 require_paths: 
   - lib
-author: Leon Breedt
 email: bitserf@gmail.com
 homepage: http://rubyforge.org/projects/dbus-ruby
 rubyforge_project: dbus-ruby
@@ -25,6 +24,8 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+authors: 
+  - Leon Breedt
 files: 
   - examples/example-signal-emitter.rb
   - examples/list-session-services.rb