Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/e_dbus
Dir : e17/libs/e_dbus/src/lib/dbus
Modified Files:
E_DBus.h e_dbus.c e_dbus_object.c
Log Message:
No need to have both unref and close, only creates ambiguity.
===================================================================
RCS file: /cvs/e/e17/libs/e_dbus/src/lib/dbus/E_DBus.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- E_DBus.h 6 Nov 2007 23:58:56 -0000 1.4
+++ E_DBus.h 24 Nov 2007 13:22:03 -0000 1.5
@@ -69,7 +69,6 @@
EAPI E_DBus_Connection *e_dbus_bus_get(DBusBusType type);
EAPI void e_dbus_connection_ref(E_DBus_Connection *conn);
- EAPI void e_dbus_connection_unref(E_DBus_Connection *conn);
EAPI E_DBus_Connection *e_dbus_connection_setup(DBusConnection *conn);
EAPI void e_dbus_connection_close(E_DBus_Connection *conn);
===================================================================
RCS file: /cvs/e/e17/libs/e_dbus/src/lib/dbus/e_dbus.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_dbus.c 17 Nov 2007 03:26:08 -0000 1.3
+++ e_dbus.c 24 Nov 2007 13:22:03 -0000 1.4
@@ -517,6 +517,8 @@
{
DEBUG(5, "e_dbus_connection_close\n");
+ if (--(conn->refcount) != 0) return;
+
dbus_connection_free_data_slot(&connection_slot);
dbus_connection_remove_filter(conn->conn, e_dbus_filter, NULL);
dbus_connection_set_watch_functions (conn->conn,
@@ -543,13 +545,6 @@
e_dbus_connection_ref(E_DBus_Connection *conn)
{
conn->refcount++;
-}
-
-EAPI void
-e_dbus_connection_unref(E_DBus_Connection *conn)
-{
- if (!conn) return;
- if (--(conn->refcount) == 0) e_dbus_connection_close(conn);
}
DBusConnection *
===================================================================
RCS file: /cvs/e/e17/libs/e_dbus/src/lib/dbus/e_dbus_object.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_dbus_object.c 4 Nov 2007 07:51:37 -0000 1.2
+++ e_dbus_object.c 24 Nov 2007 13:22:03 -0000 1.3
@@ -236,7 +236,7 @@
DEBUG(5, "e_dbus_object_free (%s)\n", obj->path);
dbus_connection_unregister_object_path(obj->conn->conn, obj->path);
- e_dbus_connection_unref(obj->conn);
+ e_dbus_connection_close(obj->conn);
if (obj->path) free(obj->path);
ecore_list_destroy(obj->interfaces);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
